]> git.ipfire.org Git - thirdparty/grsecurity-scrape.git/blame - test/grsecurity-3.1-4.0.2-201505072057.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.2-201505072057.patch
CommitLineData
3969d2a7
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 bfcb1a6..2dae09b 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 0649a60..1084563 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,72 @@ 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+GCC_PLUGINS_CFLAGS := $(CONSTIFY_PLUGIN_CFLAGS) $(STACKLEAK_PLUGIN_CFLAGS) $(KALLOCSTAT_PLUGIN_CFLAGS)
449+GCC_PLUGINS_CFLAGS += $(KERNEXEC_PLUGIN_CFLAGS) $(CHECKER_PLUGIN_CFLAGS) $(COLORIZE_PLUGIN_CFLAGS)
450+GCC_PLUGINS_CFLAGS += $(SIZE_OVERFLOW_PLUGIN_CFLAGS) $(LATENT_ENTROPY_PLUGIN_CFLAGS) $(STRUCTLEAK_PLUGIN_CFLAGS)
451+GCC_PLUGINS_CFLAGS += $(RANDSTRUCT_PLUGIN_CFLAGS)
452+GCC_PLUGINS_AFLAGS := $(KERNEXEC_PLUGIN_AFLAGS)
453+export PLUGINCC GCC_PLUGINS_CFLAGS GCC_PLUGINS_AFLAGS CONSTIFY_PLUGIN LATENT_ENTROPY_PLUGIN_CFLAGS
454+ifeq ($(KBUILD_EXTMOD),)
455+gcc-plugins:
456+ $(Q)$(MAKE) $(build)=tools/gcc
457+else
458+gcc-plugins: ;
459+endif
460+else
461+gcc-plugins:
462+ifeq ($(call cc-ifversion, -ge, 0405, y), y)
463+ $(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.))
464+else
465+ $(Q)echo "warning, your gcc version does not support plugins, you should upgrade it to gcc 4.5 at least"
466+endif
467+ $(Q)echo "PAX_MEMORY_STACKLEAK, constification, PAX_LATENT_ENTROPY and other features will be less secure. PAX_SIZE_OVERFLOW will not be active."
468+endif
469+endif
470+
471 ifdef CONFIG_READABLE_ASM
472 # Disable optimizations that make assembler listings hard to read.
473 # reorder blocks reorders the control in the function
474@@ -714,7 +782,7 @@ KBUILD_CFLAGS += $(call cc-option, -gsplit-dwarf, -g)
475 else
476 KBUILD_CFLAGS += -g
477 endif
478-KBUILD_AFLAGS += -Wa,-gdwarf-2
479+KBUILD_AFLAGS += -Wa,--gdwarf-2
480 endif
481 ifdef CONFIG_DEBUG_INFO_DWARF4
482 KBUILD_CFLAGS += $(call cc-option, -gdwarf-4,)
483@@ -884,7 +952,7 @@ export mod_sign_cmd
484
485
486 ifeq ($(KBUILD_EXTMOD),)
487-core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/
488+core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ grsecurity/
489
490 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
491 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
492@@ -934,6 +1002,8 @@ endif
493
494 # The actual objects are generated when descending,
495 # make sure no implicit rule kicks in
496+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
497+$(filter-out $(init-y),$(vmlinux-deps)): KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
498 $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
499
500 # Handle descending into subdirectories listed in $(vmlinux-dirs)
501@@ -943,7 +1013,7 @@ $(sort $(vmlinux-deps)): $(vmlinux-dirs) ;
502 # Error messages still appears in the original language
503
504 PHONY += $(vmlinux-dirs)
505-$(vmlinux-dirs): prepare scripts
506+$(vmlinux-dirs): gcc-plugins prepare scripts
507 $(Q)$(MAKE) $(build)=$@
508
509 define filechk_kernel.release
510@@ -986,10 +1056,13 @@ prepare1: prepare2 $(version_h) include/generated/utsrelease.h \
511
512 archprepare: archheaders archscripts prepare1 scripts_basic
513
514+prepare0: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
515+prepare0: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
516 prepare0: archprepare FORCE
517 $(Q)$(MAKE) $(build)=.
518
519 # All the preparing..
520+prepare: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
521 prepare: prepare0
522
523 # Generate some files
524@@ -1103,6 +1176,8 @@ all: modules
525 # using awk while concatenating to the final file.
526
527 PHONY += modules
528+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
529+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
530 modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
531 $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
532 @$(kecho) ' Building modules, stage 2.';
533@@ -1118,7 +1193,7 @@ modules.builtin: $(vmlinux-dirs:%=%/modules.builtin)
534
535 # Target to prepare building external modules
536 PHONY += modules_prepare
537-modules_prepare: prepare scripts
538+modules_prepare: gcc-plugins prepare scripts
539
540 # Target to install modules
541 PHONY += modules_install
542@@ -1184,7 +1259,10 @@ MRPROPER_FILES += .config .config.old .version .old_version \
543 Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS \
544 signing_key.priv signing_key.x509 x509.genkey \
545 extra_certificates signing_key.x509.keyid \
546- signing_key.x509.signer vmlinux-gdb.py
547+ signing_key.x509.signer vmlinux-gdb.py \
548+ tools/gcc/size_overflow_plugin/size_overflow_hash_aux.h \
549+ tools/gcc/size_overflow_plugin/size_overflow_hash.h \
550+ tools/gcc/randomize_layout_seed.h
551
552 # clean - Delete most, but leave enough to build external modules
553 #
554@@ -1223,7 +1301,7 @@ distclean: mrproper
555 @find $(srctree) $(RCS_FIND_IGNORE) \
556 \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
557 -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
558- -o -name '.*.rej' -o -name '*%' -o -name 'core' \) \
559+ -o -name '.*.rej' -o -name '*.so' -o -name '*%' -o -name 'core' \) \
560 -type f -print | xargs rm -f
561
562
563@@ -1389,6 +1467,8 @@ PHONY += $(module-dirs) modules
564 $(module-dirs): crmodverdir $(objtree)/Module.symvers
565 $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
566
567+modules: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
568+modules: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
569 modules: $(module-dirs)
570 @$(kecho) ' Building modules, stage 2.';
571 $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
572@@ -1529,17 +1609,21 @@ else
573 target-dir = $(if $(KBUILD_EXTMOD),$(dir $<),$(dir $@))
574 endif
575
576-%.s: %.c prepare scripts FORCE
577+%.s: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
578+%.s: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
579+%.s: %.c gcc-plugins prepare scripts FORCE
580 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
581 %.i: %.c prepare scripts FORCE
582 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
583-%.o: %.c prepare scripts FORCE
584+%.o: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
585+%.o: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
586+%.o: %.c gcc-plugins prepare scripts FORCE
587 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
588 %.lst: %.c prepare scripts FORCE
589 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
590-%.s: %.S prepare scripts FORCE
591+%.s: %.S gcc-plugins prepare scripts FORCE
592 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
593-%.o: %.S prepare scripts FORCE
594+%.o: %.S gcc-plugins prepare scripts FORCE
595 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
596 %.symtypes: %.c prepare scripts FORCE
597 $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
598@@ -1551,11 +1635,15 @@ endif
599 $(build)=$(build-dir)
600 # Make sure the latest headers are built for Documentation
601 Documentation/: headers_install
602-%/: prepare scripts FORCE
603+%/: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
604+%/: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
605+%/: gcc-plugins prepare scripts FORCE
606 $(cmd_crmodverdir)
607 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
608 $(build)=$(build-dir)
609-%.ko: prepare scripts FORCE
610+%.ko: KBUILD_CFLAGS += $(GCC_PLUGINS_CFLAGS)
611+%.ko: KBUILD_AFLAGS += $(GCC_PLUGINS_AFLAGS)
612+%.ko: gcc-plugins prepare scripts FORCE
613 $(cmd_crmodverdir)
614 $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
615 $(build)=$(build-dir) $(@:.ko=.o)
616diff --git a/arch/alpha/include/asm/atomic.h b/arch/alpha/include/asm/atomic.h
617index 8f8eafb..3405f46 100644
618--- a/arch/alpha/include/asm/atomic.h
619+++ b/arch/alpha/include/asm/atomic.h
620@@ -239,4 +239,14 @@ static inline long atomic64_dec_if_positive(atomic64_t *v)
621 #define atomic_dec(v) atomic_sub(1,(v))
622 #define atomic64_dec(v) atomic64_sub(1,(v))
623
624+#define atomic64_read_unchecked(v) atomic64_read(v)
625+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
626+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
627+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
628+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
629+#define atomic64_inc_unchecked(v) atomic64_inc(v)
630+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
631+#define atomic64_dec_unchecked(v) atomic64_dec(v)
632+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
633+
634 #endif /* _ALPHA_ATOMIC_H */
635diff --git a/arch/alpha/include/asm/cache.h b/arch/alpha/include/asm/cache.h
636index ad368a9..fbe0f25 100644
637--- a/arch/alpha/include/asm/cache.h
638+++ b/arch/alpha/include/asm/cache.h
639@@ -4,19 +4,19 @@
640 #ifndef __ARCH_ALPHA_CACHE_H
641 #define __ARCH_ALPHA_CACHE_H
642
643+#include <linux/const.h>
644
645 /* Bytes per L1 (data) cache line. */
646 #if defined(CONFIG_ALPHA_GENERIC) || defined(CONFIG_ALPHA_EV6)
647-# define L1_CACHE_BYTES 64
648 # define L1_CACHE_SHIFT 6
649 #else
650 /* Both EV4 and EV5 are write-through, read-allocate,
651 direct-mapped, physical.
652 */
653-# define L1_CACHE_BYTES 32
654 # define L1_CACHE_SHIFT 5
655 #endif
656
657+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
658 #define SMP_CACHE_BYTES L1_CACHE_BYTES
659
660 #endif
661diff --git a/arch/alpha/include/asm/elf.h b/arch/alpha/include/asm/elf.h
662index 968d999..d36b2df 100644
663--- a/arch/alpha/include/asm/elf.h
664+++ b/arch/alpha/include/asm/elf.h
665@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
666
667 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000)
668
669+#ifdef CONFIG_PAX_ASLR
670+#define PAX_ELF_ET_DYN_BASE (current->personality & ADDR_LIMIT_32BIT ? 0x10000 : 0x120000000UL)
671+
672+#define PAX_DELTA_MMAP_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 28)
673+#define PAX_DELTA_STACK_LEN (current->personality & ADDR_LIMIT_32BIT ? 14 : 19)
674+#endif
675+
676 /* $0 is set by ld.so to a pointer to a function which might be
677 registered using atexit. This provides a mean for the dynamic
678 linker to call DT_FINI functions for shared libraries that have
679diff --git a/arch/alpha/include/asm/pgalloc.h b/arch/alpha/include/asm/pgalloc.h
680index aab14a0..b4fa3e7 100644
681--- a/arch/alpha/include/asm/pgalloc.h
682+++ b/arch/alpha/include/asm/pgalloc.h
683@@ -29,6 +29,12 @@ pgd_populate(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
684 pgd_set(pgd, pmd);
685 }
686
687+static inline void
688+pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmd)
689+{
690+ pgd_populate(mm, pgd, pmd);
691+}
692+
693 extern pgd_t *pgd_alloc(struct mm_struct *mm);
694
695 static inline void
696diff --git a/arch/alpha/include/asm/pgtable.h b/arch/alpha/include/asm/pgtable.h
697index a9a1195..e9b8417 100644
698--- a/arch/alpha/include/asm/pgtable.h
699+++ b/arch/alpha/include/asm/pgtable.h
700@@ -101,6 +101,17 @@ struct vm_area_struct;
701 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
702 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
703 #define PAGE_READONLY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
704+
705+#ifdef CONFIG_PAX_PAGEEXEC
706+# define PAGE_SHARED_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOE)
707+# define PAGE_COPY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
708+# define PAGE_READONLY_NOEXEC __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW | _PAGE_FOE)
709+#else
710+# define PAGE_SHARED_NOEXEC PAGE_SHARED
711+# define PAGE_COPY_NOEXEC PAGE_COPY
712+# define PAGE_READONLY_NOEXEC PAGE_READONLY
713+#endif
714+
715 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
716
717 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
718diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
719index 2fd00b7..cfd5069 100644
720--- a/arch/alpha/kernel/module.c
721+++ b/arch/alpha/kernel/module.c
722@@ -160,7 +160,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab,
723
724 /* The small sections were sorted to the end of the segment.
725 The following should definitely cover them. */
726- gp = (u64)me->module_core + me->core_size - 0x8000;
727+ gp = (u64)me->module_core_rw + me->core_size_rw - 0x8000;
728 got = sechdrs[me->arch.gotsecindex].sh_addr;
729
730 for (i = 0; i < n; i++) {
731diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
732index e51f578..16c64a3 100644
733--- a/arch/alpha/kernel/osf_sys.c
734+++ b/arch/alpha/kernel/osf_sys.c
735@@ -1296,10 +1296,11 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
736 generic version except that we know how to honor ADDR_LIMIT_32BIT. */
737
738 static unsigned long
739-arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
740- unsigned long limit)
741+arch_get_unmapped_area_1(struct file *filp, unsigned long addr, unsigned long len,
742+ unsigned long limit, unsigned long flags)
743 {
744 struct vm_unmapped_area_info info;
745+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
746
747 info.flags = 0;
748 info.length = len;
749@@ -1307,6 +1308,7 @@ arch_get_unmapped_area_1(unsigned long addr, unsigned long len,
750 info.high_limit = limit;
751 info.align_mask = 0;
752 info.align_offset = 0;
753+ info.threadstack_offset = offset;
754 return vm_unmapped_area(&info);
755 }
756
757@@ -1339,20 +1341,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
758 merely specific addresses, but regions of memory -- perhaps
759 this feature should be incorporated into all ports? */
760
761+#ifdef CONFIG_PAX_RANDMMAP
762+ if (!(current->mm->pax_flags & MF_PAX_RANDMMAP))
763+#endif
764+
765 if (addr) {
766- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit);
767+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(addr), len, limit, flags);
768 if (addr != (unsigned long) -ENOMEM)
769 return addr;
770 }
771
772 /* Next, try allocating at TASK_UNMAPPED_BASE. */
773- addr = arch_get_unmapped_area_1 (PAGE_ALIGN(TASK_UNMAPPED_BASE),
774- len, limit);
775+ addr = arch_get_unmapped_area_1 (filp, PAGE_ALIGN(current->mm->mmap_base), len, limit, flags);
776+
777 if (addr != (unsigned long) -ENOMEM)
778 return addr;
779
780 /* Finally, try allocating in low memory. */
781- addr = arch_get_unmapped_area_1 (PAGE_SIZE, len, limit);
782+ addr = arch_get_unmapped_area_1 (filp, PAGE_SIZE, len, limit, flags);
783
784 return addr;
785 }
786diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
787index 9d0ac09..479a962 100644
788--- a/arch/alpha/mm/fault.c
789+++ b/arch/alpha/mm/fault.c
790@@ -53,6 +53,124 @@ __load_new_mm_context(struct mm_struct *next_mm)
791 __reload_thread(pcb);
792 }
793
794+#ifdef CONFIG_PAX_PAGEEXEC
795+/*
796+ * PaX: decide what to do with offenders (regs->pc = fault address)
797+ *
798+ * returns 1 when task should be killed
799+ * 2 when patched PLT trampoline was detected
800+ * 3 when unpatched PLT trampoline was detected
801+ */
802+static int pax_handle_fetch_fault(struct pt_regs *regs)
803+{
804+
805+#ifdef CONFIG_PAX_EMUPLT
806+ int err;
807+
808+ do { /* PaX: patched PLT emulation #1 */
809+ unsigned int ldah, ldq, jmp;
810+
811+ err = get_user(ldah, (unsigned int *)regs->pc);
812+ err |= get_user(ldq, (unsigned int *)(regs->pc+4));
813+ err |= get_user(jmp, (unsigned int *)(regs->pc+8));
814+
815+ if (err)
816+ break;
817+
818+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
819+ (ldq & 0xFFFF0000U) == 0xA77B0000U &&
820+ jmp == 0x6BFB0000U)
821+ {
822+ unsigned long r27, addr;
823+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
824+ unsigned long addrl = ldq | 0xFFFFFFFFFFFF0000UL;
825+
826+ addr = regs->r27 + ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
827+ err = get_user(r27, (unsigned long *)addr);
828+ if (err)
829+ break;
830+
831+ regs->r27 = r27;
832+ regs->pc = r27;
833+ return 2;
834+ }
835+ } while (0);
836+
837+ do { /* PaX: patched PLT emulation #2 */
838+ unsigned int ldah, lda, br;
839+
840+ err = get_user(ldah, (unsigned int *)regs->pc);
841+ err |= get_user(lda, (unsigned int *)(regs->pc+4));
842+ err |= get_user(br, (unsigned int *)(regs->pc+8));
843+
844+ if (err)
845+ break;
846+
847+ if ((ldah & 0xFFFF0000U) == 0x277B0000U &&
848+ (lda & 0xFFFF0000U) == 0xA77B0000U &&
849+ (br & 0xFFE00000U) == 0xC3E00000U)
850+ {
851+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL;
852+ unsigned long addrh = (ldah | 0xFFFFFFFFFFFF0000UL) << 16;
853+ unsigned long addrl = lda | 0xFFFFFFFFFFFF0000UL;
854+
855+ regs->r27 += ((addrh ^ 0x80000000UL) + 0x80000000UL) + ((addrl ^ 0x8000UL) + 0x8000UL);
856+ regs->pc += 12 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
857+ return 2;
858+ }
859+ } while (0);
860+
861+ do { /* PaX: unpatched PLT emulation */
862+ unsigned int br;
863+
864+ err = get_user(br, (unsigned int *)regs->pc);
865+
866+ if (!err && (br & 0xFFE00000U) == 0xC3800000U) {
867+ unsigned int br2, ldq, nop, jmp;
868+ unsigned long addr = br | 0xFFFFFFFFFFE00000UL, resolver;
869+
870+ addr = regs->pc + 4 + (((addr ^ 0x00100000UL) + 0x00100000UL) << 2);
871+ err = get_user(br2, (unsigned int *)addr);
872+ err |= get_user(ldq, (unsigned int *)(addr+4));
873+ err |= get_user(nop, (unsigned int *)(addr+8));
874+ err |= get_user(jmp, (unsigned int *)(addr+12));
875+ err |= get_user(resolver, (unsigned long *)(addr+16));
876+
877+ if (err)
878+ break;
879+
880+ if (br2 == 0xC3600000U &&
881+ ldq == 0xA77B000CU &&
882+ nop == 0x47FF041FU &&
883+ jmp == 0x6B7B0000U)
884+ {
885+ regs->r28 = regs->pc+4;
886+ regs->r27 = addr+16;
887+ regs->pc = resolver;
888+ return 3;
889+ }
890+ }
891+ } while (0);
892+#endif
893+
894+ return 1;
895+}
896+
897+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
898+{
899+ unsigned long i;
900+
901+ printk(KERN_ERR "PAX: bytes at PC: ");
902+ for (i = 0; i < 5; i++) {
903+ unsigned int c;
904+ if (get_user(c, (unsigned int *)pc+i))
905+ printk(KERN_CONT "???????? ");
906+ else
907+ printk(KERN_CONT "%08x ", c);
908+ }
909+ printk("\n");
910+}
911+#endif
912
913 /*
914 * This routine handles page faults. It determines the address,
915@@ -133,8 +251,29 @@ retry:
916 good_area:
917 si_code = SEGV_ACCERR;
918 if (cause < 0) {
919- if (!(vma->vm_flags & VM_EXEC))
920+ if (!(vma->vm_flags & VM_EXEC)) {
921+
922+#ifdef CONFIG_PAX_PAGEEXEC
923+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->pc)
924+ goto bad_area;
925+
926+ up_read(&mm->mmap_sem);
927+ switch (pax_handle_fetch_fault(regs)) {
928+
929+#ifdef CONFIG_PAX_EMUPLT
930+ case 2:
931+ case 3:
932+ return;
933+#endif
934+
935+ }
936+ pax_report_fault(regs, (void *)regs->pc, (void *)rdusp());
937+ do_group_exit(SIGKILL);
938+#else
939 goto bad_area;
940+#endif
941+
942+ }
943 } else if (!cause) {
944 /* Allow reads even for write-only mappings */
945 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
946diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
947index cf4c0c9..a87ecf5 100644
948--- a/arch/arm/Kconfig
949+++ b/arch/arm/Kconfig
950@@ -1735,7 +1735,7 @@ config ALIGNMENT_TRAP
951
952 config UACCESS_WITH_MEMCPY
953 bool "Use kernel mem{cpy,set}() for {copy_to,clear}_user()"
954- depends on MMU
955+ depends on MMU && !PAX_MEMORY_UDEREF
956 default y if CPU_FEROCEON
957 help
958 Implement faster copy_to_user and clear_user methods for CPU
959@@ -1999,6 +1999,7 @@ config XIP_PHYS_ADDR
960 config KEXEC
961 bool "Kexec system call (EXPERIMENTAL)"
962 depends on (!SMP || PM_SLEEP_SMP)
963+ depends on !GRKERNSEC_KMEM
964 help
965 kexec is a system call that implements the ability to shutdown your
966 current kernel, and to start another kernel. It is like a reboot
967diff --git a/arch/arm/include/asm/atomic.h b/arch/arm/include/asm/atomic.h
968index e22c119..abe7041 100644
969--- a/arch/arm/include/asm/atomic.h
970+++ b/arch/arm/include/asm/atomic.h
971@@ -18,17 +18,41 @@
972 #include <asm/barrier.h>
973 #include <asm/cmpxchg.h>
974
975+#ifdef CONFIG_GENERIC_ATOMIC64
976+#include <asm-generic/atomic64.h>
977+#endif
978+
979 #define ATOMIC_INIT(i) { (i) }
980
981 #ifdef __KERNEL__
982
983+#ifdef CONFIG_THUMB2_KERNEL
984+#define REFCOUNT_TRAP_INSN "bkpt 0xf1"
985+#else
986+#define REFCOUNT_TRAP_INSN "bkpt 0xf103"
987+#endif
988+
989+#define _ASM_EXTABLE(from, to) \
990+" .pushsection __ex_table,\"a\"\n"\
991+" .align 3\n" \
992+" .long " #from ", " #to"\n" \
993+" .popsection"
994+
995 /*
996 * On ARM, ordinary assignment (str instruction) doesn't clear the local
997 * strex/ldrex monitor on some implementations. The reason we can use it for
998 * atomic_set() is the clrex or dummy strex done on every exception return.
999 */
1000 #define atomic_read(v) ACCESS_ONCE((v)->counter)
1001+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
1002+{
1003+ return ACCESS_ONCE(v->counter);
1004+}
1005 #define atomic_set(v,i) (((v)->counter) = (i))
1006+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
1007+{
1008+ v->counter = i;
1009+}
1010
1011 #if __LINUX_ARM_ARCH__ >= 6
1012
1013@@ -38,26 +62,50 @@
1014 * to ensure that the update happens.
1015 */
1016
1017-#define ATOMIC_OP(op, c_op, asm_op) \
1018-static inline void atomic_##op(int i, atomic_t *v) \
1019+#ifdef CONFIG_PAX_REFCOUNT
1020+#define __OVERFLOW_POST \
1021+ " bvc 3f\n" \
1022+ "2: " REFCOUNT_TRAP_INSN "\n"\
1023+ "3:\n"
1024+#define __OVERFLOW_POST_RETURN \
1025+ " bvc 3f\n" \
1026+" mov %0, %1\n" \
1027+ "2: " REFCOUNT_TRAP_INSN "\n"\
1028+ "3:\n"
1029+#define __OVERFLOW_EXTABLE \
1030+ "4:\n" \
1031+ _ASM_EXTABLE(2b, 4b)
1032+#else
1033+#define __OVERFLOW_POST
1034+#define __OVERFLOW_POST_RETURN
1035+#define __OVERFLOW_EXTABLE
1036+#endif
1037+
1038+#define __ATOMIC_OP(op, suffix, c_op, asm_op, post_op, extable) \
1039+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1040 { \
1041 unsigned long tmp; \
1042 int result; \
1043 \
1044 prefetchw(&v->counter); \
1045- __asm__ __volatile__("@ atomic_" #op "\n" \
1046+ __asm__ __volatile__("@ atomic_" #op #suffix "\n" \
1047 "1: ldrex %0, [%3]\n" \
1048 " " #asm_op " %0, %0, %4\n" \
1049+ post_op \
1050 " strex %1, %0, [%3]\n" \
1051 " teq %1, #0\n" \
1052-" bne 1b" \
1053+" bne 1b\n" \
1054+ extable \
1055 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1056 : "r" (&v->counter), "Ir" (i) \
1057 : "cc"); \
1058 } \
1059
1060-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1061-static inline int atomic_##op##_return(int i, atomic_t *v) \
1062+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, _unchecked, c_op, asm_op, , )\
1063+ __ATOMIC_OP(op, , c_op, asm_op##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1064+
1065+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op, post_op, extable) \
1066+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1067 { \
1068 unsigned long tmp; \
1069 int result; \
1070@@ -65,12 +113,14 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1071 smp_mb(); \
1072 prefetchw(&v->counter); \
1073 \
1074- __asm__ __volatile__("@ atomic_" #op "_return\n" \
1075+ __asm__ __volatile__("@ atomic_" #op "_return" #suffix "\n" \
1076 "1: ldrex %0, [%3]\n" \
1077 " " #asm_op " %0, %0, %4\n" \
1078+ post_op \
1079 " strex %1, %0, [%3]\n" \
1080 " teq %1, #0\n" \
1081-" bne 1b" \
1082+" bne 1b\n" \
1083+ extable \
1084 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1085 : "r" (&v->counter), "Ir" (i) \
1086 : "cc"); \
1087@@ -80,6 +130,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1088 return result; \
1089 }
1090
1091+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op, , )\
1092+ __ATOMIC_OP_RETURN(op, , c_op, asm_op##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1093+
1094 static inline int atomic_cmpxchg(atomic_t *ptr, int old, int new)
1095 {
1096 int oldval;
1097@@ -115,12 +168,24 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1098 __asm__ __volatile__ ("@ atomic_add_unless\n"
1099 "1: ldrex %0, [%4]\n"
1100 " teq %0, %5\n"
1101-" beq 2f\n"
1102-" add %1, %0, %6\n"
1103+" beq 4f\n"
1104+" adds %1, %0, %6\n"
1105+
1106+#ifdef CONFIG_PAX_REFCOUNT
1107+" bvc 3f\n"
1108+"2: " REFCOUNT_TRAP_INSN "\n"
1109+"3:\n"
1110+#endif
1111+
1112 " strex %2, %1, [%4]\n"
1113 " teq %2, #0\n"
1114 " bne 1b\n"
1115-"2:"
1116+"4:"
1117+
1118+#ifdef CONFIG_PAX_REFCOUNT
1119+ _ASM_EXTABLE(2b, 4b)
1120+#endif
1121+
1122 : "=&r" (oldval), "=&r" (newval), "=&r" (tmp), "+Qo" (v->counter)
1123 : "r" (&v->counter), "r" (u), "r" (a)
1124 : "cc");
1125@@ -131,14 +196,36 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1126 return oldval;
1127 }
1128
1129+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *ptr, int old, int new)
1130+{
1131+ unsigned long oldval, res;
1132+
1133+ smp_mb();
1134+
1135+ do {
1136+ __asm__ __volatile__("@ atomic_cmpxchg_unchecked\n"
1137+ "ldrex %1, [%3]\n"
1138+ "mov %0, #0\n"
1139+ "teq %1, %4\n"
1140+ "strexeq %0, %5, [%3]\n"
1141+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1142+ : "r" (&ptr->counter), "Ir" (old), "r" (new)
1143+ : "cc");
1144+ } while (res);
1145+
1146+ smp_mb();
1147+
1148+ return oldval;
1149+}
1150+
1151 #else /* ARM_ARCH_6 */
1152
1153 #ifdef CONFIG_SMP
1154 #error SMP not supported on pre-ARMv6 CPUs
1155 #endif
1156
1157-#define ATOMIC_OP(op, c_op, asm_op) \
1158-static inline void atomic_##op(int i, atomic_t *v) \
1159+#define __ATOMIC_OP(op, suffix, c_op, asm_op) \
1160+static inline void atomic_##op##suffix(int i, atomic##suffix##_t *v) \
1161 { \
1162 unsigned long flags; \
1163 \
1164@@ -147,8 +234,11 @@ static inline void atomic_##op(int i, atomic_t *v) \
1165 raw_local_irq_restore(flags); \
1166 } \
1167
1168-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
1169-static inline int atomic_##op##_return(int i, atomic_t *v) \
1170+#define ATOMIC_OP(op, c_op, asm_op) __ATOMIC_OP(op, , c_op, asm_op) \
1171+ __ATOMIC_OP(op, _unchecked, c_op, asm_op)
1172+
1173+#define __ATOMIC_OP_RETURN(op, suffix, c_op, asm_op) \
1174+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t *v)\
1175 { \
1176 unsigned long flags; \
1177 int val; \
1178@@ -161,6 +251,9 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \
1179 return val; \
1180 }
1181
1182+#define ATOMIC_OP_RETURN(op, c_op, asm_op) __ATOMIC_OP_RETURN(op, , c_op, asm_op)\
1183+ __ATOMIC_OP_RETURN(op, _unchecked, c_op, asm_op)
1184+
1185 static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1186 {
1187 int ret;
1188@@ -175,6 +268,11 @@ static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
1189 return ret;
1190 }
1191
1192+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
1193+{
1194+ return atomic_cmpxchg((atomic_t *)v, old, new);
1195+}
1196+
1197 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
1198 {
1199 int c, old;
1200@@ -196,16 +294,38 @@ ATOMIC_OPS(sub, -=, sub)
1201
1202 #undef ATOMIC_OPS
1203 #undef ATOMIC_OP_RETURN
1204+#undef __ATOMIC_OP_RETURN
1205 #undef ATOMIC_OP
1206+#undef __ATOMIC_OP
1207
1208 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
1209+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
1210+{
1211+ return xchg(&v->counter, new);
1212+}
1213
1214 #define atomic_inc(v) atomic_add(1, v)
1215+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
1216+{
1217+ atomic_add_unchecked(1, v);
1218+}
1219 #define atomic_dec(v) atomic_sub(1, v)
1220+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
1221+{
1222+ atomic_sub_unchecked(1, v);
1223+}
1224
1225 #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0)
1226+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
1227+{
1228+ return atomic_add_return_unchecked(1, v) == 0;
1229+}
1230 #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0)
1231 #define atomic_inc_return(v) (atomic_add_return(1, v))
1232+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
1233+{
1234+ return atomic_add_return_unchecked(1, v);
1235+}
1236 #define atomic_dec_return(v) (atomic_sub_return(1, v))
1237 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
1238
1239@@ -216,6 +336,14 @@ typedef struct {
1240 long long counter;
1241 } atomic64_t;
1242
1243+#ifdef CONFIG_PAX_REFCOUNT
1244+typedef struct {
1245+ long long counter;
1246+} atomic64_unchecked_t;
1247+#else
1248+typedef atomic64_t atomic64_unchecked_t;
1249+#endif
1250+
1251 #define ATOMIC64_INIT(i) { (i) }
1252
1253 #ifdef CONFIG_ARM_LPAE
1254@@ -232,6 +360,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1255 return result;
1256 }
1257
1258+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1259+{
1260+ long long result;
1261+
1262+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1263+" ldrd %0, %H0, [%1]"
1264+ : "=&r" (result)
1265+ : "r" (&v->counter), "Qo" (v->counter)
1266+ );
1267+
1268+ return result;
1269+}
1270+
1271 static inline void atomic64_set(atomic64_t *v, long long i)
1272 {
1273 __asm__ __volatile__("@ atomic64_set\n"
1274@@ -240,6 +381,15 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1275 : "r" (&v->counter), "r" (i)
1276 );
1277 }
1278+
1279+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1280+{
1281+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1282+" strd %2, %H2, [%1]"
1283+ : "=Qo" (v->counter)
1284+ : "r" (&v->counter), "r" (i)
1285+ );
1286+}
1287 #else
1288 static inline long long atomic64_read(const atomic64_t *v)
1289 {
1290@@ -254,6 +404,19 @@ static inline long long atomic64_read(const atomic64_t *v)
1291 return result;
1292 }
1293
1294+static inline long long atomic64_read_unchecked(const atomic64_unchecked_t *v)
1295+{
1296+ long long result;
1297+
1298+ __asm__ __volatile__("@ atomic64_read_unchecked\n"
1299+" ldrexd %0, %H0, [%1]"
1300+ : "=&r" (result)
1301+ : "r" (&v->counter), "Qo" (v->counter)
1302+ );
1303+
1304+ return result;
1305+}
1306+
1307 static inline void atomic64_set(atomic64_t *v, long long i)
1308 {
1309 long long tmp;
1310@@ -268,29 +431,57 @@ static inline void atomic64_set(atomic64_t *v, long long i)
1311 : "r" (&v->counter), "r" (i)
1312 : "cc");
1313 }
1314+
1315+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
1316+{
1317+ long long tmp;
1318+
1319+ prefetchw(&v->counter);
1320+ __asm__ __volatile__("@ atomic64_set_unchecked\n"
1321+"1: ldrexd %0, %H0, [%2]\n"
1322+" strexd %0, %3, %H3, [%2]\n"
1323+" teq %0, #0\n"
1324+" bne 1b"
1325+ : "=&r" (tmp), "=Qo" (v->counter)
1326+ : "r" (&v->counter), "r" (i)
1327+ : "cc");
1328+}
1329 #endif
1330
1331-#define ATOMIC64_OP(op, op1, op2) \
1332-static inline void atomic64_##op(long long i, atomic64_t *v) \
1333+#undef __OVERFLOW_POST_RETURN
1334+#define __OVERFLOW_POST_RETURN \
1335+ " bvc 3f\n" \
1336+" mov %0, %1\n" \
1337+" mov %H0, %H1\n" \
1338+ "2: " REFCOUNT_TRAP_INSN "\n"\
1339+ "3:\n"
1340+
1341+#define __ATOMIC64_OP(op, suffix, op1, op2, post_op, extable) \
1342+static inline void atomic64_##op##suffix(long long i, atomic64##suffix##_t *v)\
1343 { \
1344 long long result; \
1345 unsigned long tmp; \
1346 \
1347 prefetchw(&v->counter); \
1348- __asm__ __volatile__("@ atomic64_" #op "\n" \
1349+ __asm__ __volatile__("@ atomic64_" #op #suffix "\n" \
1350 "1: ldrexd %0, %H0, [%3]\n" \
1351 " " #op1 " %Q0, %Q0, %Q4\n" \
1352 " " #op2 " %R0, %R0, %R4\n" \
1353+ post_op \
1354 " strexd %1, %0, %H0, [%3]\n" \
1355 " teq %1, #0\n" \
1356-" bne 1b" \
1357+" bne 1b\n" \
1358+ extable \
1359 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1360 : "r" (&v->counter), "r" (i) \
1361 : "cc"); \
1362 } \
1363
1364-#define ATOMIC64_OP_RETURN(op, op1, op2) \
1365-static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1366+#define ATOMIC64_OP(op, op1, op2) __ATOMIC64_OP(op, _unchecked, op1, op2, , ) \
1367+ __ATOMIC64_OP(op, , op1, op2##s, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
1368+
1369+#define __ATOMIC64_OP_RETURN(op, suffix, op1, op2, post_op, extable) \
1370+static inline long long atomic64_##op##_return##suffix(long long i, atomic64##suffix##_t *v) \
1371 { \
1372 long long result; \
1373 unsigned long tmp; \
1374@@ -298,13 +489,15 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1375 smp_mb(); \
1376 prefetchw(&v->counter); \
1377 \
1378- __asm__ __volatile__("@ atomic64_" #op "_return\n" \
1379+ __asm__ __volatile__("@ atomic64_" #op "_return" #suffix "\n" \
1380 "1: ldrexd %0, %H0, [%3]\n" \
1381 " " #op1 " %Q0, %Q0, %Q4\n" \
1382 " " #op2 " %R0, %R0, %R4\n" \
1383+ post_op \
1384 " strexd %1, %0, %H0, [%3]\n" \
1385 " teq %1, #0\n" \
1386-" bne 1b" \
1387+" bne 1b\n" \
1388+ extable \
1389 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter) \
1390 : "r" (&v->counter), "r" (i) \
1391 : "cc"); \
1392@@ -314,6 +507,9 @@ static inline long long atomic64_##op##_return(long long i, atomic64_t *v) \
1393 return result; \
1394 }
1395
1396+#define ATOMIC64_OP_RETURN(op, op1, op2) __ATOMIC64_OP_RETURN(op, _unchecked, op1, op2, , ) \
1397+ __ATOMIC64_OP_RETURN(op, , op1, op2##s, __OVERFLOW_POST_RETURN, __OVERFLOW_EXTABLE)
1398+
1399 #define ATOMIC64_OPS(op, op1, op2) \
1400 ATOMIC64_OP(op, op1, op2) \
1401 ATOMIC64_OP_RETURN(op, op1, op2)
1402@@ -323,7 +519,12 @@ ATOMIC64_OPS(sub, subs, sbc)
1403
1404 #undef ATOMIC64_OPS
1405 #undef ATOMIC64_OP_RETURN
1406+#undef __ATOMIC64_OP_RETURN
1407 #undef ATOMIC64_OP
1408+#undef __ATOMIC64_OP
1409+#undef __OVERFLOW_EXTABLE
1410+#undef __OVERFLOW_POST_RETURN
1411+#undef __OVERFLOW_POST
1412
1413 static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1414 long long new)
1415@@ -351,6 +552,31 @@ static inline long long atomic64_cmpxchg(atomic64_t *ptr, long long old,
1416 return oldval;
1417 }
1418
1419+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *ptr, long long old,
1420+ long long new)
1421+{
1422+ long long oldval;
1423+ unsigned long res;
1424+
1425+ smp_mb();
1426+
1427+ do {
1428+ __asm__ __volatile__("@ atomic64_cmpxchg_unchecked\n"
1429+ "ldrexd %1, %H1, [%3]\n"
1430+ "mov %0, #0\n"
1431+ "teq %1, %4\n"
1432+ "teqeq %H1, %H4\n"
1433+ "strexdeq %0, %5, %H5, [%3]"
1434+ : "=&r" (res), "=&r" (oldval), "+Qo" (ptr->counter)
1435+ : "r" (&ptr->counter), "r" (old), "r" (new)
1436+ : "cc");
1437+ } while (res);
1438+
1439+ smp_mb();
1440+
1441+ return oldval;
1442+}
1443+
1444 static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1445 {
1446 long long result;
1447@@ -376,21 +602,35 @@ static inline long long atomic64_xchg(atomic64_t *ptr, long long new)
1448 static inline long long atomic64_dec_if_positive(atomic64_t *v)
1449 {
1450 long long result;
1451- unsigned long tmp;
1452+ u64 tmp;
1453
1454 smp_mb();
1455 prefetchw(&v->counter);
1456
1457 __asm__ __volatile__("@ atomic64_dec_if_positive\n"
1458-"1: ldrexd %0, %H0, [%3]\n"
1459-" subs %Q0, %Q0, #1\n"
1460-" sbc %R0, %R0, #0\n"
1461+"1: ldrexd %1, %H1, [%3]\n"
1462+" subs %Q0, %Q1, #1\n"
1463+" sbcs %R0, %R1, #0\n"
1464+
1465+#ifdef CONFIG_PAX_REFCOUNT
1466+" bvc 3f\n"
1467+" mov %Q0, %Q1\n"
1468+" mov %R0, %R1\n"
1469+"2: " REFCOUNT_TRAP_INSN "\n"
1470+"3:\n"
1471+#endif
1472+
1473 " teq %R0, #0\n"
1474-" bmi 2f\n"
1475+" bmi 4f\n"
1476 " strexd %1, %0, %H0, [%3]\n"
1477 " teq %1, #0\n"
1478 " bne 1b\n"
1479-"2:"
1480+"4:\n"
1481+
1482+#ifdef CONFIG_PAX_REFCOUNT
1483+ _ASM_EXTABLE(2b, 4b)
1484+#endif
1485+
1486 : "=&r" (result), "=&r" (tmp), "+Qo" (v->counter)
1487 : "r" (&v->counter)
1488 : "cc");
1489@@ -414,13 +654,25 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1490 " teq %0, %5\n"
1491 " teqeq %H0, %H5\n"
1492 " moveq %1, #0\n"
1493-" beq 2f\n"
1494+" beq 4f\n"
1495 " adds %Q0, %Q0, %Q6\n"
1496-" adc %R0, %R0, %R6\n"
1497+" adcs %R0, %R0, %R6\n"
1498+
1499+#ifdef CONFIG_PAX_REFCOUNT
1500+" bvc 3f\n"
1501+"2: " REFCOUNT_TRAP_INSN "\n"
1502+"3:\n"
1503+#endif
1504+
1505 " strexd %2, %0, %H0, [%4]\n"
1506 " teq %2, #0\n"
1507 " bne 1b\n"
1508-"2:"
1509+"4:\n"
1510+
1511+#ifdef CONFIG_PAX_REFCOUNT
1512+ _ASM_EXTABLE(2b, 4b)
1513+#endif
1514+
1515 : "=&r" (val), "+r" (ret), "=&r" (tmp), "+Qo" (v->counter)
1516 : "r" (&v->counter), "r" (u), "r" (a)
1517 : "cc");
1518@@ -433,10 +685,13 @@ static inline int atomic64_add_unless(atomic64_t *v, long long a, long long u)
1519
1520 #define atomic64_add_negative(a, v) (atomic64_add_return((a), (v)) < 0)
1521 #define atomic64_inc(v) atomic64_add(1LL, (v))
1522+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1LL, (v))
1523 #define atomic64_inc_return(v) atomic64_add_return(1LL, (v))
1524+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1LL, (v))
1525 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
1526 #define atomic64_sub_and_test(a, v) (atomic64_sub_return((a), (v)) == 0)
1527 #define atomic64_dec(v) atomic64_sub(1LL, (v))
1528+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1LL, (v))
1529 #define atomic64_dec_return(v) atomic64_sub_return(1LL, (v))
1530 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
1531 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
1532diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
1533index d2f81e6..3c4dba5 100644
1534--- a/arch/arm/include/asm/barrier.h
1535+++ b/arch/arm/include/asm/barrier.h
1536@@ -67,7 +67,7 @@
1537 do { \
1538 compiletime_assert_atomic_type(*p); \
1539 smp_mb(); \
1540- ACCESS_ONCE(*p) = (v); \
1541+ ACCESS_ONCE_RW(*p) = (v); \
1542 } while (0)
1543
1544 #define smp_load_acquire(p) \
1545diff --git a/arch/arm/include/asm/cache.h b/arch/arm/include/asm/cache.h
1546index 75fe66b..ba3dee4 100644
1547--- a/arch/arm/include/asm/cache.h
1548+++ b/arch/arm/include/asm/cache.h
1549@@ -4,8 +4,10 @@
1550 #ifndef __ASMARM_CACHE_H
1551 #define __ASMARM_CACHE_H
1552
1553+#include <linux/const.h>
1554+
1555 #define L1_CACHE_SHIFT CONFIG_ARM_L1_CACHE_SHIFT
1556-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
1557+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
1558
1559 /*
1560 * Memory returned by kmalloc() may be used for DMA, so we must make
1561@@ -24,5 +26,6 @@
1562 #endif
1563
1564 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
1565+#define __read_only __attribute__ ((__section__(".data..read_only")))
1566
1567 #endif
1568diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
1569index 2d46862..a35415b 100644
1570--- a/arch/arm/include/asm/cacheflush.h
1571+++ b/arch/arm/include/asm/cacheflush.h
1572@@ -116,7 +116,7 @@ struct cpu_cache_fns {
1573 void (*dma_unmap_area)(const void *, size_t, int);
1574
1575 void (*dma_flush_range)(const void *, const void *);
1576-};
1577+} __no_const;
1578
1579 /*
1580 * Select the calling method
1581diff --git a/arch/arm/include/asm/checksum.h b/arch/arm/include/asm/checksum.h
1582index 5233151..87a71fa 100644
1583--- a/arch/arm/include/asm/checksum.h
1584+++ b/arch/arm/include/asm/checksum.h
1585@@ -37,7 +37,19 @@ __wsum
1586 csum_partial_copy_nocheck(const void *src, void *dst, int len, __wsum sum);
1587
1588 __wsum
1589-csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1590+__csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr);
1591+
1592+static inline __wsum
1593+csum_partial_copy_from_user(const void __user *src, void *dst, int len, __wsum sum, int *err_ptr)
1594+{
1595+ __wsum ret;
1596+ pax_open_userland();
1597+ ret = __csum_partial_copy_from_user(src, dst, len, sum, err_ptr);
1598+ pax_close_userland();
1599+ return ret;
1600+}
1601+
1602+
1603
1604 /*
1605 * Fold a partial checksum without adding pseudo headers
1606diff --git a/arch/arm/include/asm/cmpxchg.h b/arch/arm/include/asm/cmpxchg.h
1607index abb2c37..96db950 100644
1608--- a/arch/arm/include/asm/cmpxchg.h
1609+++ b/arch/arm/include/asm/cmpxchg.h
1610@@ -104,6 +104,8 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, int size
1611
1612 #define xchg(ptr,x) \
1613 ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1614+#define xchg_unchecked(ptr,x) \
1615+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
1616
1617 #include <asm-generic/cmpxchg-local.h>
1618
1619diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
1620index 6ddbe44..b5e38b1a 100644
1621--- a/arch/arm/include/asm/domain.h
1622+++ b/arch/arm/include/asm/domain.h
1623@@ -48,18 +48,37 @@
1624 * Domain types
1625 */
1626 #define DOMAIN_NOACCESS 0
1627-#define DOMAIN_CLIENT 1
1628 #ifdef CONFIG_CPU_USE_DOMAINS
1629+#define DOMAIN_USERCLIENT 1
1630+#define DOMAIN_KERNELCLIENT 1
1631 #define DOMAIN_MANAGER 3
1632+#define DOMAIN_VECTORS DOMAIN_USER
1633 #else
1634+
1635+#ifdef CONFIG_PAX_KERNEXEC
1636 #define DOMAIN_MANAGER 1
1637+#define DOMAIN_KERNEXEC 3
1638+#else
1639+#define DOMAIN_MANAGER 1
1640+#endif
1641+
1642+#ifdef CONFIG_PAX_MEMORY_UDEREF
1643+#define DOMAIN_USERCLIENT 0
1644+#define DOMAIN_UDEREF 1
1645+#define DOMAIN_VECTORS DOMAIN_KERNEL
1646+#else
1647+#define DOMAIN_USERCLIENT 1
1648+#define DOMAIN_VECTORS DOMAIN_USER
1649+#endif
1650+#define DOMAIN_KERNELCLIENT 1
1651+
1652 #endif
1653
1654 #define domain_val(dom,type) ((type) << (2*(dom)))
1655
1656 #ifndef __ASSEMBLY__
1657
1658-#ifdef CONFIG_CPU_USE_DOMAINS
1659+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
1660 static inline void set_domain(unsigned val)
1661 {
1662 asm volatile(
1663@@ -68,15 +87,7 @@ static inline void set_domain(unsigned val)
1664 isb();
1665 }
1666
1667-#define modify_domain(dom,type) \
1668- do { \
1669- struct thread_info *thread = current_thread_info(); \
1670- unsigned int domain = thread->cpu_domain; \
1671- domain &= ~domain_val(dom, DOMAIN_MANAGER); \
1672- thread->cpu_domain = domain | domain_val(dom, type); \
1673- set_domain(thread->cpu_domain); \
1674- } while (0)
1675-
1676+extern void modify_domain(unsigned int dom, unsigned int type);
1677 #else
1678 static inline void set_domain(unsigned val) { }
1679 static inline void modify_domain(unsigned dom, unsigned type) { }
1680diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
1681index 674d03f..9a0bac0 100644
1682--- a/arch/arm/include/asm/elf.h
1683+++ b/arch/arm/include/asm/elf.h
1684@@ -115,7 +115,14 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1685 the loader. We need to make sure that it is out of the way of the program
1686 that it will "exec", and that there is sufficient room for the brk. */
1687
1688-#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1689+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1690+
1691+#ifdef CONFIG_PAX_ASLR
1692+#define PAX_ELF_ET_DYN_BASE 0x00008000UL
1693+
1694+#define PAX_DELTA_MMAP_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1695+#define PAX_DELTA_STACK_LEN ((current->personality == PER_LINUX_32BIT) ? 16 : 10)
1696+#endif
1697
1698 /* When the program starts, a1 contains a pointer to a function to be
1699 registered with atexit, as per the SVR4 ABI. A value of 0 means we
1700@@ -125,10 +132,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);
1701 extern void elf_set_personality(const struct elf32_hdr *);
1702 #define SET_PERSONALITY(ex) elf_set_personality(&(ex))
1703
1704-struct mm_struct;
1705-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
1706-#define arch_randomize_brk arch_randomize_brk
1707-
1708 #ifdef CONFIG_MMU
1709 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
1710 struct linux_binprm;
1711diff --git a/arch/arm/include/asm/fncpy.h b/arch/arm/include/asm/fncpy.h
1712index de53547..52b9a28 100644
1713--- a/arch/arm/include/asm/fncpy.h
1714+++ b/arch/arm/include/asm/fncpy.h
1715@@ -81,7 +81,9 @@
1716 BUG_ON((uintptr_t)(dest_buf) & (FNCPY_ALIGN - 1) || \
1717 (__funcp_address & ~(uintptr_t)1 & (FNCPY_ALIGN - 1))); \
1718 \
1719+ pax_open_kernel(); \
1720 memcpy(dest_buf, (void const *)(__funcp_address & ~1), size); \
1721+ pax_close_kernel(); \
1722 flush_icache_range((unsigned long)(dest_buf), \
1723 (unsigned long)(dest_buf) + (size)); \
1724 \
1725diff --git a/arch/arm/include/asm/futex.h b/arch/arm/include/asm/futex.h
1726index 53e69da..3fdc896 100644
1727--- a/arch/arm/include/asm/futex.h
1728+++ b/arch/arm/include/asm/futex.h
1729@@ -46,6 +46,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1730 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1731 return -EFAULT;
1732
1733+ pax_open_userland();
1734+
1735 smp_mb();
1736 /* Prefetching cannot fault */
1737 prefetchw(uaddr);
1738@@ -63,6 +65,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1739 : "cc", "memory");
1740 smp_mb();
1741
1742+ pax_close_userland();
1743+
1744 *uval = val;
1745 return ret;
1746 }
1747@@ -93,6 +97,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1748 if (!access_ok(VERIFY_WRITE, uaddr, sizeof(u32)))
1749 return -EFAULT;
1750
1751+ pax_open_userland();
1752+
1753 __asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"
1754 "1: " TUSER(ldr) " %1, [%4]\n"
1755 " teq %1, %2\n"
1756@@ -103,6 +109,8 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr,
1757 : "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)
1758 : "cc", "memory");
1759
1760+ pax_close_userland();
1761+
1762 *uval = val;
1763 return ret;
1764 }
1765@@ -125,6 +133,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1766 return -EFAULT;
1767
1768 pagefault_disable(); /* implies preempt_disable() */
1769+ pax_open_userland();
1770
1771 switch (op) {
1772 case FUTEX_OP_SET:
1773@@ -146,6 +155,7 @@ futex_atomic_op_inuser (int encoded_op, u32 __user *uaddr)
1774 ret = -ENOSYS;
1775 }
1776
1777+ pax_close_userland();
1778 pagefault_enable(); /* subsumes preempt_enable() */
1779
1780 if (!ret) {
1781diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h
1782index 83eb2f7..ed77159 100644
1783--- a/arch/arm/include/asm/kmap_types.h
1784+++ b/arch/arm/include/asm/kmap_types.h
1785@@ -4,6 +4,6 @@
1786 /*
1787 * This is the "bare minimum". AIO seems to require this.
1788 */
1789-#define KM_TYPE_NR 16
1790+#define KM_TYPE_NR 17
1791
1792 #endif
1793diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
1794index 9e614a1..3302cca 100644
1795--- a/arch/arm/include/asm/mach/dma.h
1796+++ b/arch/arm/include/asm/mach/dma.h
1797@@ -22,7 +22,7 @@ struct dma_ops {
1798 int (*residue)(unsigned int, dma_t *); /* optional */
1799 int (*setspeed)(unsigned int, dma_t *, int); /* optional */
1800 const char *type;
1801-};
1802+} __do_const;
1803
1804 struct dma_struct {
1805 void *addr; /* single DMA address */
1806diff --git a/arch/arm/include/asm/mach/map.h b/arch/arm/include/asm/mach/map.h
1807index f98c7f3..e5c626d 100644
1808--- a/arch/arm/include/asm/mach/map.h
1809+++ b/arch/arm/include/asm/mach/map.h
1810@@ -23,17 +23,19 @@ struct map_desc {
1811
1812 /* types 0-3 are defined in asm/io.h */
1813 enum {
1814- MT_UNCACHED = 4,
1815- MT_CACHECLEAN,
1816- MT_MINICLEAN,
1817+ MT_UNCACHED_RW = 4,
1818+ MT_CACHECLEAN_RO,
1819+ MT_MINICLEAN_RO,
1820 MT_LOW_VECTORS,
1821 MT_HIGH_VECTORS,
1822- MT_MEMORY_RWX,
1823+ __MT_MEMORY_RWX,
1824 MT_MEMORY_RW,
1825- MT_ROM,
1826- MT_MEMORY_RWX_NONCACHED,
1827+ MT_MEMORY_RX,
1828+ MT_ROM_RX,
1829+ MT_MEMORY_RW_NONCACHED,
1830+ MT_MEMORY_RX_NONCACHED,
1831 MT_MEMORY_RW_DTCM,
1832- MT_MEMORY_RWX_ITCM,
1833+ MT_MEMORY_RX_ITCM,
1834 MT_MEMORY_RW_SO,
1835 MT_MEMORY_DMA_READY,
1836 };
1837diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
1838index 563b92f..689d58e 100644
1839--- a/arch/arm/include/asm/outercache.h
1840+++ b/arch/arm/include/asm/outercache.h
1841@@ -39,7 +39,7 @@ struct outer_cache_fns {
1842 /* This is an ARM L2C thing */
1843 void (*write_sec)(unsigned long, unsigned);
1844 void (*configure)(const struct l2x0_regs *);
1845-};
1846+} __no_const;
1847
1848 extern struct outer_cache_fns outer_cache;
1849
1850diff --git a/arch/arm/include/asm/page.h b/arch/arm/include/asm/page.h
1851index 4355f0e..cd9168e 100644
1852--- a/arch/arm/include/asm/page.h
1853+++ b/arch/arm/include/asm/page.h
1854@@ -23,6 +23,7 @@
1855
1856 #else
1857
1858+#include <linux/compiler.h>
1859 #include <asm/glue.h>
1860
1861 /*
1862@@ -114,7 +115,7 @@ struct cpu_user_fns {
1863 void (*cpu_clear_user_highpage)(struct page *page, unsigned long vaddr);
1864 void (*cpu_copy_user_highpage)(struct page *to, struct page *from,
1865 unsigned long vaddr, struct vm_area_struct *vma);
1866-};
1867+} __no_const;
1868
1869 #ifdef MULTI_USER
1870 extern struct cpu_user_fns cpu_user;
1871diff --git a/arch/arm/include/asm/pgalloc.h b/arch/arm/include/asm/pgalloc.h
1872index 19cfab5..3f5c7e9 100644
1873--- a/arch/arm/include/asm/pgalloc.h
1874+++ b/arch/arm/include/asm/pgalloc.h
1875@@ -17,6 +17,7 @@
1876 #include <asm/processor.h>
1877 #include <asm/cacheflush.h>
1878 #include <asm/tlbflush.h>
1879+#include <asm/system_info.h>
1880
1881 #define check_pgt_cache() do { } while (0)
1882
1883@@ -43,6 +44,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1884 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
1885 }
1886
1887+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1888+{
1889+ pud_populate(mm, pud, pmd);
1890+}
1891+
1892 #else /* !CONFIG_ARM_LPAE */
1893
1894 /*
1895@@ -51,6 +57,7 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
1896 #define pmd_alloc_one(mm,addr) ({ BUG(); ((pmd_t *)2); })
1897 #define pmd_free(mm, pmd) do { } while (0)
1898 #define pud_populate(mm,pmd,pte) BUG()
1899+#define pud_populate_kernel(mm,pmd,pte) BUG()
1900
1901 #endif /* CONFIG_ARM_LPAE */
1902
1903@@ -128,6 +135,19 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t pte)
1904 __free_page(pte);
1905 }
1906
1907+static inline void __section_update(pmd_t *pmdp, unsigned long addr, pmdval_t prot)
1908+{
1909+#ifdef CONFIG_ARM_LPAE
1910+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1911+#else
1912+ if (addr & SECTION_SIZE)
1913+ pmdp[1] = __pmd(pmd_val(pmdp[1]) | prot);
1914+ else
1915+ pmdp[0] = __pmd(pmd_val(pmdp[0]) | prot);
1916+#endif
1917+ flush_pmd_entry(pmdp);
1918+}
1919+
1920 static inline void __pmd_populate(pmd_t *pmdp, phys_addr_t pte,
1921 pmdval_t prot)
1922 {
1923diff --git a/arch/arm/include/asm/pgtable-2level-hwdef.h b/arch/arm/include/asm/pgtable-2level-hwdef.h
1924index 5e68278..1869bae 100644
1925--- a/arch/arm/include/asm/pgtable-2level-hwdef.h
1926+++ b/arch/arm/include/asm/pgtable-2level-hwdef.h
1927@@ -27,7 +27,7 @@
1928 /*
1929 * - section
1930 */
1931-#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1932+#define PMD_SECT_PXN (_AT(pmdval_t, 1) << 0) /* v7 */
1933 #define PMD_SECT_BUFFERABLE (_AT(pmdval_t, 1) << 2)
1934 #define PMD_SECT_CACHEABLE (_AT(pmdval_t, 1) << 3)
1935 #define PMD_SECT_XN (_AT(pmdval_t, 1) << 4) /* v6 */
1936@@ -39,6 +39,7 @@
1937 #define PMD_SECT_nG (_AT(pmdval_t, 1) << 17) /* v6 */
1938 #define PMD_SECT_SUPER (_AT(pmdval_t, 1) << 18) /* v6 */
1939 #define PMD_SECT_AF (_AT(pmdval_t, 0))
1940+#define PMD_SECT_RDONLY (_AT(pmdval_t, 0))
1941
1942 #define PMD_SECT_UNCACHED (_AT(pmdval_t, 0))
1943 #define PMD_SECT_BUFFERED (PMD_SECT_BUFFERABLE)
1944@@ -68,6 +69,7 @@
1945 * - extended small page/tiny page
1946 */
1947 #define PTE_EXT_XN (_AT(pteval_t, 1) << 0) /* v6 */
1948+#define PTE_EXT_PXN (_AT(pteval_t, 1) << 2) /* v7 */
1949 #define PTE_EXT_AP_MASK (_AT(pteval_t, 3) << 4)
1950 #define PTE_EXT_AP0 (_AT(pteval_t, 1) << 4)
1951 #define PTE_EXT_AP1 (_AT(pteval_t, 2) << 4)
1952diff --git a/arch/arm/include/asm/pgtable-2level.h b/arch/arm/include/asm/pgtable-2level.h
1953index bfd662e..f6cbb02 100644
1954--- a/arch/arm/include/asm/pgtable-2level.h
1955+++ b/arch/arm/include/asm/pgtable-2level.h
1956@@ -127,6 +127,9 @@
1957 #define L_PTE_SHARED (_AT(pteval_t, 1) << 10) /* shared(v6), coherent(xsc3) */
1958 #define L_PTE_NONE (_AT(pteval_t, 1) << 11)
1959
1960+/* Two-level page tables only have PXN in the PGD, not in the PTE. */
1961+#define L_PTE_PXN (_AT(pteval_t, 0))
1962+
1963 /*
1964 * These are the memory types, defined to be compatible with
1965 * pre-ARMv6 CPUs cacheable and bufferable bits: XXCB
1966diff --git a/arch/arm/include/asm/pgtable-3level.h b/arch/arm/include/asm/pgtable-3level.h
1967index a745a2a..481350a 100644
1968--- a/arch/arm/include/asm/pgtable-3level.h
1969+++ b/arch/arm/include/asm/pgtable-3level.h
1970@@ -80,6 +80,7 @@
1971 #define L_PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */
1972 #define L_PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */
1973 #define L_PTE_YOUNG (_AT(pteval_t, 1) << 10) /* AF */
1974+#define L_PTE_PXN (_AT(pteval_t, 1) << 53) /* PXN */
1975 #define L_PTE_XN (_AT(pteval_t, 1) << 54) /* XN */
1976 #define L_PTE_DIRTY (_AT(pteval_t, 1) << 55)
1977 #define L_PTE_SPECIAL (_AT(pteval_t, 1) << 56)
1978@@ -91,10 +92,12 @@
1979 #define L_PMD_SECT_SPLITTING (_AT(pmdval_t, 1) << 56)
1980 #define L_PMD_SECT_NONE (_AT(pmdval_t, 1) << 57)
1981 #define L_PMD_SECT_RDONLY (_AT(pteval_t, 1) << 58)
1982+#define PMD_SECT_RDONLY PMD_SECT_AP2
1983
1984 /*
1985 * To be used in assembly code with the upper page attributes.
1986 */
1987+#define L_PTE_PXN_HIGH (1 << (53 - 32))
1988 #define L_PTE_XN_HIGH (1 << (54 - 32))
1989 #define L_PTE_DIRTY_HIGH (1 << (55 - 32))
1990
1991diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
1992index f403541..b10df68 100644
1993--- a/arch/arm/include/asm/pgtable.h
1994+++ b/arch/arm/include/asm/pgtable.h
1995@@ -33,6 +33,9 @@
1996 #include <asm/pgtable-2level.h>
1997 #endif
1998
1999+#define ktla_ktva(addr) (addr)
2000+#define ktva_ktla(addr) (addr)
2001+
2002 /*
2003 * Just any arbitrary offset to the start of the vmalloc VM area: the
2004 * current 8MB value just means that there will be a 8MB "hole" after the
2005@@ -48,6 +51,9 @@
2006 #define LIBRARY_TEXT_START 0x0c000000
2007
2008 #ifndef __ASSEMBLY__
2009+extern pteval_t __supported_pte_mask;
2010+extern pmdval_t __supported_pmd_mask;
2011+
2012 extern void __pte_error(const char *file, int line, pte_t);
2013 extern void __pmd_error(const char *file, int line, pmd_t);
2014 extern void __pgd_error(const char *file, int line, pgd_t);
2015@@ -56,6 +62,48 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2016 #define pmd_ERROR(pmd) __pmd_error(__FILE__, __LINE__, pmd)
2017 #define pgd_ERROR(pgd) __pgd_error(__FILE__, __LINE__, pgd)
2018
2019+#define __HAVE_ARCH_PAX_OPEN_KERNEL
2020+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
2021+
2022+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2023+#include <asm/domain.h>
2024+#include <linux/thread_info.h>
2025+#include <linux/preempt.h>
2026+
2027+static inline int test_domain(int domain, int domaintype)
2028+{
2029+ return ((current_thread_info()->cpu_domain) & domain_val(domain, 3)) == domain_val(domain, domaintype);
2030+}
2031+#endif
2032+
2033+#ifdef CONFIG_PAX_KERNEXEC
2034+static inline unsigned long pax_open_kernel(void) {
2035+#ifdef CONFIG_ARM_LPAE
2036+ /* TODO */
2037+#else
2038+ preempt_disable();
2039+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC));
2040+ modify_domain(DOMAIN_KERNEL, DOMAIN_KERNEXEC);
2041+#endif
2042+ return 0;
2043+}
2044+
2045+static inline unsigned long pax_close_kernel(void) {
2046+#ifdef CONFIG_ARM_LPAE
2047+ /* TODO */
2048+#else
2049+ BUG_ON(test_domain(DOMAIN_KERNEL, DOMAIN_MANAGER));
2050+ /* DOMAIN_MANAGER = "client" under KERNEXEC */
2051+ modify_domain(DOMAIN_KERNEL, DOMAIN_MANAGER);
2052+ preempt_enable_no_resched();
2053+#endif
2054+ return 0;
2055+}
2056+#else
2057+static inline unsigned long pax_open_kernel(void) { return 0; }
2058+static inline unsigned long pax_close_kernel(void) { return 0; }
2059+#endif
2060+
2061 /*
2062 * This is the lowest virtual address we can permit any user space
2063 * mapping to be mapped at. This is particularly important for
2064@@ -75,8 +123,8 @@ extern void __pgd_error(const char *file, int line, pgd_t);
2065 /*
2066 * The pgprot_* and protection_map entries will be fixed up in runtime
2067 * to include the cachable and bufferable bits based on memory policy,
2068- * as well as any architecture dependent bits like global/ASID and SMP
2069- * shared mapping bits.
2070+ * as well as any architecture dependent bits like global/ASID, PXN,
2071+ * and SMP shared mapping bits.
2072 */
2073 #define _L_PTE_DEFAULT L_PTE_PRESENT | L_PTE_YOUNG
2074
2075@@ -307,7 +355,7 @@ static inline pte_t pte_mknexec(pte_t pte)
2076 static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
2077 {
2078 const pteval_t mask = L_PTE_XN | L_PTE_RDONLY | L_PTE_USER |
2079- L_PTE_NONE | L_PTE_VALID;
2080+ L_PTE_NONE | L_PTE_VALID | __supported_pte_mask;
2081 pte_val(pte) = (pte_val(pte) & ~mask) | (pgprot_val(newprot) & mask);
2082 return pte;
2083 }
2084diff --git a/arch/arm/include/asm/psci.h b/arch/arm/include/asm/psci.h
2085index c25ef3e..735f14b 100644
2086--- a/arch/arm/include/asm/psci.h
2087+++ b/arch/arm/include/asm/psci.h
2088@@ -32,7 +32,7 @@ struct psci_operations {
2089 int (*affinity_info)(unsigned long target_affinity,
2090 unsigned long lowest_affinity_level);
2091 int (*migrate_info_type)(void);
2092-};
2093+} __no_const;
2094
2095 extern struct psci_operations psci_ops;
2096 extern struct smp_operations psci_smp_ops;
2097diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h
2098index 18f5a55..5072a40 100644
2099--- a/arch/arm/include/asm/smp.h
2100+++ b/arch/arm/include/asm/smp.h
2101@@ -107,7 +107,7 @@ struct smp_operations {
2102 int (*cpu_disable)(unsigned int cpu);
2103 #endif
2104 #endif
2105-};
2106+} __no_const;
2107
2108 struct of_cpu_method {
2109 const char *method;
2110diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
2111index 72812a1..335f4f3 100644
2112--- a/arch/arm/include/asm/thread_info.h
2113+++ b/arch/arm/include/asm/thread_info.h
2114@@ -77,9 +77,9 @@ struct thread_info {
2115 .flags = 0, \
2116 .preempt_count = INIT_PREEMPT_COUNT, \
2117 .addr_limit = KERNEL_DS, \
2118- .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2119- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2120- domain_val(DOMAIN_IO, DOMAIN_CLIENT), \
2121+ .cpu_domain = domain_val(DOMAIN_USER, DOMAIN_USERCLIENT) | \
2122+ domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT) | \
2123+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT), \
2124 }
2125
2126 #define init_thread_info (init_thread_union.thread_info)
2127@@ -155,7 +155,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2128 #define TIF_SYSCALL_AUDIT 9
2129 #define TIF_SYSCALL_TRACEPOINT 10
2130 #define TIF_SECCOMP 11 /* seccomp syscall filtering active */
2131-#define TIF_NOHZ 12 /* in adaptive nohz mode */
2132+/* within 8 bits of TIF_SYSCALL_TRACE
2133+ * to meet flexible second operand requirements
2134+ */
2135+#define TIF_GRSEC_SETXID 12
2136+#define TIF_NOHZ 13 /* in adaptive nohz mode */
2137 #define TIF_USING_IWMMXT 17
2138 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
2139 #define TIF_RESTORE_SIGMASK 20
2140@@ -169,10 +173,11 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
2141 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
2142 #define _TIF_SECCOMP (1 << TIF_SECCOMP)
2143 #define _TIF_USING_IWMMXT (1 << TIF_USING_IWMMXT)
2144+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
2145
2146 /* Checks for any syscall work in entry-common.S */
2147 #define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
2148- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
2149+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | _TIF_GRSEC_SETXID)
2150
2151 /*
2152 * Change these and you break ASM code in entry-common.S
2153diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h
2154index 5f833f7..76e6644 100644
2155--- a/arch/arm/include/asm/tls.h
2156+++ b/arch/arm/include/asm/tls.h
2157@@ -3,6 +3,7 @@
2158
2159 #include <linux/compiler.h>
2160 #include <asm/thread_info.h>
2161+#include <asm/pgtable.h>
2162
2163 #ifdef __ASSEMBLY__
2164 #include <asm/asm-offsets.h>
2165@@ -89,7 +90,9 @@ static inline void set_tls(unsigned long val)
2166 * at 0xffff0fe0 must be used instead. (see
2167 * entry-armv.S for details)
2168 */
2169+ pax_open_kernel();
2170 *((unsigned int *)0xffff0ff0) = val;
2171+ pax_close_kernel();
2172 #endif
2173 }
2174
2175diff --git a/arch/arm/include/asm/uaccess.h b/arch/arm/include/asm/uaccess.h
2176index ce0786e..a80c264 100644
2177--- a/arch/arm/include/asm/uaccess.h
2178+++ b/arch/arm/include/asm/uaccess.h
2179@@ -18,6 +18,7 @@
2180 #include <asm/domain.h>
2181 #include <asm/unified.h>
2182 #include <asm/compiler.h>
2183+#include <asm/pgtable.h>
2184
2185 #ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
2186 #include <asm-generic/uaccess-unaligned.h>
2187@@ -70,11 +71,38 @@ extern int __put_user_bad(void);
2188 static inline void set_fs(mm_segment_t fs)
2189 {
2190 current_thread_info()->addr_limit = fs;
2191- modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_CLIENT : DOMAIN_MANAGER);
2192+ modify_domain(DOMAIN_KERNEL, fs ? DOMAIN_KERNELCLIENT : DOMAIN_MANAGER);
2193 }
2194
2195 #define segment_eq(a, b) ((a) == (b))
2196
2197+#define __HAVE_ARCH_PAX_OPEN_USERLAND
2198+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
2199+
2200+static inline void pax_open_userland(void)
2201+{
2202+
2203+#ifdef CONFIG_PAX_MEMORY_UDEREF
2204+ if (segment_eq(get_fs(), USER_DS)) {
2205+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_UDEREF));
2206+ modify_domain(DOMAIN_USER, DOMAIN_UDEREF);
2207+ }
2208+#endif
2209+
2210+}
2211+
2212+static inline void pax_close_userland(void)
2213+{
2214+
2215+#ifdef CONFIG_PAX_MEMORY_UDEREF
2216+ if (segment_eq(get_fs(), USER_DS)) {
2217+ BUG_ON(test_domain(DOMAIN_USER, DOMAIN_NOACCESS));
2218+ modify_domain(DOMAIN_USER, DOMAIN_NOACCESS);
2219+ }
2220+#endif
2221+
2222+}
2223+
2224 #define __addr_ok(addr) ({ \
2225 unsigned long flag; \
2226 __asm__("cmp %2, %0; movlo %0, #0" \
2227@@ -198,8 +226,12 @@ extern int __get_user_64t_4(void *);
2228
2229 #define get_user(x, p) \
2230 ({ \
2231+ int __e; \
2232 might_fault(); \
2233- __get_user_check(x, p); \
2234+ pax_open_userland(); \
2235+ __e = __get_user_check((x), (p)); \
2236+ pax_close_userland(); \
2237+ __e; \
2238 })
2239
2240 extern int __put_user_1(void *, unsigned int);
2241@@ -244,8 +276,12 @@ extern int __put_user_8(void *, unsigned long long);
2242
2243 #define put_user(x, p) \
2244 ({ \
2245+ int __e; \
2246 might_fault(); \
2247- __put_user_check(x, p); \
2248+ pax_open_userland(); \
2249+ __e = __put_user_check((x), (p)); \
2250+ pax_close_userland(); \
2251+ __e; \
2252 })
2253
2254 #else /* CONFIG_MMU */
2255@@ -269,6 +305,7 @@ static inline void set_fs(mm_segment_t fs)
2256
2257 #endif /* CONFIG_MMU */
2258
2259+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
2260 #define access_ok(type, addr, size) (__range_ok(addr, size) == 0)
2261
2262 #define user_addr_max() \
2263@@ -286,13 +323,17 @@ static inline void set_fs(mm_segment_t fs)
2264 #define __get_user(x, ptr) \
2265 ({ \
2266 long __gu_err = 0; \
2267+ pax_open_userland(); \
2268 __get_user_err((x), (ptr), __gu_err); \
2269+ pax_close_userland(); \
2270 __gu_err; \
2271 })
2272
2273 #define __get_user_error(x, ptr, err) \
2274 ({ \
2275+ pax_open_userland(); \
2276 __get_user_err((x), (ptr), err); \
2277+ pax_close_userland(); \
2278 (void) 0; \
2279 })
2280
2281@@ -368,13 +409,17 @@ do { \
2282 #define __put_user(x, ptr) \
2283 ({ \
2284 long __pu_err = 0; \
2285+ pax_open_userland(); \
2286 __put_user_err((x), (ptr), __pu_err); \
2287+ pax_close_userland(); \
2288 __pu_err; \
2289 })
2290
2291 #define __put_user_error(x, ptr, err) \
2292 ({ \
2293+ pax_open_userland(); \
2294 __put_user_err((x), (ptr), err); \
2295+ pax_close_userland(); \
2296 (void) 0; \
2297 })
2298
2299@@ -474,11 +519,44 @@ do { \
2300
2301
2302 #ifdef CONFIG_MMU
2303-extern unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n);
2304-extern unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n);
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+
2308+static inline unsigned long __must_check __copy_from_user(void *to, const void __user *from, unsigned long n)
2309+{
2310+ unsigned long ret;
2311+
2312+ check_object_size(to, n, false);
2313+ pax_open_userland();
2314+ ret = ___copy_from_user(to, from, n);
2315+ pax_close_userland();
2316+ return ret;
2317+}
2318+
2319+static inline unsigned long __must_check __copy_to_user(void __user *to, const void *from, unsigned long n)
2320+{
2321+ unsigned long ret;
2322+
2323+ check_object_size(from, n, true);
2324+ pax_open_userland();
2325+ ret = ___copy_to_user(to, from, n);
2326+ pax_close_userland();
2327+ return ret;
2328+}
2329+
2330 extern unsigned long __must_check __copy_to_user_std(void __user *to, const void *from, unsigned long n);
2331-extern unsigned long __must_check __clear_user(void __user *addr, unsigned long n);
2332+extern unsigned long __must_check ___clear_user(void __user *addr, unsigned long n);
2333 extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned long n);
2334+
2335+static inline unsigned long __must_check __clear_user(void __user *addr, unsigned long n)
2336+{
2337+ unsigned long ret;
2338+ pax_open_userland();
2339+ ret = ___clear_user(addr, n);
2340+ pax_close_userland();
2341+ return ret;
2342+}
2343+
2344 #else
2345 #define __copy_from_user(to, from, n) (memcpy(to, (void __force *)from, n), 0)
2346 #define __copy_to_user(to, from, n) (memcpy((void __force *)to, from, n), 0)
2347@@ -487,6 +565,9 @@ extern unsigned long __must_check __clear_user_std(void __user *addr, unsigned l
2348
2349 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n)
2350 {
2351+ if ((long)n < 0)
2352+ return n;
2353+
2354 if (access_ok(VERIFY_READ, from, n))
2355 n = __copy_from_user(to, from, n);
2356 else /* security hole - plug it */
2357@@ -496,6 +577,9 @@ static inline unsigned long __must_check copy_from_user(void *to, const void __u
2358
2359 static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n)
2360 {
2361+ if ((long)n < 0)
2362+ return n;
2363+
2364 if (access_ok(VERIFY_WRITE, to, n))
2365 n = __copy_to_user(to, from, n);
2366 return n;
2367diff --git a/arch/arm/include/uapi/asm/ptrace.h b/arch/arm/include/uapi/asm/ptrace.h
2368index 5af0ed1..cea83883 100644
2369--- a/arch/arm/include/uapi/asm/ptrace.h
2370+++ b/arch/arm/include/uapi/asm/ptrace.h
2371@@ -92,7 +92,7 @@
2372 * ARMv7 groups of PSR bits
2373 */
2374 #define APSR_MASK 0xf80f0000 /* N, Z, C, V, Q and GE flags */
2375-#define PSR_ISET_MASK 0x01000010 /* ISA state (J, T) mask */
2376+#define PSR_ISET_MASK 0x01000020 /* ISA state (J, T) mask */
2377 #define PSR_IT_MASK 0x0600fc00 /* If-Then execution state mask */
2378 #define PSR_ENDIAN_MASK 0x00000200 /* Endianness state mask */
2379
2380diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c
2381index a88671c..1cc895e 100644
2382--- a/arch/arm/kernel/armksyms.c
2383+++ b/arch/arm/kernel/armksyms.c
2384@@ -55,7 +55,7 @@ EXPORT_SYMBOL(arm_delay_ops);
2385
2386 /* networking */
2387 EXPORT_SYMBOL(csum_partial);
2388-EXPORT_SYMBOL(csum_partial_copy_from_user);
2389+EXPORT_SYMBOL(__csum_partial_copy_from_user);
2390 EXPORT_SYMBOL(csum_partial_copy_nocheck);
2391 EXPORT_SYMBOL(__csum_ipv6_magic);
2392
2393@@ -91,9 +91,9 @@ EXPORT_SYMBOL(__memzero);
2394 #ifdef CONFIG_MMU
2395 EXPORT_SYMBOL(copy_page);
2396
2397-EXPORT_SYMBOL(__copy_from_user);
2398-EXPORT_SYMBOL(__copy_to_user);
2399-EXPORT_SYMBOL(__clear_user);
2400+EXPORT_SYMBOL(___copy_from_user);
2401+EXPORT_SYMBOL(___copy_to_user);
2402+EXPORT_SYMBOL(___clear_user);
2403
2404 EXPORT_SYMBOL(__get_user_1);
2405 EXPORT_SYMBOL(__get_user_2);
2406diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
2407index 672b219..4aa120a 100644
2408--- a/arch/arm/kernel/entry-armv.S
2409+++ b/arch/arm/kernel/entry-armv.S
2410@@ -48,6 +48,87 @@
2411 9997:
2412 .endm
2413
2414+ .macro pax_enter_kernel
2415+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2416+ @ make aligned space for saved DACR
2417+ sub sp, sp, #8
2418+ @ save regs
2419+ stmdb sp!, {r1, r2}
2420+ @ read DACR from cpu_domain into r1
2421+ mov r2, sp
2422+ @ assume 8K pages, since we have to split the immediate in two
2423+ bic r2, r2, #(0x1fc0)
2424+ bic r2, r2, #(0x3f)
2425+ ldr r1, [r2, #TI_CPU_DOMAIN]
2426+ @ store old DACR on stack
2427+ str r1, [sp, #8]
2428+#ifdef CONFIG_PAX_KERNEXEC
2429+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2430+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2431+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2432+#endif
2433+#ifdef CONFIG_PAX_MEMORY_UDEREF
2434+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2435+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2436+#endif
2437+ @ write r1 to current_thread_info()->cpu_domain
2438+ str r1, [r2, #TI_CPU_DOMAIN]
2439+ @ write r1 to DACR
2440+ mcr p15, 0, r1, c3, c0, 0
2441+ @ instruction sync
2442+ instr_sync
2443+ @ restore regs
2444+ ldmia sp!, {r1, r2}
2445+#endif
2446+ .endm
2447+
2448+ .macro pax_open_userland
2449+#ifdef CONFIG_PAX_MEMORY_UDEREF
2450+ @ save regs
2451+ stmdb sp!, {r0, r1}
2452+ @ read DACR from cpu_domain into r1
2453+ mov r0, sp
2454+ @ assume 8K pages, since we have to split the immediate in two
2455+ bic r0, r0, #(0x1fc0)
2456+ bic r0, r0, #(0x3f)
2457+ ldr r1, [r0, #TI_CPU_DOMAIN]
2458+ @ set current DOMAIN_USER to DOMAIN_CLIENT
2459+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2460+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2461+ @ write r1 to current_thread_info()->cpu_domain
2462+ str r1, [r0, #TI_CPU_DOMAIN]
2463+ @ write r1 to DACR
2464+ mcr p15, 0, r1, c3, c0, 0
2465+ @ instruction sync
2466+ instr_sync
2467+ @ restore regs
2468+ ldmia sp!, {r0, r1}
2469+#endif
2470+ .endm
2471+
2472+ .macro pax_close_userland
2473+#ifdef CONFIG_PAX_MEMORY_UDEREF
2474+ @ save regs
2475+ stmdb sp!, {r0, r1}
2476+ @ read DACR from cpu_domain into r1
2477+ mov r0, sp
2478+ @ assume 8K pages, since we have to split the immediate in two
2479+ bic r0, r0, #(0x1fc0)
2480+ bic r0, r0, #(0x3f)
2481+ ldr r1, [r0, #TI_CPU_DOMAIN]
2482+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2483+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2484+ @ write r1 to current_thread_info()->cpu_domain
2485+ str r1, [r0, #TI_CPU_DOMAIN]
2486+ @ write r1 to DACR
2487+ mcr p15, 0, r1, c3, c0, 0
2488+ @ instruction sync
2489+ instr_sync
2490+ @ restore regs
2491+ ldmia sp!, {r0, r1}
2492+#endif
2493+ .endm
2494+
2495 .macro pabt_helper
2496 @ PABORT handler takes pt_regs in r2, fault address in r4 and psr in r5
2497 #ifdef MULTI_PABORT
2498@@ -90,11 +171,15 @@
2499 * Invalid mode handlers
2500 */
2501 .macro inv_entry, reason
2502+
2503+ pax_enter_kernel
2504+
2505 sub sp, sp, #S_FRAME_SIZE
2506 ARM( stmib sp, {r1 - lr} )
2507 THUMB( stmia sp, {r0 - r12} )
2508 THUMB( str sp, [sp, #S_SP] )
2509 THUMB( str lr, [sp, #S_LR] )
2510+
2511 mov r1, #\reason
2512 .endm
2513
2514@@ -150,7 +235,11 @@ ENDPROC(__und_invalid)
2515 .macro svc_entry, stack_hole=0, trace=1
2516 UNWIND(.fnstart )
2517 UNWIND(.save {r0 - pc} )
2518+
2519+ pax_enter_kernel
2520+
2521 sub sp, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2522+
2523 #ifdef CONFIG_THUMB2_KERNEL
2524 SPFIX( str r0, [sp] ) @ temporarily saved
2525 SPFIX( mov r0, sp )
2526@@ -165,7 +254,12 @@ ENDPROC(__und_invalid)
2527 ldmia r0, {r3 - r5}
2528 add r7, sp, #S_SP - 4 @ here for interlock avoidance
2529 mov r6, #-1 @ "" "" "" ""
2530+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2531+ @ offset sp by 8 as done in pax_enter_kernel
2532+ add r2, sp, #(S_FRAME_SIZE + \stack_hole + 4)
2533+#else
2534 add r2, sp, #(S_FRAME_SIZE + \stack_hole - 4)
2535+#endif
2536 SPFIX( addeq r2, r2, #4 )
2537 str r3, [sp, #-4]! @ save the "real" r0 copied
2538 @ from the exception stack
2539@@ -369,6 +463,9 @@ ENDPROC(__fiq_abt)
2540 .macro usr_entry, trace=1
2541 UNWIND(.fnstart )
2542 UNWIND(.cantunwind ) @ don't unwind the user space
2543+
2544+ pax_enter_kernel_user
2545+
2546 sub sp, sp, #S_FRAME_SIZE
2547 ARM( stmib sp, {r1 - r12} )
2548 THUMB( stmia sp, {r0 - r12} )
2549@@ -479,7 +576,9 @@ __und_usr:
2550 tst r3, #PSR_T_BIT @ Thumb mode?
2551 bne __und_usr_thumb
2552 sub r4, r2, #4 @ ARM instr at LR - 4
2553+ pax_open_userland
2554 1: ldrt r0, [r4]
2555+ pax_close_userland
2556 ARM_BE8(rev r0, r0) @ little endian instruction
2557
2558 @ r0 = 32-bit ARM instruction which caused the exception
2559@@ -513,11 +612,15 @@ __und_usr_thumb:
2560 */
2561 .arch armv6t2
2562 #endif
2563+ pax_open_userland
2564 2: ldrht r5, [r4]
2565+ pax_close_userland
2566 ARM_BE8(rev16 r5, r5) @ little endian instruction
2567 cmp r5, #0xe800 @ 32bit instruction if xx != 0
2568 blo __und_usr_fault_16 @ 16bit undefined instruction
2569+ pax_open_userland
2570 3: ldrht r0, [r2]
2571+ pax_close_userland
2572 ARM_BE8(rev16 r0, r0) @ little endian instruction
2573 add r2, r2, #2 @ r2 is PC + 2, make it PC + 4
2574 str r2, [sp, #S_PC] @ it's a 2x16bit instr, update
2575@@ -547,7 +650,8 @@ ENDPROC(__und_usr)
2576 */
2577 .pushsection .fixup, "ax"
2578 .align 2
2579-4: str r4, [sp, #S_PC] @ retry current instruction
2580+4: pax_close_userland
2581+ str r4, [sp, #S_PC] @ retry current instruction
2582 ret r9
2583 .popsection
2584 .pushsection __ex_table,"a"
2585@@ -767,7 +871,7 @@ ENTRY(__switch_to)
2586 THUMB( str lr, [ip], #4 )
2587 ldr r4, [r2, #TI_TP_VALUE]
2588 ldr r5, [r2, #TI_TP_VALUE + 4]
2589-#ifdef CONFIG_CPU_USE_DOMAINS
2590+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2591 ldr r6, [r2, #TI_CPU_DOMAIN]
2592 #endif
2593 switch_tls r1, r4, r5, r3, r7
2594@@ -776,7 +880,7 @@ ENTRY(__switch_to)
2595 ldr r8, =__stack_chk_guard
2596 ldr r7, [r7, #TSK_STACK_CANARY]
2597 #endif
2598-#ifdef CONFIG_CPU_USE_DOMAINS
2599+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2600 mcr p15, 0, r6, c3, c0, 0 @ Set domain register
2601 #endif
2602 mov r5, r0
2603diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
2604index f8ccc21..83d192f 100644
2605--- a/arch/arm/kernel/entry-common.S
2606+++ b/arch/arm/kernel/entry-common.S
2607@@ -11,18 +11,46 @@
2608 #include <asm/assembler.h>
2609 #include <asm/unistd.h>
2610 #include <asm/ftrace.h>
2611+#include <asm/domain.h>
2612 #include <asm/unwind.h>
2613
2614+#include "entry-header.S"
2615+
2616 #ifdef CONFIG_NEED_RET_TO_USER
2617 #include <mach/entry-macro.S>
2618 #else
2619 .macro arch_ret_to_user, tmp1, tmp2
2620+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2621+ @ save regs
2622+ stmdb sp!, {r1, r2}
2623+ @ read DACR from cpu_domain into r1
2624+ mov r2, sp
2625+ @ assume 8K pages, since we have to split the immediate in two
2626+ bic r2, r2, #(0x1fc0)
2627+ bic r2, r2, #(0x3f)
2628+ ldr r1, [r2, #TI_CPU_DOMAIN]
2629+#ifdef CONFIG_PAX_KERNEXEC
2630+ @ set type of DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2631+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2632+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2633+#endif
2634+#ifdef CONFIG_PAX_MEMORY_UDEREF
2635+ @ set current DOMAIN_USER to DOMAIN_UDEREF
2636+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2637+ orr r1, r1, #(domain_val(DOMAIN_USER, DOMAIN_UDEREF))
2638+#endif
2639+ @ write r1 to current_thread_info()->cpu_domain
2640+ str r1, [r2, #TI_CPU_DOMAIN]
2641+ @ write r1 to DACR
2642+ mcr p15, 0, r1, c3, c0, 0
2643+ @ instruction sync
2644+ instr_sync
2645+ @ restore regs
2646+ ldmia sp!, {r1, r2}
2647+#endif
2648 .endm
2649 #endif
2650
2651-#include "entry-header.S"
2652-
2653-
2654 .align 5
2655 /*
2656 * This is the fast syscall return path. We do as little as
2657@@ -171,6 +199,12 @@ ENTRY(vector_swi)
2658 USER( ldr scno, [lr, #-4] ) @ get SWI instruction
2659 #endif
2660
2661+ /*
2662+ * do this here to avoid a performance hit of wrapping the code above
2663+ * that directly dereferences userland to parse the SWI instruction
2664+ */
2665+ pax_enter_kernel_user
2666+
2667 adr tbl, sys_call_table @ load syscall table pointer
2668
2669 #if defined(CONFIG_OABI_COMPAT)
2670diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
2671index 1a0045a..9b4f34d 100644
2672--- a/arch/arm/kernel/entry-header.S
2673+++ b/arch/arm/kernel/entry-header.S
2674@@ -196,6 +196,60 @@
2675 msr cpsr_c, \rtemp @ switch back to the SVC mode
2676 .endm
2677
2678+ .macro pax_enter_kernel_user
2679+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2680+ @ save regs
2681+ stmdb sp!, {r0, r1}
2682+ @ read DACR from cpu_domain into r1
2683+ mov r0, sp
2684+ @ assume 8K pages, since we have to split the immediate in two
2685+ bic r0, r0, #(0x1fc0)
2686+ bic r0, r0, #(0x3f)
2687+ ldr r1, [r0, #TI_CPU_DOMAIN]
2688+#ifdef CONFIG_PAX_MEMORY_UDEREF
2689+ @ set current DOMAIN_USER to DOMAIN_NOACCESS
2690+ bic r1, r1, #(domain_val(DOMAIN_USER, 3))
2691+#endif
2692+#ifdef CONFIG_PAX_KERNEXEC
2693+ @ set current DOMAIN_KERNEL to DOMAIN_KERNELCLIENT
2694+ bic r1, r1, #(domain_val(DOMAIN_KERNEL, 3))
2695+ orr r1, r1, #(domain_val(DOMAIN_KERNEL, DOMAIN_KERNELCLIENT))
2696+#endif
2697+ @ write r1 to current_thread_info()->cpu_domain
2698+ str r1, [r0, #TI_CPU_DOMAIN]
2699+ @ write r1 to DACR
2700+ mcr p15, 0, r1, c3, c0, 0
2701+ @ instruction sync
2702+ instr_sync
2703+ @ restore regs
2704+ ldmia sp!, {r0, r1}
2705+#endif
2706+ .endm
2707+
2708+ .macro pax_exit_kernel
2709+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
2710+ @ save regs
2711+ stmdb sp!, {r0, r1}
2712+ @ read old DACR from stack into r1
2713+ ldr r1, [sp, #(8 + S_SP)]
2714+ sub r1, r1, #8
2715+ ldr r1, [r1]
2716+
2717+ @ write r1 to current_thread_info()->cpu_domain
2718+ mov r0, sp
2719+ @ assume 8K pages, since we have to split the immediate in two
2720+ bic r0, r0, #(0x1fc0)
2721+ bic r0, r0, #(0x3f)
2722+ str r1, [r0, #TI_CPU_DOMAIN]
2723+ @ write r1 to DACR
2724+ mcr p15, 0, r1, c3, c0, 0
2725+ @ instruction sync
2726+ instr_sync
2727+ @ restore regs
2728+ ldmia sp!, {r0, r1}
2729+#endif
2730+ .endm
2731+
2732 #ifndef CONFIG_THUMB2_KERNEL
2733 .macro svc_exit, rpsr, irq = 0
2734 .if \irq != 0
2735@@ -215,6 +269,9 @@
2736 blne trace_hardirqs_off
2737 #endif
2738 .endif
2739+
2740+ pax_exit_kernel
2741+
2742 msr spsr_cxsf, \rpsr
2743 #if defined(CONFIG_CPU_V6) || defined(CONFIG_CPU_32v6K)
2744 @ We must avoid clrex due to Cortex-A15 erratum #830321
2745@@ -291,6 +348,9 @@
2746 blne trace_hardirqs_off
2747 #endif
2748 .endif
2749+
2750+ pax_exit_kernel
2751+
2752 ldr lr, [sp, #S_SP] @ top of the stack
2753 ldrd r0, r1, [sp, #S_LR] @ calling lr and pc
2754
2755diff --git a/arch/arm/kernel/fiq.c b/arch/arm/kernel/fiq.c
2756index 059c3da..8e45cfc 100644
2757--- a/arch/arm/kernel/fiq.c
2758+++ b/arch/arm/kernel/fiq.c
2759@@ -95,7 +95,10 @@ void set_fiq_handler(void *start, unsigned int length)
2760 void *base = vectors_page;
2761 unsigned offset = FIQ_OFFSET;
2762
2763+ pax_open_kernel();
2764 memcpy(base + offset, start, length);
2765+ pax_close_kernel();
2766+
2767 if (!cache_is_vipt_nonaliasing())
2768 flush_icache_range((unsigned long)base + offset, offset +
2769 length);
2770diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
2771index 0196327..50ac8895 100644
2772--- a/arch/arm/kernel/head.S
2773+++ b/arch/arm/kernel/head.S
2774@@ -444,7 +444,7 @@ __enable_mmu:
2775 mov r5, #(domain_val(DOMAIN_USER, DOMAIN_MANAGER) | \
2776 domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
2777 domain_val(DOMAIN_TABLE, DOMAIN_MANAGER) | \
2778- domain_val(DOMAIN_IO, DOMAIN_CLIENT))
2779+ domain_val(DOMAIN_IO, DOMAIN_KERNELCLIENT))
2780 mcr p15, 0, r5, c3, c0, 0 @ load domain access register
2781 mcr p15, 0, r4, c2, c0, 0 @ load page table pointer
2782 #endif
2783diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
2784index 2e11961..07f0704 100644
2785--- a/arch/arm/kernel/module.c
2786+++ b/arch/arm/kernel/module.c
2787@@ -38,12 +38,39 @@
2788 #endif
2789
2790 #ifdef CONFIG_MMU
2791-void *module_alloc(unsigned long size)
2792+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
2793 {
2794+ if (!size || PAGE_ALIGN(size) > MODULES_END - MODULES_VADDR)
2795+ return NULL;
2796 return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
2797- GFP_KERNEL, PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
2798+ GFP_KERNEL, prot, 0, NUMA_NO_NODE,
2799 __builtin_return_address(0));
2800 }
2801+
2802+void *module_alloc(unsigned long size)
2803+{
2804+
2805+#ifdef CONFIG_PAX_KERNEXEC
2806+ return __module_alloc(size, PAGE_KERNEL);
2807+#else
2808+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2809+#endif
2810+
2811+}
2812+
2813+#ifdef CONFIG_PAX_KERNEXEC
2814+void module_memfree_exec(void *module_region)
2815+{
2816+ module_memfree(module_region);
2817+}
2818+EXPORT_SYMBOL(module_memfree_exec);
2819+
2820+void *module_alloc_exec(unsigned long size)
2821+{
2822+ return __module_alloc(size, PAGE_KERNEL_EXEC);
2823+}
2824+EXPORT_SYMBOL(module_alloc_exec);
2825+#endif
2826 #endif
2827
2828 int
2829diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
2830index 69bda1a..755113a 100644
2831--- a/arch/arm/kernel/patch.c
2832+++ b/arch/arm/kernel/patch.c
2833@@ -66,6 +66,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2834 else
2835 __acquire(&patch_lock);
2836
2837+ pax_open_kernel();
2838 if (thumb2 && __opcode_is_thumb16(insn)) {
2839 *(u16 *)waddr = __opcode_to_mem_thumb16(insn);
2840 size = sizeof(u16);
2841@@ -97,6 +98,7 @@ void __kprobes __patch_text_real(void *addr, unsigned int insn, bool remap)
2842 *(u32 *)waddr = insn;
2843 size = sizeof(u32);
2844 }
2845+ pax_close_kernel();
2846
2847 if (waddr != addr) {
2848 flush_kernel_vmap_range(waddr, twopage ? size / 2 : size);
2849diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
2850index 2bf1a16..d959d40 100644
2851--- a/arch/arm/kernel/process.c
2852+++ b/arch/arm/kernel/process.c
2853@@ -213,6 +213,7 @@ void machine_power_off(void)
2854
2855 if (pm_power_off)
2856 pm_power_off();
2857+ BUG();
2858 }
2859
2860 /*
2861@@ -226,7 +227,7 @@ void machine_power_off(void)
2862 * executing pre-reset code, and using RAM that the primary CPU's code wishes
2863 * to use. Implementing such co-ordination would be essentially impossible.
2864 */
2865-void machine_restart(char *cmd)
2866+__noreturn void machine_restart(char *cmd)
2867 {
2868 local_irq_disable();
2869 smp_send_stop();
2870@@ -252,8 +253,8 @@ void __show_regs(struct pt_regs *regs)
2871
2872 show_regs_print_info(KERN_DEFAULT);
2873
2874- print_symbol("PC is at %s\n", instruction_pointer(regs));
2875- print_symbol("LR is at %s\n", regs->ARM_lr);
2876+ printk("PC is at %pA\n", (void *)instruction_pointer(regs));
2877+ printk("LR is at %pA\n", (void *)regs->ARM_lr);
2878 printk("pc : [<%08lx>] lr : [<%08lx>] psr: %08lx\n"
2879 "sp : %08lx ip : %08lx fp : %08lx\n",
2880 regs->ARM_pc, regs->ARM_lr, regs->ARM_cpsr,
2881@@ -430,12 +431,6 @@ unsigned long get_wchan(struct task_struct *p)
2882 return 0;
2883 }
2884
2885-unsigned long arch_randomize_brk(struct mm_struct *mm)
2886-{
2887- unsigned long range_end = mm->brk + 0x02000000;
2888- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
2889-}
2890-
2891 #ifdef CONFIG_MMU
2892 #ifdef CONFIG_KUSER_HELPERS
2893 /*
2894@@ -451,7 +446,7 @@ static struct vm_area_struct gate_vma = {
2895
2896 static int __init gate_vma_init(void)
2897 {
2898- gate_vma.vm_page_prot = PAGE_READONLY_EXEC;
2899+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
2900 return 0;
2901 }
2902 arch_initcall(gate_vma_init);
2903@@ -480,81 +475,13 @@ const char *arch_vma_name(struct vm_area_struct *vma)
2904 return is_gate_vma(vma) ? "[vectors]" : NULL;
2905 }
2906
2907-/* If possible, provide a placement hint at a random offset from the
2908- * stack for the signal page.
2909- */
2910-static unsigned long sigpage_addr(const struct mm_struct *mm,
2911- unsigned int npages)
2912-{
2913- unsigned long offset;
2914- unsigned long first;
2915- unsigned long last;
2916- unsigned long addr;
2917- unsigned int slots;
2918-
2919- first = PAGE_ALIGN(mm->start_stack);
2920-
2921- last = TASK_SIZE - (npages << PAGE_SHIFT);
2922-
2923- /* No room after stack? */
2924- if (first > last)
2925- return 0;
2926-
2927- /* Just enough room? */
2928- if (first == last)
2929- return first;
2930-
2931- slots = ((last - first) >> PAGE_SHIFT) + 1;
2932-
2933- offset = get_random_int() % slots;
2934-
2935- addr = first + (offset << PAGE_SHIFT);
2936-
2937- return addr;
2938-}
2939-
2940-static struct page *signal_page;
2941-extern struct page *get_signal_page(void);
2942-
2943-static const struct vm_special_mapping sigpage_mapping = {
2944- .name = "[sigpage]",
2945- .pages = &signal_page,
2946-};
2947-
2948 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
2949 {
2950 struct mm_struct *mm = current->mm;
2951- struct vm_area_struct *vma;
2952- unsigned long addr;
2953- unsigned long hint;
2954- int ret = 0;
2955-
2956- if (!signal_page)
2957- signal_page = get_signal_page();
2958- if (!signal_page)
2959- return -ENOMEM;
2960
2961 down_write(&mm->mmap_sem);
2962- hint = sigpage_addr(mm, 1);
2963- addr = get_unmapped_area(NULL, hint, PAGE_SIZE, 0, 0);
2964- if (IS_ERR_VALUE(addr)) {
2965- ret = addr;
2966- goto up_fail;
2967- }
2968-
2969- vma = _install_special_mapping(mm, addr, PAGE_SIZE,
2970- VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
2971- &sigpage_mapping);
2972-
2973- if (IS_ERR(vma)) {
2974- ret = PTR_ERR(vma);
2975- goto up_fail;
2976- }
2977-
2978- mm->context.sigpage = addr;
2979-
2980- up_fail:
2981+ mm->context.sigpage = (PAGE_OFFSET + (get_random_int() % 0x3FFEFFE0)) & 0xFFFFFFFC;
2982 up_write(&mm->mmap_sem);
2983- return ret;
2984+ return 0;
2985 }
2986 #endif
2987diff --git a/arch/arm/kernel/psci.c b/arch/arm/kernel/psci.c
2988index f73891b..cf3004e 100644
2989--- a/arch/arm/kernel/psci.c
2990+++ b/arch/arm/kernel/psci.c
2991@@ -28,7 +28,7 @@
2992 #include <asm/psci.h>
2993 #include <asm/system_misc.h>
2994
2995-struct psci_operations psci_ops;
2996+struct psci_operations psci_ops __read_only;
2997
2998 static int (*invoke_psci_fn)(u32, u32, u32, u32);
2999 typedef int (*psci_initcall_t)(const struct device_node *);
3000diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c
3001index ef9119f..31995a3 100644
3002--- a/arch/arm/kernel/ptrace.c
3003+++ b/arch/arm/kernel/ptrace.c
3004@@ -928,10 +928,19 @@ static void tracehook_report_syscall(struct pt_regs *regs,
3005 regs->ARM_ip = ip;
3006 }
3007
3008+#ifdef CONFIG_GRKERNSEC_SETXID
3009+extern void gr_delayed_cred_worker(void);
3010+#endif
3011+
3012 asmlinkage int syscall_trace_enter(struct pt_regs *regs, int scno)
3013 {
3014 current_thread_info()->syscall = scno;
3015
3016+#ifdef CONFIG_GRKERNSEC_SETXID
3017+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
3018+ gr_delayed_cred_worker();
3019+#endif
3020+
3021 /* Do the secure computing check first; failures should be fast. */
3022 #ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER
3023 if (secure_computing() == -1)
3024diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
3025index 1d60beb..4aa25d5 100644
3026--- a/arch/arm/kernel/setup.c
3027+++ b/arch/arm/kernel/setup.c
3028@@ -105,21 +105,23 @@ EXPORT_SYMBOL(elf_hwcap);
3029 unsigned int elf_hwcap2 __read_mostly;
3030 EXPORT_SYMBOL(elf_hwcap2);
3031
3032+pteval_t __supported_pte_mask __read_only;
3033+pmdval_t __supported_pmd_mask __read_only;
3034
3035 #ifdef MULTI_CPU
3036-struct processor processor __read_mostly;
3037+struct processor processor __read_only;
3038 #endif
3039 #ifdef MULTI_TLB
3040-struct cpu_tlb_fns cpu_tlb __read_mostly;
3041+struct cpu_tlb_fns cpu_tlb __read_only;
3042 #endif
3043 #ifdef MULTI_USER
3044-struct cpu_user_fns cpu_user __read_mostly;
3045+struct cpu_user_fns cpu_user __read_only;
3046 #endif
3047 #ifdef MULTI_CACHE
3048-struct cpu_cache_fns cpu_cache __read_mostly;
3049+struct cpu_cache_fns cpu_cache __read_only;
3050 #endif
3051 #ifdef CONFIG_OUTER_CACHE
3052-struct outer_cache_fns outer_cache __read_mostly;
3053+struct outer_cache_fns outer_cache __read_only;
3054 EXPORT_SYMBOL(outer_cache);
3055 #endif
3056
3057@@ -250,9 +252,13 @@ static int __get_cpu_architecture(void)
3058 * Register 0 and check for VMSAv7 or PMSAv7 */
3059 unsigned int mmfr0 = read_cpuid_ext(CPUID_EXT_MMFR0);
3060 if ((mmfr0 & 0x0000000f) >= 0x00000003 ||
3061- (mmfr0 & 0x000000f0) >= 0x00000030)
3062+ (mmfr0 & 0x000000f0) >= 0x00000030) {
3063 cpu_arch = CPU_ARCH_ARMv7;
3064- else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3065+ if ((mmfr0 & 0x0000000f) == 0x00000005 || (mmfr0 & 0x0000000f) == 0x00000004) {
3066+ __supported_pte_mask |= L_PTE_PXN;
3067+ __supported_pmd_mask |= PMD_PXNTABLE;
3068+ }
3069+ } else if ((mmfr0 & 0x0000000f) == 0x00000002 ||
3070 (mmfr0 & 0x000000f0) == 0x00000020)
3071 cpu_arch = CPU_ARCH_ARMv6;
3072 else
3073diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
3074index 023ac90..0a69950 100644
3075--- a/arch/arm/kernel/signal.c
3076+++ b/arch/arm/kernel/signal.c
3077@@ -24,8 +24,6 @@
3078
3079 extern const unsigned long sigreturn_codes[7];
3080
3081-static unsigned long signal_return_offset;
3082-
3083 #ifdef CONFIG_CRUNCH
3084 static int preserve_crunch_context(struct crunch_sigframe __user *frame)
3085 {
3086@@ -396,8 +394,7 @@ setup_return(struct pt_regs *regs, struct ksignal *ksig,
3087 * except when the MPU has protected the vectors
3088 * page from PL0
3089 */
3090- retcode = mm->context.sigpage + signal_return_offset +
3091- (idx << 2) + thumb;
3092+ retcode = mm->context.sigpage + (idx << 2) + thumb;
3093 } else
3094 #endif
3095 {
3096@@ -603,33 +600,3 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
3097 } while (thread_flags & _TIF_WORK_MASK);
3098 return 0;
3099 }
3100-
3101-struct page *get_signal_page(void)
3102-{
3103- unsigned long ptr;
3104- unsigned offset;
3105- struct page *page;
3106- void *addr;
3107-
3108- page = alloc_pages(GFP_KERNEL, 0);
3109-
3110- if (!page)
3111- return NULL;
3112-
3113- addr = page_address(page);
3114-
3115- /* Give the signal return code some randomness */
3116- offset = 0x200 + (get_random_int() & 0x7fc);
3117- signal_return_offset = offset;
3118-
3119- /*
3120- * Copy signal return handlers into the vector page, and
3121- * set sigreturn to be a pointer to these.
3122- */
3123- memcpy(addr + offset, sigreturn_codes, sizeof(sigreturn_codes));
3124-
3125- ptr = (unsigned long)addr + offset;
3126- flush_icache_range(ptr, ptr + sizeof(sigreturn_codes));
3127-
3128- return page;
3129-}
3130diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
3131index 86ef244..c518451 100644
3132--- a/arch/arm/kernel/smp.c
3133+++ b/arch/arm/kernel/smp.c
3134@@ -76,7 +76,7 @@ enum ipi_msg_type {
3135
3136 static DECLARE_COMPLETION(cpu_running);
3137
3138-static struct smp_operations smp_ops;
3139+static struct smp_operations smp_ops __read_only;
3140
3141 void __init smp_set_ops(struct smp_operations *ops)
3142 {
3143diff --git a/arch/arm/kernel/tcm.c b/arch/arm/kernel/tcm.c
3144index 7a3be1d..b00c7de 100644
3145--- a/arch/arm/kernel/tcm.c
3146+++ b/arch/arm/kernel/tcm.c
3147@@ -61,7 +61,7 @@ static struct map_desc itcm_iomap[] __initdata = {
3148 .virtual = ITCM_OFFSET,
3149 .pfn = __phys_to_pfn(ITCM_OFFSET),
3150 .length = 0,
3151- .type = MT_MEMORY_RWX_ITCM,
3152+ .type = MT_MEMORY_RX_ITCM,
3153 }
3154 };
3155
3156@@ -267,7 +267,9 @@ no_dtcm:
3157 start = &__sitcm_text;
3158 end = &__eitcm_text;
3159 ram = &__itcm_start;
3160+ pax_open_kernel();
3161 memcpy(start, ram, itcm_code_sz);
3162+ pax_close_kernel();
3163 pr_debug("CPU ITCM: copied code from %p - %p\n",
3164 start, end);
3165 itcm_present = true;
3166diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
3167index 788e23f..6fa06a1 100644
3168--- a/arch/arm/kernel/traps.c
3169+++ b/arch/arm/kernel/traps.c
3170@@ -65,7 +65,7 @@ static void dump_mem(const char *, const char *, unsigned long, unsigned long);
3171 void dump_backtrace_entry(unsigned long where, unsigned long from, unsigned long frame)
3172 {
3173 #ifdef CONFIG_KALLSYMS
3174- printk("[<%08lx>] (%ps) from [<%08lx>] (%pS)\n", where, (void *)where, from, (void *)from);
3175+ printk("[<%08lx>] (%pA) from [<%08lx>] (%pA)\n", where, (void *)where, from, (void *)from);
3176 #else
3177 printk("Function entered at [<%08lx>] from [<%08lx>]\n", where, from);
3178 #endif
3179@@ -267,6 +267,8 @@ static arch_spinlock_t die_lock = __ARCH_SPIN_LOCK_UNLOCKED;
3180 static int die_owner = -1;
3181 static unsigned int die_nest_count;
3182
3183+extern void gr_handle_kernel_exploit(void);
3184+
3185 static unsigned long oops_begin(void)
3186 {
3187 int cpu;
3188@@ -309,6 +311,9 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
3189 panic("Fatal exception in interrupt");
3190 if (panic_on_oops)
3191 panic("Fatal exception");
3192+
3193+ gr_handle_kernel_exploit();
3194+
3195 if (signr)
3196 do_exit(signr);
3197 }
3198@@ -880,7 +885,11 @@ void __init early_trap_init(void *vectors_base)
3199 kuser_init(vectors_base);
3200
3201 flush_icache_range(vectors, vectors + PAGE_SIZE * 2);
3202- modify_domain(DOMAIN_USER, DOMAIN_CLIENT);
3203+
3204+#ifndef CONFIG_PAX_MEMORY_UDEREF
3205+ modify_domain(DOMAIN_USER, DOMAIN_USERCLIENT);
3206+#endif
3207+
3208 #else /* ifndef CONFIG_CPU_V7M */
3209 /*
3210 * on V7-M there is no need to copy the vector table to a dedicated
3211diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S
3212index b31aa73..cc4b7a1 100644
3213--- a/arch/arm/kernel/vmlinux.lds.S
3214+++ b/arch/arm/kernel/vmlinux.lds.S
3215@@ -37,7 +37,7 @@
3216 #endif
3217
3218 #if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
3219- defined(CONFIG_GENERIC_BUG)
3220+ defined(CONFIG_GENERIC_BUG) || defined(CONFIG_PAX_REFCOUNT)
3221 #define ARM_EXIT_KEEP(x) x
3222 #define ARM_EXIT_DISCARD(x)
3223 #else
3224@@ -123,6 +123,8 @@ SECTIONS
3225 #ifdef CONFIG_DEBUG_RODATA
3226 . = ALIGN(1<<SECTION_SHIFT);
3227 #endif
3228+ _etext = .; /* End of text section */
3229+
3230 RO_DATA(PAGE_SIZE)
3231
3232 . = ALIGN(4);
3233@@ -153,8 +155,6 @@ SECTIONS
3234
3235 NOTES
3236
3237- _etext = .; /* End of text and rodata section */
3238-
3239 #ifndef CONFIG_XIP_KERNEL
3240 # ifdef CONFIG_ARM_KERNMEM_PERMS
3241 . = ALIGN(1<<SECTION_SHIFT);
3242diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
3243index b652af5..60231ab 100644
3244--- a/arch/arm/kvm/arm.c
3245+++ b/arch/arm/kvm/arm.c
3246@@ -57,7 +57,7 @@ static unsigned long hyp_default_vectors;
3247 static DEFINE_PER_CPU(struct kvm_vcpu *, kvm_arm_running_vcpu);
3248
3249 /* The VMID used in the VTTBR */
3250-static atomic64_t kvm_vmid_gen = ATOMIC64_INIT(1);
3251+static atomic64_unchecked_t kvm_vmid_gen = ATOMIC64_INIT(1);
3252 static u8 kvm_next_vmid;
3253 static DEFINE_SPINLOCK(kvm_vmid_lock);
3254
3255@@ -358,7 +358,7 @@ void force_vm_exit(const cpumask_t *mask)
3256 */
3257 static bool need_new_vmid_gen(struct kvm *kvm)
3258 {
3259- return unlikely(kvm->arch.vmid_gen != atomic64_read(&kvm_vmid_gen));
3260+ return unlikely(kvm->arch.vmid_gen != atomic64_read_unchecked(&kvm_vmid_gen));
3261 }
3262
3263 /**
3264@@ -391,7 +391,7 @@ static void update_vttbr(struct kvm *kvm)
3265
3266 /* First user of a new VMID generation? */
3267 if (unlikely(kvm_next_vmid == 0)) {
3268- atomic64_inc(&kvm_vmid_gen);
3269+ atomic64_inc_unchecked(&kvm_vmid_gen);
3270 kvm_next_vmid = 1;
3271
3272 /*
3273@@ -408,7 +408,7 @@ static void update_vttbr(struct kvm *kvm)
3274 kvm_call_hyp(__kvm_flush_vm_context);
3275 }
3276
3277- kvm->arch.vmid_gen = atomic64_read(&kvm_vmid_gen);
3278+ kvm->arch.vmid_gen = atomic64_read_unchecked(&kvm_vmid_gen);
3279 kvm->arch.vmid = kvm_next_vmid;
3280 kvm_next_vmid++;
3281
3282@@ -1087,7 +1087,7 @@ struct kvm_vcpu *kvm_mpidr_to_vcpu(struct kvm *kvm, unsigned long mpidr)
3283 /**
3284 * Initialize Hyp-mode and memory mappings on all CPUs.
3285 */
3286-int kvm_arch_init(void *opaque)
3287+int kvm_arch_init(const void *opaque)
3288 {
3289 int err;
3290 int ret, cpu;
3291diff --git a/arch/arm/lib/clear_user.S b/arch/arm/lib/clear_user.S
3292index 14a0d98..7771a7d 100644
3293--- a/arch/arm/lib/clear_user.S
3294+++ b/arch/arm/lib/clear_user.S
3295@@ -12,14 +12,14 @@
3296
3297 .text
3298
3299-/* Prototype: int __clear_user(void *addr, size_t sz)
3300+/* Prototype: int ___clear_user(void *addr, size_t sz)
3301 * Purpose : clear some user memory
3302 * Params : addr - user memory address to clear
3303 * : sz - number of bytes to clear
3304 * Returns : number of bytes NOT cleared
3305 */
3306 ENTRY(__clear_user_std)
3307-WEAK(__clear_user)
3308+WEAK(___clear_user)
3309 stmfd sp!, {r1, lr}
3310 mov r2, #0
3311 cmp r1, #4
3312@@ -44,7 +44,7 @@ WEAK(__clear_user)
3313 USER( strnebt r2, [r0])
3314 mov r0, #0
3315 ldmfd sp!, {r1, pc}
3316-ENDPROC(__clear_user)
3317+ENDPROC(___clear_user)
3318 ENDPROC(__clear_user_std)
3319
3320 .pushsection .fixup,"ax"
3321diff --git a/arch/arm/lib/copy_from_user.S b/arch/arm/lib/copy_from_user.S
3322index 7a235b9..73a0556 100644
3323--- a/arch/arm/lib/copy_from_user.S
3324+++ b/arch/arm/lib/copy_from_user.S
3325@@ -17,7 +17,7 @@
3326 /*
3327 * Prototype:
3328 *
3329- * size_t __copy_from_user(void *to, const void *from, size_t n)
3330+ * size_t ___copy_from_user(void *to, const void *from, size_t n)
3331 *
3332 * Purpose:
3333 *
3334@@ -89,11 +89,11 @@
3335
3336 .text
3337
3338-ENTRY(__copy_from_user)
3339+ENTRY(___copy_from_user)
3340
3341 #include "copy_template.S"
3342
3343-ENDPROC(__copy_from_user)
3344+ENDPROC(___copy_from_user)
3345
3346 .pushsection .fixup,"ax"
3347 .align 0
3348diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
3349index 6ee2f67..d1cce76 100644
3350--- a/arch/arm/lib/copy_page.S
3351+++ b/arch/arm/lib/copy_page.S
3352@@ -10,6 +10,7 @@
3353 * ASM optimised string functions
3354 */
3355 #include <linux/linkage.h>
3356+#include <linux/const.h>
3357 #include <asm/assembler.h>
3358 #include <asm/asm-offsets.h>
3359 #include <asm/cache.h>
3360diff --git a/arch/arm/lib/copy_to_user.S b/arch/arm/lib/copy_to_user.S
3361index a9d3db1..164b089 100644
3362--- a/arch/arm/lib/copy_to_user.S
3363+++ b/arch/arm/lib/copy_to_user.S
3364@@ -17,7 +17,7 @@
3365 /*
3366 * Prototype:
3367 *
3368- * size_t __copy_to_user(void *to, const void *from, size_t n)
3369+ * size_t ___copy_to_user(void *to, const void *from, size_t n)
3370 *
3371 * Purpose:
3372 *
3373@@ -93,11 +93,11 @@
3374 .text
3375
3376 ENTRY(__copy_to_user_std)
3377-WEAK(__copy_to_user)
3378+WEAK(___copy_to_user)
3379
3380 #include "copy_template.S"
3381
3382-ENDPROC(__copy_to_user)
3383+ENDPROC(___copy_to_user)
3384 ENDPROC(__copy_to_user_std)
3385
3386 .pushsection .fixup,"ax"
3387diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
3388index 7d08b43..f7ca7ea 100644
3389--- a/arch/arm/lib/csumpartialcopyuser.S
3390+++ b/arch/arm/lib/csumpartialcopyuser.S
3391@@ -57,8 +57,8 @@
3392 * Returns : r0 = checksum, [[sp, #0], #0] = 0 or -EFAULT
3393 */
3394
3395-#define FN_ENTRY ENTRY(csum_partial_copy_from_user)
3396-#define FN_EXIT ENDPROC(csum_partial_copy_from_user)
3397+#define FN_ENTRY ENTRY(__csum_partial_copy_from_user)
3398+#define FN_EXIT ENDPROC(__csum_partial_copy_from_user)
3399
3400 #include "csumpartialcopygeneric.S"
3401
3402diff --git a/arch/arm/lib/delay.c b/arch/arm/lib/delay.c
3403index 312d43e..21d2322 100644
3404--- a/arch/arm/lib/delay.c
3405+++ b/arch/arm/lib/delay.c
3406@@ -29,7 +29,7 @@
3407 /*
3408 * Default to the loop-based delay implementation.
3409 */
3410-struct arm_delay_ops arm_delay_ops = {
3411+struct arm_delay_ops arm_delay_ops __read_only = {
3412 .delay = __loop_delay,
3413 .const_udelay = __loop_const_udelay,
3414 .udelay = __loop_udelay,
3415diff --git a/arch/arm/lib/uaccess_with_memcpy.c b/arch/arm/lib/uaccess_with_memcpy.c
3416index 3e58d71..029817c 100644
3417--- a/arch/arm/lib/uaccess_with_memcpy.c
3418+++ b/arch/arm/lib/uaccess_with_memcpy.c
3419@@ -136,7 +136,7 @@ out:
3420 }
3421
3422 unsigned long
3423-__copy_to_user(void __user *to, const void *from, unsigned long n)
3424+___copy_to_user(void __user *to, const void *from, unsigned long n)
3425 {
3426 /*
3427 * This test is stubbed out of the main function above to keep
3428@@ -190,7 +190,7 @@ out:
3429 return n;
3430 }
3431
3432-unsigned long __clear_user(void __user *addr, unsigned long n)
3433+unsigned long ___clear_user(void __user *addr, unsigned long n)
3434 {
3435 /* See rational for this in __copy_to_user() above. */
3436 if (n < 64)
3437diff --git a/arch/arm/mach-exynos/suspend.c b/arch/arm/mach-exynos/suspend.c
3438index 318d127..9aab0d1 100644
3439--- a/arch/arm/mach-exynos/suspend.c
3440+++ b/arch/arm/mach-exynos/suspend.c
3441@@ -18,6 +18,7 @@
3442 #include <linux/syscore_ops.h>
3443 #include <linux/cpu_pm.h>
3444 #include <linux/io.h>
3445+#include <linux/irq.h>
3446 #include <linux/irqchip/arm-gic.h>
3447 #include <linux/err.h>
3448 #include <linux/regulator/machine.h>
3449@@ -632,8 +633,10 @@ void __init exynos_pm_init(void)
3450 tmp |= pm_data->wake_disable_mask;
3451 pmu_raw_writel(tmp, S5P_WAKEUP_MASK);
3452
3453- exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3454- exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3455+ pax_open_kernel();
3456+ *(void **)&exynos_pm_syscore_ops.suspend = pm_data->pm_suspend;
3457+ *(void **)&exynos_pm_syscore_ops.resume = pm_data->pm_resume;
3458+ pax_close_kernel();
3459
3460 register_syscore_ops(&exynos_pm_syscore_ops);
3461 suspend_set_ops(&exynos_suspend_ops);
3462diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c
3463index 0662087..004d163 100644
3464--- a/arch/arm/mach-keystone/keystone.c
3465+++ b/arch/arm/mach-keystone/keystone.c
3466@@ -27,7 +27,7 @@
3467
3468 #include "keystone.h"
3469
3470-static struct notifier_block platform_nb;
3471+static notifier_block_no_const platform_nb;
3472 static unsigned long keystone_dma_pfn_offset __read_mostly;
3473
3474 static int keystone_platform_notifier(struct notifier_block *nb,
3475diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
3476index e46e9ea..9141c83 100644
3477--- a/arch/arm/mach-mvebu/coherency.c
3478+++ b/arch/arm/mach-mvebu/coherency.c
3479@@ -117,7 +117,7 @@ static void __init armada_370_coherency_init(struct device_node *np)
3480
3481 /*
3482 * This ioremap hook is used on Armada 375/38x to ensure that PCIe
3483- * memory areas are mapped as MT_UNCACHED instead of MT_DEVICE. This
3484+ * memory areas are mapped as MT_UNCACHED_RW instead of MT_DEVICE. This
3485 * is needed as a workaround for a deadlock issue between the PCIe
3486 * interface and the cache controller.
3487 */
3488@@ -130,7 +130,7 @@ armada_pcie_wa_ioremap_caller(phys_addr_t phys_addr, size_t size,
3489 mvebu_mbus_get_pcie_mem_aperture(&pcie_mem);
3490
3491 if (pcie_mem.start <= phys_addr && (phys_addr + size) <= pcie_mem.end)
3492- mtype = MT_UNCACHED;
3493+ mtype = MT_UNCACHED_RW;
3494
3495 return __arm_ioremap_caller(phys_addr, size, mtype, caller);
3496 }
3497diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
3498index b6443a4..20a0b74 100644
3499--- a/arch/arm/mach-omap2/board-n8x0.c
3500+++ b/arch/arm/mach-omap2/board-n8x0.c
3501@@ -569,7 +569,7 @@ static int n8x0_menelaus_late_init(struct device *dev)
3502 }
3503 #endif
3504
3505-struct menelaus_platform_data n8x0_menelaus_platform_data __initdata = {
3506+struct menelaus_platform_data n8x0_menelaus_platform_data __initconst = {
3507 .late_init = n8x0_menelaus_late_init,
3508 };
3509
3510diff --git a/arch/arm/mach-omap2/omap-mpuss-lowpower.c b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3511index 79f49d9..70bf184 100644
3512--- a/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3513+++ b/arch/arm/mach-omap2/omap-mpuss-lowpower.c
3514@@ -86,7 +86,7 @@ struct cpu_pm_ops {
3515 void (*resume)(void);
3516 void (*scu_prepare)(unsigned int cpu_id, unsigned int cpu_state);
3517 void (*hotplug_restart)(void);
3518-};
3519+} __no_const;
3520
3521 static DEFINE_PER_CPU(struct omap4_cpu_pm_info, omap4_pm_info);
3522 static struct powerdomain *mpuss_pd;
3523@@ -105,7 +105,7 @@ static void dummy_cpu_resume(void)
3524 static void dummy_scu_prepare(unsigned int cpu_id, unsigned int cpu_state)
3525 {}
3526
3527-struct cpu_pm_ops omap_pm_ops = {
3528+static struct cpu_pm_ops omap_pm_ops __read_only = {
3529 .finish_suspend = default_finish_suspend,
3530 .resume = dummy_cpu_resume,
3531 .scu_prepare = dummy_scu_prepare,
3532diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
3533index 5305ec7..6d74045 100644
3534--- a/arch/arm/mach-omap2/omap-smp.c
3535+++ b/arch/arm/mach-omap2/omap-smp.c
3536@@ -19,6 +19,7 @@
3537 #include <linux/device.h>
3538 #include <linux/smp.h>
3539 #include <linux/io.h>
3540+#include <linux/irq.h>
3541 #include <linux/irqchip/arm-gic.h>
3542
3543 #include <asm/smp_scu.h>
3544diff --git a/arch/arm/mach-omap2/omap-wakeupgen.c b/arch/arm/mach-omap2/omap-wakeupgen.c
3545index f961c46..4a453dc 100644
3546--- a/arch/arm/mach-omap2/omap-wakeupgen.c
3547+++ b/arch/arm/mach-omap2/omap-wakeupgen.c
3548@@ -344,7 +344,7 @@ static int irq_cpu_hotplug_notify(struct notifier_block *self,
3549 return NOTIFY_OK;
3550 }
3551
3552-static struct notifier_block __refdata irq_hotplug_notifier = {
3553+static struct notifier_block irq_hotplug_notifier = {
3554 .notifier_call = irq_cpu_hotplug_notify,
3555 };
3556
3557diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
3558index be9541e..821805f 100644
3559--- a/arch/arm/mach-omap2/omap_device.c
3560+++ b/arch/arm/mach-omap2/omap_device.c
3561@@ -510,7 +510,7 @@ void omap_device_delete(struct omap_device *od)
3562 struct platform_device __init *omap_device_build(const char *pdev_name,
3563 int pdev_id,
3564 struct omap_hwmod *oh,
3565- void *pdata, int pdata_len)
3566+ const void *pdata, int pdata_len)
3567 {
3568 struct omap_hwmod *ohs[] = { oh };
3569
3570@@ -538,7 +538,7 @@ struct platform_device __init *omap_device_build(const char *pdev_name,
3571 struct platform_device __init *omap_device_build_ss(const char *pdev_name,
3572 int pdev_id,
3573 struct omap_hwmod **ohs,
3574- int oh_cnt, void *pdata,
3575+ int oh_cnt, const void *pdata,
3576 int pdata_len)
3577 {
3578 int ret = -ENOMEM;
3579diff --git a/arch/arm/mach-omap2/omap_device.h b/arch/arm/mach-omap2/omap_device.h
3580index 78c02b3..c94109a 100644
3581--- a/arch/arm/mach-omap2/omap_device.h
3582+++ b/arch/arm/mach-omap2/omap_device.h
3583@@ -72,12 +72,12 @@ int omap_device_idle(struct platform_device *pdev);
3584 /* Core code interface */
3585
3586 struct platform_device *omap_device_build(const char *pdev_name, int pdev_id,
3587- struct omap_hwmod *oh, void *pdata,
3588+ struct omap_hwmod *oh, const void *pdata,
3589 int pdata_len);
3590
3591 struct platform_device *omap_device_build_ss(const char *pdev_name, int pdev_id,
3592 struct omap_hwmod **oh, int oh_cnt,
3593- void *pdata, int pdata_len);
3594+ const void *pdata, int pdata_len);
3595
3596 struct omap_device *omap_device_alloc(struct platform_device *pdev,
3597 struct omap_hwmod **ohs, int oh_cnt);
3598diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
3599index 355b089..2c9d7c3 100644
3600--- a/arch/arm/mach-omap2/omap_hwmod.c
3601+++ b/arch/arm/mach-omap2/omap_hwmod.c
3602@@ -193,10 +193,10 @@ struct omap_hwmod_soc_ops {
3603 int (*init_clkdm)(struct omap_hwmod *oh);
3604 void (*update_context_lost)(struct omap_hwmod *oh);
3605 int (*get_context_lost)(struct omap_hwmod *oh);
3606-};
3607+} __no_const;
3608
3609 /* soc_ops: adapts the omap_hwmod code to the currently-booted SoC */
3610-static struct omap_hwmod_soc_ops soc_ops;
3611+static struct omap_hwmod_soc_ops soc_ops __read_only;
3612
3613 /* omap_hwmod_list contains all registered struct omap_hwmods */
3614 static LIST_HEAD(omap_hwmod_list);
3615diff --git a/arch/arm/mach-omap2/powerdomains43xx_data.c b/arch/arm/mach-omap2/powerdomains43xx_data.c
3616index 95fee54..cfa9cf1 100644
3617--- a/arch/arm/mach-omap2/powerdomains43xx_data.c
3618+++ b/arch/arm/mach-omap2/powerdomains43xx_data.c
3619@@ -10,6 +10,7 @@
3620
3621 #include <linux/kernel.h>
3622 #include <linux/init.h>
3623+#include <asm/pgtable.h>
3624
3625 #include "powerdomain.h"
3626
3627@@ -129,7 +130,9 @@ static int am43xx_check_vcvp(void)
3628
3629 void __init am43xx_powerdomains_init(void)
3630 {
3631- omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3632+ pax_open_kernel();
3633+ *(void **)&omap4_pwrdm_operations.pwrdm_has_voltdm = am43xx_check_vcvp;
3634+ pax_close_kernel();
3635 pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
3636 pwrdm_register_pwrdms(powerdomains_am43xx);
3637 pwrdm_complete_init();
3638diff --git a/arch/arm/mach-omap2/wd_timer.c b/arch/arm/mach-omap2/wd_timer.c
3639index ff0a68c..b312aa0 100644
3640--- a/arch/arm/mach-omap2/wd_timer.c
3641+++ b/arch/arm/mach-omap2/wd_timer.c
3642@@ -110,7 +110,9 @@ static int __init omap_init_wdt(void)
3643 struct omap_hwmod *oh;
3644 char *oh_name = "wd_timer2";
3645 char *dev_name = "omap_wdt";
3646- struct omap_wd_timer_platform_data pdata;
3647+ static struct omap_wd_timer_platform_data pdata = {
3648+ .read_reset_sources = prm_read_reset_sources
3649+ };
3650
3651 if (!cpu_class_is_omap2() || of_have_populated_dt())
3652 return 0;
3653@@ -121,8 +123,6 @@ static int __init omap_init_wdt(void)
3654 return -EINVAL;
3655 }
3656
3657- pdata.read_reset_sources = prm_read_reset_sources;
3658-
3659 pdev = omap_device_build(dev_name, id, oh, &pdata,
3660 sizeof(struct omap_wd_timer_platform_data));
3661 WARN(IS_ERR(pdev), "Can't build omap_device for %s:%s.\n",
3662diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
3663index 4f25a7c..a81be85 100644
3664--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
3665+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
3666@@ -179,7 +179,7 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
3667 bool entered_lp2 = false;
3668
3669 if (tegra_pending_sgi())
3670- ACCESS_ONCE(abort_flag) = true;
3671+ ACCESS_ONCE_RW(abort_flag) = true;
3672
3673 cpuidle_coupled_parallel_barrier(dev, &abort_barrier);
3674
3675diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
3676index ab95f53..4b977a7 100644
3677--- a/arch/arm/mach-tegra/irq.c
3678+++ b/arch/arm/mach-tegra/irq.c
3679@@ -20,6 +20,7 @@
3680 #include <linux/cpu_pm.h>
3681 #include <linux/interrupt.h>
3682 #include <linux/io.h>
3683+#include <linux/irq.h>
3684 #include <linux/irqchip/arm-gic.h>
3685 #include <linux/irq.h>
3686 #include <linux/kernel.h>
3687diff --git a/arch/arm/mach-ux500/pm.c b/arch/arm/mach-ux500/pm.c
3688index 2cb587b..6ddfebf 100644
3689--- a/arch/arm/mach-ux500/pm.c
3690+++ b/arch/arm/mach-ux500/pm.c
3691@@ -10,6 +10,7 @@
3692 */
3693
3694 #include <linux/kernel.h>
3695+#include <linux/irq.h>
3696 #include <linux/irqchip/arm-gic.h>
3697 #include <linux/delay.h>
3698 #include <linux/io.h>
3699diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
3700index 2dea8b5..6499da2 100644
3701--- a/arch/arm/mach-ux500/setup.h
3702+++ b/arch/arm/mach-ux500/setup.h
3703@@ -33,13 +33,6 @@ extern void ux500_timer_init(void);
3704 .type = MT_DEVICE, \
3705 }
3706
3707-#define __MEM_DEV_DESC(x, sz) { \
3708- .virtual = IO_ADDRESS(x), \
3709- .pfn = __phys_to_pfn(x), \
3710- .length = sz, \
3711- .type = MT_MEMORY_RWX, \
3712-}
3713-
3714 extern struct smp_operations ux500_smp_ops;
3715 extern void ux500_cpu_die(unsigned int cpu);
3716
3717diff --git a/arch/arm/mach-zynq/platsmp.c b/arch/arm/mach-zynq/platsmp.c
3718index 52d768f..5f93180 100644
3719--- a/arch/arm/mach-zynq/platsmp.c
3720+++ b/arch/arm/mach-zynq/platsmp.c
3721@@ -24,6 +24,7 @@
3722 #include <linux/io.h>
3723 #include <asm/cacheflush.h>
3724 #include <asm/smp_scu.h>
3725+#include <linux/irq.h>
3726 #include <linux/irqchip/arm-gic.h>
3727 #include "common.h"
3728
3729diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
3730index 9b4f29e..bbf3bfa 100644
3731--- a/arch/arm/mm/Kconfig
3732+++ b/arch/arm/mm/Kconfig
3733@@ -446,6 +446,7 @@ config CPU_32v5
3734
3735 config CPU_32v6
3736 bool
3737+ select CPU_USE_DOMAINS if CPU_V6 && MMU && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3738 select TLS_REG_EMUL if !CPU_32v6K && !MMU
3739
3740 config CPU_32v6K
3741@@ -600,6 +601,7 @@ config CPU_CP15_MPU
3742
3743 config CPU_USE_DOMAINS
3744 bool
3745+ depends on !ARM_LPAE && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
3746 help
3747 This option enables or disables the use of domain switching
3748 via the set_fs() function.
3749@@ -798,7 +800,7 @@ config NEED_KUSER_HELPERS
3750
3751 config KUSER_HELPERS
3752 bool "Enable kuser helpers in vector page" if !NEED_KUSER_HELPERS
3753- depends on MMU
3754+ depends on MMU && (!(CPU_V6 || CPU_V6K || CPU_V7) || GRKERNSEC_OLD_ARM_USERLAND)
3755 default y
3756 help
3757 Warning: disabling this option may break user programs.
3758@@ -812,7 +814,7 @@ config KUSER_HELPERS
3759 See Documentation/arm/kernel_user_helpers.txt for details.
3760
3761 However, the fixed address nature of these helpers can be used
3762- by ROP (return orientated programming) authors when creating
3763+ by ROP (Return Oriented Programming) authors when creating
3764 exploits.
3765
3766 If all of the binaries and libraries which run on your platform
3767diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
3768index 2c0c541..4585df9 100644
3769--- a/arch/arm/mm/alignment.c
3770+++ b/arch/arm/mm/alignment.c
3771@@ -216,10 +216,12 @@ union offset_union {
3772 #define __get16_unaligned_check(ins,val,addr) \
3773 do { \
3774 unsigned int err = 0, v, a = addr; \
3775+ pax_open_userland(); \
3776 __get8_unaligned_check(ins,v,a,err); \
3777 val = v << ((BE) ? 8 : 0); \
3778 __get8_unaligned_check(ins,v,a,err); \
3779 val |= v << ((BE) ? 0 : 8); \
3780+ pax_close_userland(); \
3781 if (err) \
3782 goto fault; \
3783 } while (0)
3784@@ -233,6 +235,7 @@ union offset_union {
3785 #define __get32_unaligned_check(ins,val,addr) \
3786 do { \
3787 unsigned int err = 0, v, a = addr; \
3788+ pax_open_userland(); \
3789 __get8_unaligned_check(ins,v,a,err); \
3790 val = v << ((BE) ? 24 : 0); \
3791 __get8_unaligned_check(ins,v,a,err); \
3792@@ -241,6 +244,7 @@ union offset_union {
3793 val |= v << ((BE) ? 8 : 16); \
3794 __get8_unaligned_check(ins,v,a,err); \
3795 val |= v << ((BE) ? 0 : 24); \
3796+ pax_close_userland(); \
3797 if (err) \
3798 goto fault; \
3799 } while (0)
3800@@ -254,6 +258,7 @@ union offset_union {
3801 #define __put16_unaligned_check(ins,val,addr) \
3802 do { \
3803 unsigned int err = 0, v = val, a = addr; \
3804+ pax_open_userland(); \
3805 __asm__( FIRST_BYTE_16 \
3806 ARM( "1: "ins" %1, [%2], #1\n" ) \
3807 THUMB( "1: "ins" %1, [%2]\n" ) \
3808@@ -273,6 +278,7 @@ union offset_union {
3809 " .popsection\n" \
3810 : "=r" (err), "=&r" (v), "=&r" (a) \
3811 : "0" (err), "1" (v), "2" (a)); \
3812+ pax_close_userland(); \
3813 if (err) \
3814 goto fault; \
3815 } while (0)
3816@@ -286,6 +292,7 @@ union offset_union {
3817 #define __put32_unaligned_check(ins,val,addr) \
3818 do { \
3819 unsigned int err = 0, v = val, a = addr; \
3820+ pax_open_userland(); \
3821 __asm__( FIRST_BYTE_32 \
3822 ARM( "1: "ins" %1, [%2], #1\n" ) \
3823 THUMB( "1: "ins" %1, [%2]\n" ) \
3824@@ -315,6 +322,7 @@ union offset_union {
3825 " .popsection\n" \
3826 : "=r" (err), "=&r" (v), "=&r" (a) \
3827 : "0" (err), "1" (v), "2" (a)); \
3828+ pax_close_userland(); \
3829 if (err) \
3830 goto fault; \
3831 } while (0)
3832diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
3833index 8f15f70..d599a2b 100644
3834--- a/arch/arm/mm/cache-l2x0.c
3835+++ b/arch/arm/mm/cache-l2x0.c
3836@@ -43,7 +43,7 @@ struct l2c_init_data {
3837 void (*save)(void __iomem *);
3838 void (*configure)(void __iomem *);
3839 struct outer_cache_fns outer_cache;
3840-};
3841+} __do_const;
3842
3843 #define CACHE_LINE_SIZE 32
3844
3845diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
3846index 845769e..4278fd7 100644
3847--- a/arch/arm/mm/context.c
3848+++ b/arch/arm/mm/context.c
3849@@ -43,7 +43,7 @@
3850 #define NUM_USER_ASIDS ASID_FIRST_VERSION
3851
3852 static DEFINE_RAW_SPINLOCK(cpu_asid_lock);
3853-static atomic64_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3854+static atomic64_unchecked_t asid_generation = ATOMIC64_INIT(ASID_FIRST_VERSION);
3855 static DECLARE_BITMAP(asid_map, NUM_USER_ASIDS);
3856
3857 static DEFINE_PER_CPU(atomic64_t, active_asids);
3858@@ -178,7 +178,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3859 {
3860 static u32 cur_idx = 1;
3861 u64 asid = atomic64_read(&mm->context.id);
3862- u64 generation = atomic64_read(&asid_generation);
3863+ u64 generation = atomic64_read_unchecked(&asid_generation);
3864
3865 if (asid != 0) {
3866 /*
3867@@ -208,7 +208,7 @@ static u64 new_context(struct mm_struct *mm, unsigned int cpu)
3868 */
3869 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, cur_idx);
3870 if (asid == NUM_USER_ASIDS) {
3871- generation = atomic64_add_return(ASID_FIRST_VERSION,
3872+ generation = atomic64_add_return_unchecked(ASID_FIRST_VERSION,
3873 &asid_generation);
3874 flush_context(cpu);
3875 asid = find_next_zero_bit(asid_map, NUM_USER_ASIDS, 1);
3876@@ -240,14 +240,14 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
3877 cpu_set_reserved_ttbr0();
3878
3879 asid = atomic64_read(&mm->context.id);
3880- if (!((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS)
3881+ if (!((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS)
3882 && atomic64_xchg(&per_cpu(active_asids, cpu), asid))
3883 goto switch_mm_fastpath;
3884
3885 raw_spin_lock_irqsave(&cpu_asid_lock, flags);
3886 /* Check that our ASID belongs to the current generation. */
3887 asid = atomic64_read(&mm->context.id);
3888- if ((asid ^ atomic64_read(&asid_generation)) >> ASID_BITS) {
3889+ if ((asid ^ atomic64_read_unchecked(&asid_generation)) >> ASID_BITS) {
3890 asid = new_context(mm, cpu);
3891 atomic64_set(&mm->context.id, asid);
3892 }
3893diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
3894index 6333d9c..fd09b46 100644
3895--- a/arch/arm/mm/fault.c
3896+++ b/arch/arm/mm/fault.c
3897@@ -25,6 +25,7 @@
3898 #include <asm/system_misc.h>
3899 #include <asm/system_info.h>
3900 #include <asm/tlbflush.h>
3901+#include <asm/sections.h>
3902
3903 #include "fault.h"
3904
3905@@ -138,6 +139,31 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr,
3906 if (fixup_exception(regs))
3907 return;
3908
3909+#ifdef CONFIG_PAX_MEMORY_UDEREF
3910+ if (addr < TASK_SIZE) {
3911+ if (current->signal->curr_ip)
3912+ printk(KERN_ERR "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),
3913+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3914+ else
3915+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3916+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3917+ }
3918+#endif
3919+
3920+#ifdef CONFIG_PAX_KERNEXEC
3921+ if ((fsr & FSR_WRITE) &&
3922+ (((unsigned long)_stext <= addr && addr < init_mm.end_code) ||
3923+ (MODULES_VADDR <= addr && addr < MODULES_END)))
3924+ {
3925+ if (current->signal->curr_ip)
3926+ printk(KERN_ERR "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),
3927+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3928+ else
3929+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
3930+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
3931+ }
3932+#endif
3933+
3934 /*
3935 * No handler, we'll have to terminate things with extreme prejudice.
3936 */
3937@@ -173,6 +199,13 @@ __do_user_fault(struct task_struct *tsk, unsigned long addr,
3938 }
3939 #endif
3940
3941+#ifdef CONFIG_PAX_PAGEEXEC
3942+ if (fsr & FSR_LNX_PF) {
3943+ pax_report_fault(regs, (void *)regs->ARM_pc, (void *)regs->ARM_sp);
3944+ do_group_exit(SIGKILL);
3945+ }
3946+#endif
3947+
3948 tsk->thread.address = addr;
3949 tsk->thread.error_code = fsr;
3950 tsk->thread.trap_no = 14;
3951@@ -400,6 +433,33 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3952 }
3953 #endif /* CONFIG_MMU */
3954
3955+#ifdef CONFIG_PAX_PAGEEXEC
3956+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
3957+{
3958+ long i;
3959+
3960+ printk(KERN_ERR "PAX: bytes at PC: ");
3961+ for (i = 0; i < 20; i++) {
3962+ unsigned char c;
3963+ if (get_user(c, (__force unsigned char __user *)pc+i))
3964+ printk(KERN_CONT "?? ");
3965+ else
3966+ printk(KERN_CONT "%02x ", c);
3967+ }
3968+ printk("\n");
3969+
3970+ printk(KERN_ERR "PAX: bytes at SP-4: ");
3971+ for (i = -1; i < 20; i++) {
3972+ unsigned long c;
3973+ if (get_user(c, (__force unsigned long __user *)sp+i))
3974+ printk(KERN_CONT "???????? ");
3975+ else
3976+ printk(KERN_CONT "%08lx ", c);
3977+ }
3978+ printk("\n");
3979+}
3980+#endif
3981+
3982 /*
3983 * First Level Translation Fault Handler
3984 *
3985@@ -547,9 +607,22 @@ do_DataAbort(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
3986 const struct fsr_info *inf = fsr_info + fsr_fs(fsr);
3987 struct siginfo info;
3988
3989+#ifdef CONFIG_PAX_MEMORY_UDEREF
3990+ if (addr < TASK_SIZE && is_domain_fault(fsr)) {
3991+ if (current->signal->curr_ip)
3992+ printk(KERN_ERR "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),
3993+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3994+ else
3995+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to access userland memory at %08lx\n", current->comm, task_pid_nr(current),
3996+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()), addr);
3997+ goto die;
3998+ }
3999+#endif
4000+
4001 if (!inf->fn(addr, fsr & ~FSR_LNX_PF, regs))
4002 return;
4003
4004+die:
4005 pr_alert("Unhandled fault: %s (0x%03x) at 0x%08lx\n",
4006 inf->name, fsr, addr);
4007 show_pte(current->mm, addr);
4008@@ -574,15 +647,104 @@ hook_ifault_code(int nr, int (*fn)(unsigned long, unsigned int, struct pt_regs *
4009 ifsr_info[nr].name = name;
4010 }
4011
4012+asmlinkage int sys_sigreturn(struct pt_regs *regs);
4013+asmlinkage int sys_rt_sigreturn(struct pt_regs *regs);
4014+
4015 asmlinkage void __exception
4016 do_PrefetchAbort(unsigned long addr, unsigned int ifsr, struct pt_regs *regs)
4017 {
4018 const struct fsr_info *inf = ifsr_info + fsr_fs(ifsr);
4019 struct siginfo info;
4020+ unsigned long pc = instruction_pointer(regs);
4021+
4022+ if (user_mode(regs)) {
4023+ unsigned long sigpage = current->mm->context.sigpage;
4024+
4025+ if (sigpage <= pc && pc < sigpage + 7*4) {
4026+ if (pc < sigpage + 3*4)
4027+ sys_sigreturn(regs);
4028+ else
4029+ sys_rt_sigreturn(regs);
4030+ return;
4031+ }
4032+ if (pc == 0xffff0f60UL) {
4033+ /*
4034+ * PaX: __kuser_cmpxchg64 emulation
4035+ */
4036+ // TODO
4037+ //regs->ARM_pc = regs->ARM_lr;
4038+ //return;
4039+ }
4040+ if (pc == 0xffff0fa0UL) {
4041+ /*
4042+ * PaX: __kuser_memory_barrier emulation
4043+ */
4044+ // dmb(); implied by the exception
4045+ regs->ARM_pc = regs->ARM_lr;
4046+ return;
4047+ }
4048+ if (pc == 0xffff0fc0UL) {
4049+ /*
4050+ * PaX: __kuser_cmpxchg emulation
4051+ */
4052+ // TODO
4053+ //long new;
4054+ //int op;
4055+
4056+ //op = FUTEX_OP_SET << 28;
4057+ //new = futex_atomic_op_inuser(op, regs->ARM_r2);
4058+ //regs->ARM_r0 = old != new;
4059+ //regs->ARM_pc = regs->ARM_lr;
4060+ //return;
4061+ }
4062+ if (pc == 0xffff0fe0UL) {
4063+ /*
4064+ * PaX: __kuser_get_tls emulation
4065+ */
4066+ regs->ARM_r0 = current_thread_info()->tp_value[0];
4067+ regs->ARM_pc = regs->ARM_lr;
4068+ return;
4069+ }
4070+ }
4071+
4072+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4073+ else if (is_domain_fault(ifsr) || is_xn_fault(ifsr)) {
4074+ if (current->signal->curr_ip)
4075+ printk(KERN_ERR "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),
4076+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4077+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4078+ else
4079+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to execute %s memory at %08lx\n", current->comm, task_pid_nr(current),
4080+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()),
4081+ pc >= TASK_SIZE ? "non-executable kernel" : "userland", pc);
4082+ goto die;
4083+ }
4084+#endif
4085+
4086+#ifdef CONFIG_PAX_REFCOUNT
4087+ if (fsr_fs(ifsr) == FAULT_CODE_DEBUG) {
4088+#ifdef CONFIG_THUMB2_KERNEL
4089+ unsigned short bkpt;
4090+
4091+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le16(bkpt) == 0xbef1) {
4092+#else
4093+ unsigned int bkpt;
4094+
4095+ if (!probe_kernel_address(pc, bkpt) && cpu_to_le32(bkpt) == 0xe12f1073) {
4096+#endif
4097+ current->thread.error_code = ifsr;
4098+ current->thread.trap_no = 0;
4099+ pax_report_refcount_overflow(regs);
4100+ fixup_exception(regs);
4101+ return;
4102+ }
4103+ }
4104+#endif
4105
4106 if (!inf->fn(addr, ifsr | FSR_LNX_PF, regs))
4107 return;
4108
4109+die:
4110 pr_alert("Unhandled prefetch abort: %s (0x%03x) at 0x%08lx\n",
4111 inf->name, ifsr, addr);
4112
4113diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h
4114index cf08bdf..772656c 100644
4115--- a/arch/arm/mm/fault.h
4116+++ b/arch/arm/mm/fault.h
4117@@ -3,6 +3,7 @@
4118
4119 /*
4120 * Fault status register encodings. We steal bit 31 for our own purposes.
4121+ * Set when the FSR value is from an instruction fault.
4122 */
4123 #define FSR_LNX_PF (1 << 31)
4124 #define FSR_WRITE (1 << 11)
4125@@ -22,6 +23,17 @@ static inline int fsr_fs(unsigned int fsr)
4126 }
4127 #endif
4128
4129+/* valid for LPAE and !LPAE */
4130+static inline int is_xn_fault(unsigned int fsr)
4131+{
4132+ return ((fsr_fs(fsr) & 0x3c) == 0xc);
4133+}
4134+
4135+static inline int is_domain_fault(unsigned int fsr)
4136+{
4137+ return ((fsr_fs(fsr) & 0xD) == 0x9);
4138+}
4139+
4140 void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs);
4141 unsigned long search_exception_table(unsigned long addr);
4142
4143diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
4144index 1609b02..def0785 100644
4145--- a/arch/arm/mm/init.c
4146+++ b/arch/arm/mm/init.c
4147@@ -755,7 +755,46 @@ void free_tcmmem(void)
4148 {
4149 #ifdef CONFIG_HAVE_TCM
4150 extern char __tcm_start, __tcm_end;
4151+#endif
4152
4153+#ifdef CONFIG_PAX_KERNEXEC
4154+ unsigned long addr;
4155+ pgd_t *pgd;
4156+ pud_t *pud;
4157+ pmd_t *pmd;
4158+ int cpu_arch = cpu_architecture();
4159+ unsigned int cr = get_cr();
4160+
4161+ if (cpu_arch >= CPU_ARCH_ARMv6 && (cr & CR_XP)) {
4162+ /* make pages tables, etc before .text NX */
4163+ for (addr = PAGE_OFFSET; addr < (unsigned long)_stext; addr += SECTION_SIZE) {
4164+ pgd = pgd_offset_k(addr);
4165+ pud = pud_offset(pgd, addr);
4166+ pmd = pmd_offset(pud, addr);
4167+ __section_update(pmd, addr, PMD_SECT_XN);
4168+ }
4169+ /* make init NX */
4170+ for (addr = (unsigned long)__init_begin; addr < (unsigned long)_sdata; addr += SECTION_SIZE) {
4171+ pgd = pgd_offset_k(addr);
4172+ pud = pud_offset(pgd, addr);
4173+ pmd = pmd_offset(pud, addr);
4174+ __section_update(pmd, addr, PMD_SECT_XN);
4175+ }
4176+ /* make kernel code/rodata RX */
4177+ for (addr = (unsigned long)_stext; addr < (unsigned long)__init_begin; addr += SECTION_SIZE) {
4178+ pgd = pgd_offset_k(addr);
4179+ pud = pud_offset(pgd, addr);
4180+ pmd = pmd_offset(pud, addr);
4181+#ifdef CONFIG_ARM_LPAE
4182+ __section_update(pmd, addr, PMD_SECT_RDONLY);
4183+#else
4184+ __section_update(pmd, addr, PMD_SECT_APX|PMD_SECT_AP_WRITE);
4185+#endif
4186+ }
4187+ }
4188+#endif
4189+
4190+#ifdef CONFIG_HAVE_TCM
4191 poison_init_mem(&__tcm_start, &__tcm_end - &__tcm_start);
4192 free_reserved_area(&__tcm_start, &__tcm_end, -1, "TCM link");
4193 #endif
4194diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c
4195index d1e5ad7..84dcbf2 100644
4196--- a/arch/arm/mm/ioremap.c
4197+++ b/arch/arm/mm/ioremap.c
4198@@ -392,9 +392,9 @@ __arm_ioremap_exec(phys_addr_t phys_addr, size_t size, bool cached)
4199 unsigned int mtype;
4200
4201 if (cached)
4202- mtype = MT_MEMORY_RWX;
4203+ mtype = MT_MEMORY_RX;
4204 else
4205- mtype = MT_MEMORY_RWX_NONCACHED;
4206+ mtype = MT_MEMORY_RX_NONCACHED;
4207
4208 return __arm_ioremap_caller(phys_addr, size, mtype,
4209 __builtin_return_address(0));
4210diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c
4211index 5e85ed3..b10a7ed 100644
4212--- a/arch/arm/mm/mmap.c
4213+++ b/arch/arm/mm/mmap.c
4214@@ -59,6 +59,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4215 struct vm_area_struct *vma;
4216 int do_align = 0;
4217 int aliasing = cache_is_vipt_aliasing();
4218+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4219 struct vm_unmapped_area_info info;
4220
4221 /*
4222@@ -81,6 +82,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4223 if (len > TASK_SIZE)
4224 return -ENOMEM;
4225
4226+#ifdef CONFIG_PAX_RANDMMAP
4227+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4228+#endif
4229+
4230 if (addr) {
4231 if (do_align)
4232 addr = COLOUR_ALIGN(addr, pgoff);
4233@@ -88,8 +93,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4234 addr = PAGE_ALIGN(addr);
4235
4236 vma = find_vma(mm, addr);
4237- if (TASK_SIZE - len >= addr &&
4238- (!vma || addr + len <= vma->vm_start))
4239+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4240 return addr;
4241 }
4242
4243@@ -99,6 +103,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
4244 info.high_limit = TASK_SIZE;
4245 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4246 info.align_offset = pgoff << PAGE_SHIFT;
4247+ info.threadstack_offset = offset;
4248 return vm_unmapped_area(&info);
4249 }
4250
4251@@ -112,6 +117,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4252 unsigned long addr = addr0;
4253 int do_align = 0;
4254 int aliasing = cache_is_vipt_aliasing();
4255+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
4256 struct vm_unmapped_area_info info;
4257
4258 /*
4259@@ -132,6 +138,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4260 return addr;
4261 }
4262
4263+#ifdef CONFIG_PAX_RANDMMAP
4264+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4265+#endif
4266+
4267 /* requesting a specific address */
4268 if (addr) {
4269 if (do_align)
4270@@ -139,8 +149,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4271 else
4272 addr = PAGE_ALIGN(addr);
4273 vma = find_vma(mm, addr);
4274- if (TASK_SIZE - len >= addr &&
4275- (!vma || addr + len <= vma->vm_start))
4276+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
4277 return addr;
4278 }
4279
4280@@ -150,6 +159,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
4281 info.high_limit = mm->mmap_base;
4282 info.align_mask = do_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
4283 info.align_offset = pgoff << PAGE_SHIFT;
4284+ info.threadstack_offset = offset;
4285 addr = vm_unmapped_area(&info);
4286
4287 /*
4288@@ -173,6 +183,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4289 {
4290 unsigned long random_factor = 0UL;
4291
4292+#ifdef CONFIG_PAX_RANDMMAP
4293+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
4294+#endif
4295+
4296 /* 8 bits of randomness in 20 address space bits */
4297 if ((current->flags & PF_RANDOMIZE) &&
4298 !(current->personality & ADDR_NO_RANDOMIZE))
4299@@ -180,9 +194,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
4300
4301 if (mmap_is_legacy()) {
4302 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
4303+
4304+#ifdef CONFIG_PAX_RANDMMAP
4305+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4306+ mm->mmap_base += mm->delta_mmap;
4307+#endif
4308+
4309 mm->get_unmapped_area = arch_get_unmapped_area;
4310 } else {
4311 mm->mmap_base = mmap_base(random_factor);
4312+
4313+#ifdef CONFIG_PAX_RANDMMAP
4314+ if (mm->pax_flags & MF_PAX_RANDMMAP)
4315+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
4316+#endif
4317+
4318 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
4319 }
4320 }
4321diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
4322index 4e6ef89..21c27f2 100644
4323--- a/arch/arm/mm/mmu.c
4324+++ b/arch/arm/mm/mmu.c
4325@@ -41,6 +41,22 @@
4326 #include "mm.h"
4327 #include "tcm.h"
4328
4329+#if defined(CONFIG_CPU_USE_DOMAINS) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
4330+void modify_domain(unsigned int dom, unsigned int type)
4331+{
4332+ struct thread_info *thread = current_thread_info();
4333+ unsigned int domain = thread->cpu_domain;
4334+ /*
4335+ * DOMAIN_MANAGER might be defined to some other value,
4336+ * use the arch-defined constant
4337+ */
4338+ domain &= ~domain_val(dom, 3);
4339+ thread->cpu_domain = domain | domain_val(dom, type);
4340+ set_domain(thread->cpu_domain);
4341+}
4342+EXPORT_SYMBOL(modify_domain);
4343+#endif
4344+
4345 /*
4346 * empty_zero_page is a special page that is used for
4347 * zero-initialized data and COW.
4348@@ -242,7 +258,15 @@ __setup("noalign", noalign_setup);
4349 #define PROT_PTE_S2_DEVICE PROT_PTE_DEVICE
4350 #define PROT_SECT_DEVICE PMD_TYPE_SECT|PMD_SECT_AP_WRITE
4351
4352-static struct mem_type mem_types[] = {
4353+#ifdef CONFIG_PAX_KERNEXEC
4354+#define L_PTE_KERNEXEC L_PTE_RDONLY
4355+#define PMD_SECT_KERNEXEC PMD_SECT_RDONLY
4356+#else
4357+#define L_PTE_KERNEXEC L_PTE_DIRTY
4358+#define PMD_SECT_KERNEXEC PMD_SECT_AP_WRITE
4359+#endif
4360+
4361+static struct mem_type mem_types[] __read_only = {
4362 [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */
4363 .prot_pte = PROT_PTE_DEVICE | L_PTE_MT_DEV_SHARED |
4364 L_PTE_SHARED,
4365@@ -271,19 +295,19 @@ static struct mem_type mem_types[] = {
4366 .prot_sect = PROT_SECT_DEVICE,
4367 .domain = DOMAIN_IO,
4368 },
4369- [MT_UNCACHED] = {
4370+ [MT_UNCACHED_RW] = {
4371 .prot_pte = PROT_PTE_DEVICE,
4372 .prot_l1 = PMD_TYPE_TABLE,
4373 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4374 .domain = DOMAIN_IO,
4375 },
4376- [MT_CACHECLEAN] = {
4377- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4378+ [MT_CACHECLEAN_RO] = {
4379+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_RDONLY,
4380 .domain = DOMAIN_KERNEL,
4381 },
4382 #ifndef CONFIG_ARM_LPAE
4383- [MT_MINICLEAN] = {
4384- .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN | PMD_SECT_MINICACHE,
4385+ [MT_MINICLEAN_RO] = {
4386+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_MINICACHE | PMD_SECT_XN | PMD_SECT_RDONLY,
4387 .domain = DOMAIN_KERNEL,
4388 },
4389 #endif
4390@@ -291,15 +315,15 @@ static struct mem_type mem_types[] = {
4391 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4392 L_PTE_RDONLY,
4393 .prot_l1 = PMD_TYPE_TABLE,
4394- .domain = DOMAIN_USER,
4395+ .domain = DOMAIN_VECTORS,
4396 },
4397 [MT_HIGH_VECTORS] = {
4398 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4399 L_PTE_USER | L_PTE_RDONLY,
4400 .prot_l1 = PMD_TYPE_TABLE,
4401- .domain = DOMAIN_USER,
4402+ .domain = DOMAIN_VECTORS,
4403 },
4404- [MT_MEMORY_RWX] = {
4405+ [__MT_MEMORY_RWX] = {
4406 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4407 .prot_l1 = PMD_TYPE_TABLE,
4408 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4409@@ -312,17 +336,30 @@ static struct mem_type mem_types[] = {
4410 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4411 .domain = DOMAIN_KERNEL,
4412 },
4413- [MT_ROM] = {
4414- .prot_sect = PMD_TYPE_SECT,
4415+ [MT_MEMORY_RX] = {
4416+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4417+ .prot_l1 = PMD_TYPE_TABLE,
4418+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4419+ .domain = DOMAIN_KERNEL,
4420+ },
4421+ [MT_ROM_RX] = {
4422+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_RDONLY,
4423 .domain = DOMAIN_KERNEL,
4424 },
4425- [MT_MEMORY_RWX_NONCACHED] = {
4426+ [MT_MEMORY_RW_NONCACHED] = {
4427 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4428 L_PTE_MT_BUFFERABLE,
4429 .prot_l1 = PMD_TYPE_TABLE,
4430 .prot_sect = PMD_TYPE_SECT | PMD_SECT_AP_WRITE,
4431 .domain = DOMAIN_KERNEL,
4432 },
4433+ [MT_MEMORY_RX_NONCACHED] = {
4434+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC |
4435+ L_PTE_MT_BUFFERABLE,
4436+ .prot_l1 = PMD_TYPE_TABLE,
4437+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4438+ .domain = DOMAIN_KERNEL,
4439+ },
4440 [MT_MEMORY_RW_DTCM] = {
4441 .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY |
4442 L_PTE_XN,
4443@@ -330,9 +367,10 @@ static struct mem_type mem_types[] = {
4444 .prot_sect = PMD_TYPE_SECT | PMD_SECT_XN,
4445 .domain = DOMAIN_KERNEL,
4446 },
4447- [MT_MEMORY_RWX_ITCM] = {
4448- .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY,
4449+ [MT_MEMORY_RX_ITCM] = {
4450+ .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_KERNEXEC,
4451 .prot_l1 = PMD_TYPE_TABLE,
4452+ .prot_sect = PMD_TYPE_SECT | PMD_SECT_KERNEXEC,
4453 .domain = DOMAIN_KERNEL,
4454 },
4455 [MT_MEMORY_RW_SO] = {
4456@@ -544,9 +582,14 @@ static void __init build_mem_type_table(void)
4457 * Mark cache clean areas and XIP ROM read only
4458 * from SVC mode and no access from userspace.
4459 */
4460- mem_types[MT_ROM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4461- mem_types[MT_MINICLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4462- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4463+ mem_types[MT_ROM_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4464+#ifdef CONFIG_PAX_KERNEXEC
4465+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4466+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4467+ mem_types[MT_MEMORY_RX_ITCM].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4468+#endif
4469+ mem_types[MT_MINICLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4470+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_APX|PMD_SECT_AP_WRITE;
4471 #endif
4472
4473 /*
4474@@ -563,13 +606,17 @@ static void __init build_mem_type_table(void)
4475 mem_types[MT_DEVICE_WC].prot_pte |= L_PTE_SHARED;
4476 mem_types[MT_DEVICE_CACHED].prot_sect |= PMD_SECT_S;
4477 mem_types[MT_DEVICE_CACHED].prot_pte |= L_PTE_SHARED;
4478- mem_types[MT_MEMORY_RWX].prot_sect |= PMD_SECT_S;
4479- mem_types[MT_MEMORY_RWX].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_RW].prot_sect |= PMD_SECT_S;
4483 mem_types[MT_MEMORY_RW].prot_pte |= L_PTE_SHARED;
4484+ mem_types[MT_MEMORY_RX].prot_sect |= PMD_SECT_S;
4485+ mem_types[MT_MEMORY_RX].prot_pte |= L_PTE_SHARED;
4486 mem_types[MT_MEMORY_DMA_READY].prot_pte |= L_PTE_SHARED;
4487- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_S;
4488- mem_types[MT_MEMORY_RWX_NONCACHED].prot_pte |= L_PTE_SHARED;
4489+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_S;
4490+ mem_types[MT_MEMORY_RW_NONCACHED].prot_pte |= L_PTE_SHARED;
4491+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_S;
4492+ mem_types[MT_MEMORY_RX_NONCACHED].prot_pte |= L_PTE_SHARED;
4493 }
4494 }
4495
4496@@ -580,15 +627,20 @@ static void __init build_mem_type_table(void)
4497 if (cpu_arch >= CPU_ARCH_ARMv6) {
4498 if (cpu_arch >= CPU_ARCH_ARMv7 && (cr & CR_TRE)) {
4499 /* Non-cacheable Normal is XCB = 001 */
4500- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4501+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4502+ PMD_SECT_BUFFERED;
4503+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4504 PMD_SECT_BUFFERED;
4505 } else {
4506 /* For both ARMv6 and non-TEX-remapping ARMv7 */
4507- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |=
4508+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |=
4509+ PMD_SECT_TEX(1);
4510+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |=
4511 PMD_SECT_TEX(1);
4512 }
4513 } else {
4514- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4515+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4516+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= PMD_SECT_BUFFERABLE;
4517 }
4518
4519 #ifdef CONFIG_ARM_LPAE
4520@@ -609,6 +661,8 @@ static void __init build_mem_type_table(void)
4521 user_pgprot |= PTE_EXT_PXN;
4522 #endif
4523
4524+ user_pgprot |= __supported_pte_mask;
4525+
4526 for (i = 0; i < 16; i++) {
4527 pteval_t v = pgprot_val(protection_map[i]);
4528 protection_map[i] = __pgprot(v | user_pgprot);
4529@@ -626,21 +680,24 @@ static void __init build_mem_type_table(void)
4530
4531 mem_types[MT_LOW_VECTORS].prot_l1 |= ecc_mask;
4532 mem_types[MT_HIGH_VECTORS].prot_l1 |= ecc_mask;
4533- mem_types[MT_MEMORY_RWX].prot_sect |= ecc_mask | cp->pmd;
4534- mem_types[MT_MEMORY_RWX].prot_pte |= kern_pgprot;
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_RW].prot_sect |= ecc_mask | cp->pmd;
4538 mem_types[MT_MEMORY_RW].prot_pte |= kern_pgprot;
4539+ mem_types[MT_MEMORY_RX].prot_sect |= ecc_mask | cp->pmd;
4540+ mem_types[MT_MEMORY_RX].prot_pte |= kern_pgprot;
4541 mem_types[MT_MEMORY_DMA_READY].prot_pte |= kern_pgprot;
4542- mem_types[MT_MEMORY_RWX_NONCACHED].prot_sect |= ecc_mask;
4543- mem_types[MT_ROM].prot_sect |= cp->pmd;
4544+ mem_types[MT_MEMORY_RW_NONCACHED].prot_sect |= ecc_mask;
4545+ mem_types[MT_MEMORY_RX_NONCACHED].prot_sect |= ecc_mask;
4546+ mem_types[MT_ROM_RX].prot_sect |= cp->pmd;
4547
4548 switch (cp->pmd) {
4549 case PMD_SECT_WT:
4550- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WT;
4551+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WT;
4552 break;
4553 case PMD_SECT_WB:
4554 case PMD_SECT_WBWA:
4555- mem_types[MT_CACHECLEAN].prot_sect |= PMD_SECT_WB;
4556+ mem_types[MT_CACHECLEAN_RO].prot_sect |= PMD_SECT_WB;
4557 break;
4558 }
4559 pr_info("Memory policy: %sData cache %s\n",
4560@@ -854,7 +911,7 @@ static void __init create_mapping(struct map_desc *md)
4561 return;
4562 }
4563
4564- if ((md->type == MT_DEVICE || md->type == MT_ROM) &&
4565+ if ((md->type == MT_DEVICE || md->type == MT_ROM_RX) &&
4566 md->virtual >= PAGE_OFFSET &&
4567 (md->virtual < VMALLOC_START || md->virtual >= VMALLOC_END)) {
4568 pr_warn("BUG: mapping for 0x%08llx at 0x%08lx out of vmalloc space\n",
4569@@ -1218,18 +1275,15 @@ void __init arm_mm_memblock_reserve(void)
4570 * called function. This means you can't use any function or debugging
4571 * method which may touch any device, otherwise the kernel _will_ crash.
4572 */
4573+
4574+static char vectors[PAGE_SIZE * 2] __read_only __aligned(PAGE_SIZE);
4575+
4576 static void __init devicemaps_init(const struct machine_desc *mdesc)
4577 {
4578 struct map_desc map;
4579 unsigned long addr;
4580- void *vectors;
4581
4582- /*
4583- * Allocate the vector page early.
4584- */
4585- vectors = early_alloc(PAGE_SIZE * 2);
4586-
4587- early_trap_init(vectors);
4588+ early_trap_init(&vectors);
4589
4590 for (addr = VMALLOC_START; addr; addr += PMD_SIZE)
4591 pmd_clear(pmd_off_k(addr));
4592@@ -1242,7 +1296,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4593 map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);
4594 map.virtual = MODULES_VADDR;
4595 map.length = ((unsigned long)_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;
4596- map.type = MT_ROM;
4597+ map.type = MT_ROM_RX;
4598 create_mapping(&map);
4599 #endif
4600
4601@@ -1253,14 +1307,14 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4602 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS);
4603 map.virtual = FLUSH_BASE;
4604 map.length = SZ_1M;
4605- map.type = MT_CACHECLEAN;
4606+ map.type = MT_CACHECLEAN_RO;
4607 create_mapping(&map);
4608 #endif
4609 #ifdef FLUSH_BASE_MINICACHE
4610 map.pfn = __phys_to_pfn(FLUSH_BASE_PHYS + SZ_1M);
4611 map.virtual = FLUSH_BASE_MINICACHE;
4612 map.length = SZ_1M;
4613- map.type = MT_MINICLEAN;
4614+ map.type = MT_MINICLEAN_RO;
4615 create_mapping(&map);
4616 #endif
4617
4618@@ -1269,7 +1323,7 @@ static void __init devicemaps_init(const struct machine_desc *mdesc)
4619 * location (0xffff0000). If we aren't using high-vectors, also
4620 * create a mapping at the low-vectors virtual address.
4621 */
4622- map.pfn = __phys_to_pfn(virt_to_phys(vectors));
4623+ map.pfn = __phys_to_pfn(virt_to_phys(&vectors));
4624 map.virtual = 0xffff0000;
4625 map.length = PAGE_SIZE;
4626 #ifdef CONFIG_KUSER_HELPERS
4627@@ -1329,8 +1383,10 @@ static void __init kmap_init(void)
4628 static void __init map_lowmem(void)
4629 {
4630 struct memblock_region *reg;
4631+#ifndef CONFIG_PAX_KERNEXEC
4632 phys_addr_t kernel_x_start = round_down(__pa(_stext), SECTION_SIZE);
4633 phys_addr_t kernel_x_end = round_up(__pa(__init_end), SECTION_SIZE);
4634+#endif
4635
4636 /* Map all the lowmem memory banks. */
4637 for_each_memblock(memory, reg) {
4638@@ -1343,11 +1399,48 @@ static void __init map_lowmem(void)
4639 if (start >= end)
4640 break;
4641
4642+#ifdef CONFIG_PAX_KERNEXEC
4643+ map.pfn = __phys_to_pfn(start);
4644+ map.virtual = __phys_to_virt(start);
4645+ map.length = end - start;
4646+
4647+ if (map.virtual <= (unsigned long)_stext && ((unsigned long)_end < (map.virtual + map.length))) {
4648+ struct map_desc kernel;
4649+ struct map_desc initmap;
4650+
4651+ /* when freeing initmem we will make this RW */
4652+ initmap.pfn = __phys_to_pfn(__pa(__init_begin));
4653+ initmap.virtual = (unsigned long)__init_begin;
4654+ initmap.length = _sdata - __init_begin;
4655+ initmap.type = __MT_MEMORY_RWX;
4656+ create_mapping(&initmap);
4657+
4658+ /* when freeing initmem we will make this RX */
4659+ kernel.pfn = __phys_to_pfn(__pa(_stext));
4660+ kernel.virtual = (unsigned long)_stext;
4661+ kernel.length = __init_begin - _stext;
4662+ kernel.type = __MT_MEMORY_RWX;
4663+ create_mapping(&kernel);
4664+
4665+ if (map.virtual < (unsigned long)_stext) {
4666+ map.length = (unsigned long)_stext - map.virtual;
4667+ map.type = __MT_MEMORY_RWX;
4668+ create_mapping(&map);
4669+ }
4670+
4671+ map.pfn = __phys_to_pfn(__pa(_sdata));
4672+ map.virtual = (unsigned long)_sdata;
4673+ map.length = end - __pa(_sdata);
4674+ }
4675+
4676+ map.type = MT_MEMORY_RW;
4677+ create_mapping(&map);
4678+#else
4679 if (end < kernel_x_start) {
4680 map.pfn = __phys_to_pfn(start);
4681 map.virtual = __phys_to_virt(start);
4682 map.length = end - start;
4683- map.type = MT_MEMORY_RWX;
4684+ map.type = __MT_MEMORY_RWX;
4685
4686 create_mapping(&map);
4687 } else if (start >= kernel_x_end) {
4688@@ -1371,7 +1464,7 @@ static void __init map_lowmem(void)
4689 map.pfn = __phys_to_pfn(kernel_x_start);
4690 map.virtual = __phys_to_virt(kernel_x_start);
4691 map.length = kernel_x_end - kernel_x_start;
4692- map.type = MT_MEMORY_RWX;
4693+ map.type = __MT_MEMORY_RWX;
4694
4695 create_mapping(&map);
4696
4697@@ -1384,6 +1477,7 @@ static void __init map_lowmem(void)
4698 create_mapping(&map);
4699 }
4700 }
4701+#endif
4702 }
4703 }
4704
4705diff --git a/arch/arm/net/bpf_jit_32.c b/arch/arm/net/bpf_jit_32.c
4706index e1268f9..a9755a7 100644
4707--- a/arch/arm/net/bpf_jit_32.c
4708+++ b/arch/arm/net/bpf_jit_32.c
4709@@ -20,6 +20,7 @@
4710 #include <asm/cacheflush.h>
4711 #include <asm/hwcap.h>
4712 #include <asm/opcodes.h>
4713+#include <asm/pgtable.h>
4714
4715 #include "bpf_jit_32.h"
4716
4717@@ -71,7 +72,11 @@ struct jit_ctx {
4718 #endif
4719 };
4720
4721+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
4722+int bpf_jit_enable __read_only;
4723+#else
4724 int bpf_jit_enable __read_mostly;
4725+#endif
4726
4727 static u64 jit_get_skb_b(struct sk_buff *skb, unsigned offset)
4728 {
4729@@ -178,8 +183,10 @@ static void jit_fill_hole(void *area, unsigned int size)
4730 {
4731 u32 *ptr;
4732 /* We are guaranteed to have aligned memory. */
4733+ pax_open_kernel();
4734 for (ptr = area; size >= sizeof(u32); size -= sizeof(u32))
4735 *ptr++ = __opcode_to_mem_arm(ARM_INST_UDF);
4736+ pax_close_kernel();
4737 }
4738
4739 static void build_prologue(struct jit_ctx *ctx)
4740diff --git a/arch/arm/plat-iop/setup.c b/arch/arm/plat-iop/setup.c
4741index 5b217f4..c23f40e 100644
4742--- a/arch/arm/plat-iop/setup.c
4743+++ b/arch/arm/plat-iop/setup.c
4744@@ -24,7 +24,7 @@ static struct map_desc iop3xx_std_desc[] __initdata = {
4745 .virtual = IOP3XX_PERIPHERAL_VIRT_BASE,
4746 .pfn = __phys_to_pfn(IOP3XX_PERIPHERAL_PHYS_BASE),
4747 .length = IOP3XX_PERIPHERAL_SIZE,
4748- .type = MT_UNCACHED,
4749+ .type = MT_UNCACHED_RW,
4750 },
4751 };
4752
4753diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
4754index a5bc92d..0bb4730 100644
4755--- a/arch/arm/plat-omap/sram.c
4756+++ b/arch/arm/plat-omap/sram.c
4757@@ -93,6 +93,8 @@ void __init omap_map_sram(unsigned long start, unsigned long size,
4758 * Looks like we need to preserve some bootloader code at the
4759 * beginning of SRAM for jumping to flash for reboot to work...
4760 */
4761+ pax_open_kernel();
4762 memset_io(omap_sram_base + omap_sram_skip, 0,
4763 omap_sram_size - omap_sram_skip);
4764+ pax_close_kernel();
4765 }
4766diff --git a/arch/arm64/include/asm/atomic.h b/arch/arm64/include/asm/atomic.h
4767index 7047051..44e8675 100644
4768--- a/arch/arm64/include/asm/atomic.h
4769+++ b/arch/arm64/include/asm/atomic.h
4770@@ -252,5 +252,15 @@ static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
4771 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
4772 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
4773
4774+#define atomic64_read_unchecked(v) atomic64_read(v)
4775+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
4776+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
4777+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
4778+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
4779+#define atomic64_inc_unchecked(v) atomic64_inc(v)
4780+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
4781+#define atomic64_dec_unchecked(v) atomic64_dec(v)
4782+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
4783+
4784 #endif
4785 #endif
4786diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h
4787index a5abb00..9cbca9a 100644
4788--- a/arch/arm64/include/asm/barrier.h
4789+++ b/arch/arm64/include/asm/barrier.h
4790@@ -44,7 +44,7 @@
4791 do { \
4792 compiletime_assert_atomic_type(*p); \
4793 barrier(); \
4794- ACCESS_ONCE(*p) = (v); \
4795+ ACCESS_ONCE_RW(*p) = (v); \
4796 } while (0)
4797
4798 #define smp_load_acquire(p) \
4799diff --git a/arch/arm64/include/asm/percpu.h b/arch/arm64/include/asm/percpu.h
4800index 4fde8c1..441f84f 100644
4801--- a/arch/arm64/include/asm/percpu.h
4802+++ b/arch/arm64/include/asm/percpu.h
4803@@ -135,16 +135,16 @@ static inline void __percpu_write(void *ptr, unsigned long val, int size)
4804 {
4805 switch (size) {
4806 case 1:
4807- ACCESS_ONCE(*(u8 *)ptr) = (u8)val;
4808+ ACCESS_ONCE_RW(*(u8 *)ptr) = (u8)val;
4809 break;
4810 case 2:
4811- ACCESS_ONCE(*(u16 *)ptr) = (u16)val;
4812+ ACCESS_ONCE_RW(*(u16 *)ptr) = (u16)val;
4813 break;
4814 case 4:
4815- ACCESS_ONCE(*(u32 *)ptr) = (u32)val;
4816+ ACCESS_ONCE_RW(*(u32 *)ptr) = (u32)val;
4817 break;
4818 case 8:
4819- ACCESS_ONCE(*(u64 *)ptr) = (u64)val;
4820+ ACCESS_ONCE_RW(*(u64 *)ptr) = (u64)val;
4821 break;
4822 default:
4823 BUILD_BUG();
4824diff --git a/arch/arm64/include/asm/pgalloc.h b/arch/arm64/include/asm/pgalloc.h
4825index e20df38..027ede3 100644
4826--- a/arch/arm64/include/asm/pgalloc.h
4827+++ b/arch/arm64/include/asm/pgalloc.h
4828@@ -46,6 +46,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4829 set_pud(pud, __pud(__pa(pmd) | PMD_TYPE_TABLE));
4830 }
4831
4832+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
4833+{
4834+ pud_populate(mm, pud, pmd);
4835+}
4836+
4837 #endif /* CONFIG_ARM64_PGTABLE_LEVELS > 2 */
4838
4839 #if CONFIG_ARM64_PGTABLE_LEVELS > 3
4840diff --git a/arch/arm64/include/asm/uaccess.h b/arch/arm64/include/asm/uaccess.h
4841index 07e1ba44..ec8cbbb 100644
4842--- a/arch/arm64/include/asm/uaccess.h
4843+++ b/arch/arm64/include/asm/uaccess.h
4844@@ -99,6 +99,7 @@ static inline void set_fs(mm_segment_t fs)
4845 flag; \
4846 })
4847
4848+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
4849 #define access_ok(type, addr, size) __range_ok(addr, size)
4850 #define user_addr_max get_fs
4851
4852diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
4853index ef7d112..08cd35f 100644
4854--- a/arch/arm64/mm/dma-mapping.c
4855+++ b/arch/arm64/mm/dma-mapping.c
4856@@ -137,7 +137,7 @@ static void __dma_free_coherent(struct device *dev, size_t size,
4857 phys_to_page(paddr),
4858 size >> PAGE_SHIFT);
4859 if (!freed)
4860- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
4861+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
4862 }
4863
4864 static void *__dma_alloc(struct device *dev, size_t size,
4865diff --git a/arch/avr32/include/asm/cache.h b/arch/avr32/include/asm/cache.h
4866index c3a58a1..78fbf54 100644
4867--- a/arch/avr32/include/asm/cache.h
4868+++ b/arch/avr32/include/asm/cache.h
4869@@ -1,8 +1,10 @@
4870 #ifndef __ASM_AVR32_CACHE_H
4871 #define __ASM_AVR32_CACHE_H
4872
4873+#include <linux/const.h>
4874+
4875 #define L1_CACHE_SHIFT 5
4876-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4877+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4878
4879 /*
4880 * Memory returned by kmalloc() may be used for DMA, so we must make
4881diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
4882index d232888..87c8df1 100644
4883--- a/arch/avr32/include/asm/elf.h
4884+++ b/arch/avr32/include/asm/elf.h
4885@@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpregset_t;
4886 the loader. We need to make sure that it is out of the way of the program
4887 that it will "exec", and that there is sufficient room for the brk. */
4888
4889-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
4890+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
4891
4892+#ifdef CONFIG_PAX_ASLR
4893+#define PAX_ELF_ET_DYN_BASE 0x00001000UL
4894+
4895+#define PAX_DELTA_MMAP_LEN 15
4896+#define PAX_DELTA_STACK_LEN 15
4897+#endif
4898
4899 /* This yields a mask that user programs can use to figure out what
4900 instruction set this CPU supports. This could be done in user space,
4901diff --git a/arch/avr32/include/asm/kmap_types.h b/arch/avr32/include/asm/kmap_types.h
4902index 479330b..53717a8 100644
4903--- a/arch/avr32/include/asm/kmap_types.h
4904+++ b/arch/avr32/include/asm/kmap_types.h
4905@@ -2,9 +2,9 @@
4906 #define __ASM_AVR32_KMAP_TYPES_H
4907
4908 #ifdef CONFIG_DEBUG_HIGHMEM
4909-# define KM_TYPE_NR 29
4910+# define KM_TYPE_NR 30
4911 #else
4912-# define KM_TYPE_NR 14
4913+# define KM_TYPE_NR 15
4914 #endif
4915
4916 #endif /* __ASM_AVR32_KMAP_TYPES_H */
4917diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
4918index d223a8b..69c5210 100644
4919--- a/arch/avr32/mm/fault.c
4920+++ b/arch/avr32/mm/fault.c
4921@@ -41,6 +41,23 @@ static inline int notify_page_fault(struct pt_regs *regs, int trap)
4922
4923 int exception_trace = 1;
4924
4925+#ifdef CONFIG_PAX_PAGEEXEC
4926+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
4927+{
4928+ unsigned long i;
4929+
4930+ printk(KERN_ERR "PAX: bytes at PC: ");
4931+ for (i = 0; i < 20; i++) {
4932+ unsigned char c;
4933+ if (get_user(c, (unsigned char *)pc+i))
4934+ printk(KERN_CONT "???????? ");
4935+ else
4936+ printk(KERN_CONT "%02x ", c);
4937+ }
4938+ printk("\n");
4939+}
4940+#endif
4941+
4942 /*
4943 * This routine handles page faults. It determines the address and the
4944 * problem, and then passes it off to one of the appropriate routines.
4945@@ -178,6 +195,16 @@ bad_area:
4946 up_read(&mm->mmap_sem);
4947
4948 if (user_mode(regs)) {
4949+
4950+#ifdef CONFIG_PAX_PAGEEXEC
4951+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
4952+ if (ecr == ECR_PROTECTION_X || ecr == ECR_TLB_MISS_X) {
4953+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->sp);
4954+ do_group_exit(SIGKILL);
4955+ }
4956+ }
4957+#endif
4958+
4959 if (exception_trace && printk_ratelimit())
4960 printk("%s%s[%d]: segfault at %08lx pc %08lx "
4961 "sp %08lx ecr %lu\n",
4962diff --git a/arch/blackfin/include/asm/cache.h b/arch/blackfin/include/asm/cache.h
4963index 568885a..f8008df 100644
4964--- a/arch/blackfin/include/asm/cache.h
4965+++ b/arch/blackfin/include/asm/cache.h
4966@@ -7,6 +7,7 @@
4967 #ifndef __ARCH_BLACKFIN_CACHE_H
4968 #define __ARCH_BLACKFIN_CACHE_H
4969
4970+#include <linux/const.h>
4971 #include <linux/linkage.h> /* for asmlinkage */
4972
4973 /*
4974@@ -14,7 +15,7 @@
4975 * Blackfin loads 32 bytes for cache
4976 */
4977 #define L1_CACHE_SHIFT 5
4978-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
4979+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4980 #define SMP_CACHE_BYTES L1_CACHE_BYTES
4981
4982 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
4983diff --git a/arch/cris/include/arch-v10/arch/cache.h b/arch/cris/include/arch-v10/arch/cache.h
4984index aea2718..3639a60 100644
4985--- a/arch/cris/include/arch-v10/arch/cache.h
4986+++ b/arch/cris/include/arch-v10/arch/cache.h
4987@@ -1,8 +1,9 @@
4988 #ifndef _ASM_ARCH_CACHE_H
4989 #define _ASM_ARCH_CACHE_H
4990
4991+#include <linux/const.h>
4992 /* Etrax 100LX have 32-byte cache-lines. */
4993-#define L1_CACHE_BYTES 32
4994 #define L1_CACHE_SHIFT 5
4995+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
4996
4997 #endif /* _ASM_ARCH_CACHE_H */
4998diff --git a/arch/cris/include/arch-v32/arch/cache.h b/arch/cris/include/arch-v32/arch/cache.h
4999index 7caf25d..ee65ac5 100644
5000--- a/arch/cris/include/arch-v32/arch/cache.h
5001+++ b/arch/cris/include/arch-v32/arch/cache.h
5002@@ -1,11 +1,12 @@
5003 #ifndef _ASM_CRIS_ARCH_CACHE_H
5004 #define _ASM_CRIS_ARCH_CACHE_H
5005
5006+#include <linux/const.h>
5007 #include <arch/hwregs/dma.h>
5008
5009 /* A cache-line is 32 bytes. */
5010-#define L1_CACHE_BYTES 32
5011 #define L1_CACHE_SHIFT 5
5012+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5013
5014 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
5015
5016diff --git a/arch/frv/include/asm/atomic.h b/arch/frv/include/asm/atomic.h
5017index 102190a..5334cea 100644
5018--- a/arch/frv/include/asm/atomic.h
5019+++ b/arch/frv/include/asm/atomic.h
5020@@ -181,6 +181,16 @@ static inline void atomic64_dec(atomic64_t *v)
5021 #define atomic64_cmpxchg(v, old, new) (__cmpxchg_64(old, new, &(v)->counter))
5022 #define atomic64_xchg(v, new) (__xchg_64(new, &(v)->counter))
5023
5024+#define atomic64_read_unchecked(v) atomic64_read(v)
5025+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5026+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5027+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5028+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5029+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5030+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5031+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5032+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5033+
5034 static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
5035 {
5036 int c, old;
5037diff --git a/arch/frv/include/asm/cache.h b/arch/frv/include/asm/cache.h
5038index 2797163..c2a401df9 100644
5039--- a/arch/frv/include/asm/cache.h
5040+++ b/arch/frv/include/asm/cache.h
5041@@ -12,10 +12,11 @@
5042 #ifndef __ASM_CACHE_H
5043 #define __ASM_CACHE_H
5044
5045+#include <linux/const.h>
5046
5047 /* bytes per L1 cache line */
5048 #define L1_CACHE_SHIFT (CONFIG_FRV_L1_CACHE_SHIFT)
5049-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5050+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5051
5052 #define __cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5053 #define ____cacheline_aligned __attribute__((aligned(L1_CACHE_BYTES)))
5054diff --git a/arch/frv/include/asm/kmap_types.h b/arch/frv/include/asm/kmap_types.h
5055index 43901f2..0d8b865 100644
5056--- a/arch/frv/include/asm/kmap_types.h
5057+++ b/arch/frv/include/asm/kmap_types.h
5058@@ -2,6 +2,6 @@
5059 #ifndef _ASM_KMAP_TYPES_H
5060 #define _ASM_KMAP_TYPES_H
5061
5062-#define KM_TYPE_NR 17
5063+#define KM_TYPE_NR 18
5064
5065 #endif
5066diff --git a/arch/frv/mm/elf-fdpic.c b/arch/frv/mm/elf-fdpic.c
5067index 836f147..4cf23f5 100644
5068--- a/arch/frv/mm/elf-fdpic.c
5069+++ b/arch/frv/mm/elf-fdpic.c
5070@@ -61,6 +61,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5071 {
5072 struct vm_area_struct *vma;
5073 struct vm_unmapped_area_info info;
5074+ unsigned long offset = gr_rand_threadstack_offset(current->mm, filp, flags);
5075
5076 if (len > TASK_SIZE)
5077 return -ENOMEM;
5078@@ -73,8 +74,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5079 if (addr) {
5080 addr = PAGE_ALIGN(addr);
5081 vma = find_vma(current->mm, addr);
5082- if (TASK_SIZE - len >= addr &&
5083- (!vma || addr + len <= vma->vm_start))
5084+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
5085 goto success;
5086 }
5087
5088@@ -85,6 +85,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
5089 info.high_limit = (current->mm->start_stack - 0x00200000);
5090 info.align_mask = 0;
5091 info.align_offset = 0;
5092+ info.threadstack_offset = offset;
5093 addr = vm_unmapped_area(&info);
5094 if (!(addr & ~PAGE_MASK))
5095 goto success;
5096diff --git a/arch/hexagon/include/asm/cache.h b/arch/hexagon/include/asm/cache.h
5097index 69952c18..4fa2908 100644
5098--- a/arch/hexagon/include/asm/cache.h
5099+++ b/arch/hexagon/include/asm/cache.h
5100@@ -21,9 +21,11 @@
5101 #ifndef __ASM_CACHE_H
5102 #define __ASM_CACHE_H
5103
5104+#include <linux/const.h>
5105+
5106 /* Bytes per L1 cache line */
5107-#define L1_CACHE_SHIFT (5)
5108-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5109+#define L1_CACHE_SHIFT 5
5110+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5111
5112 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5113
5114diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
5115index 074e52b..76afdac 100644
5116--- a/arch/ia64/Kconfig
5117+++ b/arch/ia64/Kconfig
5118@@ -548,6 +548,7 @@ source "drivers/sn/Kconfig"
5119 config KEXEC
5120 bool "kexec system call"
5121 depends on !IA64_HP_SIM && (!SMP || HOTPLUG_CPU)
5122+ depends on !GRKERNSEC_KMEM
5123 help
5124 kexec is a system call that implements the ability to shutdown your
5125 current kernel, and to start another kernel. It is like a reboot
5126diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
5127index 970d0bd..e750b9b 100644
5128--- a/arch/ia64/Makefile
5129+++ b/arch/ia64/Makefile
5130@@ -98,5 +98,6 @@ endef
5131 archprepare: make_nr_irqs_h FORCE
5132 PHONY += make_nr_irqs_h FORCE
5133
5134+make_nr_irqs_h: KBUILD_CFLAGS := $(filter-out $(GCC_PLUGINS_CFLAGS),$(KBUILD_CFLAGS))
5135 make_nr_irqs_h: FORCE
5136 $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
5137diff --git a/arch/ia64/include/asm/atomic.h b/arch/ia64/include/asm/atomic.h
5138index 0bf0350..2ad1957 100644
5139--- a/arch/ia64/include/asm/atomic.h
5140+++ b/arch/ia64/include/asm/atomic.h
5141@@ -193,4 +193,14 @@ atomic64_add_negative (__s64 i, atomic64_t *v)
5142 #define atomic64_inc(v) atomic64_add(1, (v))
5143 #define atomic64_dec(v) atomic64_sub(1, (v))
5144
5145+#define atomic64_read_unchecked(v) atomic64_read(v)
5146+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
5147+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
5148+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
5149+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
5150+#define atomic64_inc_unchecked(v) atomic64_inc(v)
5151+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
5152+#define atomic64_dec_unchecked(v) atomic64_dec(v)
5153+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
5154+
5155 #endif /* _ASM_IA64_ATOMIC_H */
5156diff --git a/arch/ia64/include/asm/barrier.h b/arch/ia64/include/asm/barrier.h
5157index f6769eb..1cdb590 100644
5158--- a/arch/ia64/include/asm/barrier.h
5159+++ b/arch/ia64/include/asm/barrier.h
5160@@ -66,7 +66,7 @@
5161 do { \
5162 compiletime_assert_atomic_type(*p); \
5163 barrier(); \
5164- ACCESS_ONCE(*p) = (v); \
5165+ ACCESS_ONCE_RW(*p) = (v); \
5166 } while (0)
5167
5168 #define smp_load_acquire(p) \
5169diff --git a/arch/ia64/include/asm/cache.h b/arch/ia64/include/asm/cache.h
5170index 988254a..e1ee885 100644
5171--- a/arch/ia64/include/asm/cache.h
5172+++ b/arch/ia64/include/asm/cache.h
5173@@ -1,6 +1,7 @@
5174 #ifndef _ASM_IA64_CACHE_H
5175 #define _ASM_IA64_CACHE_H
5176
5177+#include <linux/const.h>
5178
5179 /*
5180 * Copyright (C) 1998-2000 Hewlett-Packard Co
5181@@ -9,7 +10,7 @@
5182
5183 /* Bytes per L1 (data) cache line. */
5184 #define L1_CACHE_SHIFT CONFIG_IA64_L1_CACHE_SHIFT
5185-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5186+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5187
5188 #ifdef CONFIG_SMP
5189 # define SMP_CACHE_SHIFT L1_CACHE_SHIFT
5190diff --git a/arch/ia64/include/asm/elf.h b/arch/ia64/include/asm/elf.h
5191index 5a83c5c..4d7f553 100644
5192--- a/arch/ia64/include/asm/elf.h
5193+++ b/arch/ia64/include/asm/elf.h
5194@@ -42,6 +42,13 @@
5195 */
5196 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
5197
5198+#ifdef CONFIG_PAX_ASLR
5199+#define PAX_ELF_ET_DYN_BASE (current->personality == PER_LINUX32 ? 0x08048000UL : 0x4000000000000000UL)
5200+
5201+#define PAX_DELTA_MMAP_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5202+#define PAX_DELTA_STACK_LEN (current->personality == PER_LINUX32 ? 16 : 3*PAGE_SHIFT - 13)
5203+#endif
5204+
5205 #define PT_IA_64_UNWIND 0x70000001
5206
5207 /* IA-64 relocations: */
5208diff --git a/arch/ia64/include/asm/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
5209index 5767cdf..7462574 100644
5210--- a/arch/ia64/include/asm/pgalloc.h
5211+++ b/arch/ia64/include/asm/pgalloc.h
5212@@ -39,6 +39,12 @@ pgd_populate(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5213 pgd_val(*pgd_entry) = __pa(pud);
5214 }
5215
5216+static inline void
5217+pgd_populate_kernel(struct mm_struct *mm, pgd_t * pgd_entry, pud_t * pud)
5218+{
5219+ pgd_populate(mm, pgd_entry, pud);
5220+}
5221+
5222 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
5223 {
5224 return quicklist_alloc(0, GFP_KERNEL, NULL);
5225@@ -57,6 +63,12 @@ pud_populate(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5226 pud_val(*pud_entry) = __pa(pmd);
5227 }
5228
5229+static inline void
5230+pud_populate_kernel(struct mm_struct *mm, pud_t * pud_entry, pmd_t * pmd)
5231+{
5232+ pud_populate(mm, pud_entry, pmd);
5233+}
5234+
5235 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long addr)
5236 {
5237 return quicklist_alloc(0, GFP_KERNEL, NULL);
5238diff --git a/arch/ia64/include/asm/pgtable.h b/arch/ia64/include/asm/pgtable.h
5239index 7b6f880..ac8e008 100644
5240--- a/arch/ia64/include/asm/pgtable.h
5241+++ b/arch/ia64/include/asm/pgtable.h
5242@@ -12,7 +12,7 @@
5243 * David Mosberger-Tang <davidm@hpl.hp.com>
5244 */
5245
5246-
5247+#include <linux/const.h>
5248 #include <asm/mman.h>
5249 #include <asm/page.h>
5250 #include <asm/processor.h>
5251@@ -139,6 +139,17 @@
5252 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5253 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5254 #define PAGE_COPY_EXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RX)
5255+
5256+#ifdef CONFIG_PAX_PAGEEXEC
5257+# define PAGE_SHARED_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_RW)
5258+# define PAGE_READONLY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5259+# define PAGE_COPY_NOEXEC __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
5260+#else
5261+# define PAGE_SHARED_NOEXEC PAGE_SHARED
5262+# define PAGE_READONLY_NOEXEC PAGE_READONLY
5263+# define PAGE_COPY_NOEXEC PAGE_COPY
5264+#endif
5265+
5266 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
5267 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
5268 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
5269diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
5270index 45698cd..e8e2dbc 100644
5271--- a/arch/ia64/include/asm/spinlock.h
5272+++ b/arch/ia64/include/asm/spinlock.h
5273@@ -71,7 +71,7 @@ static __always_inline void __ticket_spin_unlock(arch_spinlock_t *lock)
5274 unsigned short *p = (unsigned short *)&lock->lock + 1, tmp;
5275
5276 asm volatile ("ld2.bias %0=[%1]" : "=r"(tmp) : "r"(p));
5277- ACCESS_ONCE(*p) = (tmp + 2) & ~1;
5278+ ACCESS_ONCE_RW(*p) = (tmp + 2) & ~1;
5279 }
5280
5281 static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
5282diff --git a/arch/ia64/include/asm/uaccess.h b/arch/ia64/include/asm/uaccess.h
5283index 4f3fb6cc..254055e 100644
5284--- a/arch/ia64/include/asm/uaccess.h
5285+++ b/arch/ia64/include/asm/uaccess.h
5286@@ -70,6 +70,7 @@
5287 && ((segment).seg == KERNEL_DS.seg \
5288 || likely(REGION_OFFSET((unsigned long) (addr)) < RGN_MAP_LIMIT))); \
5289 })
5290+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
5291 #define access_ok(type, addr, size) __access_ok((addr), (size), get_fs())
5292
5293 /*
5294@@ -241,12 +242,24 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use
5295 static inline unsigned long
5296 __copy_to_user (void __user *to, const void *from, unsigned long count)
5297 {
5298+ if (count > INT_MAX)
5299+ return count;
5300+
5301+ if (!__builtin_constant_p(count))
5302+ check_object_size(from, count, true);
5303+
5304 return __copy_user(to, (__force void __user *) from, count);
5305 }
5306
5307 static inline unsigned long
5308 __copy_from_user (void *to, const void __user *from, unsigned long count)
5309 {
5310+ if (count > INT_MAX)
5311+ return count;
5312+
5313+ if (!__builtin_constant_p(count))
5314+ check_object_size(to, count, false);
5315+
5316 return __copy_user((__force void __user *) to, from, count);
5317 }
5318
5319@@ -256,10 +269,13 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5320 ({ \
5321 void __user *__cu_to = (to); \
5322 const void *__cu_from = (from); \
5323- long __cu_len = (n); \
5324+ unsigned long __cu_len = (n); \
5325 \
5326- if (__access_ok(__cu_to, __cu_len, get_fs())) \
5327+ if (__cu_len <= INT_MAX && __access_ok(__cu_to, __cu_len, get_fs())) { \
5328+ if (!__builtin_constant_p(n)) \
5329+ check_object_size(__cu_from, __cu_len, true); \
5330 __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \
5331+ } \
5332 __cu_len; \
5333 })
5334
5335@@ -267,11 +283,14 @@ __copy_from_user (void *to, const void __user *from, unsigned long count)
5336 ({ \
5337 void *__cu_to = (to); \
5338 const void __user *__cu_from = (from); \
5339- long __cu_len = (n); \
5340+ unsigned long __cu_len = (n); \
5341 \
5342 __chk_user_ptr(__cu_from); \
5343- if (__access_ok(__cu_from, __cu_len, get_fs())) \
5344+ if (__cu_len <= INT_MAX && __access_ok(__cu_from, __cu_len, get_fs())) { \
5345+ if (!__builtin_constant_p(n)) \
5346+ check_object_size(__cu_to, __cu_len, false); \
5347 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
5348+ } \
5349 __cu_len; \
5350 })
5351
5352diff --git a/arch/ia64/kernel/module.c b/arch/ia64/kernel/module.c
5353index 29754aa..06d2838 100644
5354--- a/arch/ia64/kernel/module.c
5355+++ b/arch/ia64/kernel/module.c
5356@@ -492,15 +492,39 @@ module_frob_arch_sections (Elf_Ehdr *ehdr, Elf_Shdr *sechdrs, char *secstrings,
5357 }
5358
5359 static inline int
5360+in_init_rx (const struct module *mod, uint64_t addr)
5361+{
5362+ return addr - (uint64_t) mod->module_init_rx < mod->init_size_rx;
5363+}
5364+
5365+static inline int
5366+in_init_rw (const struct module *mod, uint64_t addr)
5367+{
5368+ return addr - (uint64_t) mod->module_init_rw < mod->init_size_rw;
5369+}
5370+
5371+static inline int
5372 in_init (const struct module *mod, uint64_t addr)
5373 {
5374- return addr - (uint64_t) mod->module_init < mod->init_size;
5375+ return in_init_rx(mod, addr) || in_init_rw(mod, addr);
5376+}
5377+
5378+static inline int
5379+in_core_rx (const struct module *mod, uint64_t addr)
5380+{
5381+ return addr - (uint64_t) mod->module_core_rx < mod->core_size_rx;
5382+}
5383+
5384+static inline int
5385+in_core_rw (const struct module *mod, uint64_t addr)
5386+{
5387+ return addr - (uint64_t) mod->module_core_rw < mod->core_size_rw;
5388 }
5389
5390 static inline int
5391 in_core (const struct module *mod, uint64_t addr)
5392 {
5393- return addr - (uint64_t) mod->module_core < mod->core_size;
5394+ return in_core_rx(mod, addr) || in_core_rw(mod, addr);
5395 }
5396
5397 static inline int
5398@@ -683,7 +707,14 @@ do_reloc (struct module *mod, uint8_t r_type, Elf64_Sym *sym, uint64_t addend,
5399 break;
5400
5401 case RV_BDREL:
5402- val -= (uint64_t) (in_init(mod, val) ? mod->module_init : mod->module_core);
5403+ if (in_init_rx(mod, val))
5404+ val -= (uint64_t) mod->module_init_rx;
5405+ else if (in_init_rw(mod, val))
5406+ val -= (uint64_t) mod->module_init_rw;
5407+ else if (in_core_rx(mod, val))
5408+ val -= (uint64_t) mod->module_core_rx;
5409+ else if (in_core_rw(mod, val))
5410+ val -= (uint64_t) mod->module_core_rw;
5411 break;
5412
5413 case RV_LTV:
5414@@ -818,15 +849,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, const char *strtab, unsigned int symind
5415 * addresses have been selected...
5416 */
5417 uint64_t gp;
5418- if (mod->core_size > MAX_LTOFF)
5419+ if (mod->core_size_rx + mod->core_size_rw > MAX_LTOFF)
5420 /*
5421 * This takes advantage of fact that SHF_ARCH_SMALL gets allocated
5422 * at the end of the module.
5423 */
5424- gp = mod->core_size - MAX_LTOFF / 2;
5425+ gp = mod->core_size_rx + mod->core_size_rw - MAX_LTOFF / 2;
5426 else
5427- gp = mod->core_size / 2;
5428- gp = (uint64_t) mod->module_core + ((gp + 7) & -8);
5429+ gp = (mod->core_size_rx + mod->core_size_rw) / 2;
5430+ gp = (uint64_t) mod->module_core_rx + ((gp + 7) & -8);
5431 mod->arch.gp = gp;
5432 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
5433 }
5434diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
5435index c39c3cd..3c77738 100644
5436--- a/arch/ia64/kernel/palinfo.c
5437+++ b/arch/ia64/kernel/palinfo.c
5438@@ -980,7 +980,7 @@ static int palinfo_cpu_callback(struct notifier_block *nfb,
5439 return NOTIFY_OK;
5440 }
5441
5442-static struct notifier_block __refdata palinfo_cpu_notifier =
5443+static struct notifier_block palinfo_cpu_notifier =
5444 {
5445 .notifier_call = palinfo_cpu_callback,
5446 .priority = 0,
5447diff --git a/arch/ia64/kernel/sys_ia64.c b/arch/ia64/kernel/sys_ia64.c
5448index 41e33f8..65180b2a 100644
5449--- a/arch/ia64/kernel/sys_ia64.c
5450+++ b/arch/ia64/kernel/sys_ia64.c
5451@@ -28,6 +28,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5452 unsigned long align_mask = 0;
5453 struct mm_struct *mm = current->mm;
5454 struct vm_unmapped_area_info info;
5455+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
5456
5457 if (len > RGN_MAP_LIMIT)
5458 return -ENOMEM;
5459@@ -43,6 +44,13 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5460 if (REGION_NUMBER(addr) == RGN_HPAGE)
5461 addr = 0;
5462 #endif
5463+
5464+#ifdef CONFIG_PAX_RANDMMAP
5465+ if (mm->pax_flags & MF_PAX_RANDMMAP)
5466+ addr = mm->free_area_cache;
5467+ else
5468+#endif
5469+
5470 if (!addr)
5471 addr = TASK_UNMAPPED_BASE;
5472
5473@@ -61,6 +69,7 @@ arch_get_unmapped_area (struct file *filp, unsigned long addr, unsigned long len
5474 info.high_limit = TASK_SIZE;
5475 info.align_mask = align_mask;
5476 info.align_offset = 0;
5477+ info.threadstack_offset = offset;
5478 return vm_unmapped_area(&info);
5479 }
5480
5481diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
5482index 84f8a52..7c76178 100644
5483--- a/arch/ia64/kernel/vmlinux.lds.S
5484+++ b/arch/ia64/kernel/vmlinux.lds.S
5485@@ -192,7 +192,7 @@ SECTIONS {
5486 /* Per-cpu data: */
5487 . = ALIGN(PERCPU_PAGE_SIZE);
5488 PERCPU_VADDR(SMP_CACHE_BYTES, PERCPU_ADDR, :percpu)
5489- __phys_per_cpu_start = __per_cpu_load;
5490+ __phys_per_cpu_start = per_cpu_load;
5491 /*
5492 * ensure percpu data fits
5493 * into percpu page size
5494diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
5495index ba5ba7a..36e9d3a 100644
5496--- a/arch/ia64/mm/fault.c
5497+++ b/arch/ia64/mm/fault.c
5498@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned long address)
5499 return pte_present(pte);
5500 }
5501
5502+#ifdef CONFIG_PAX_PAGEEXEC
5503+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
5504+{
5505+ unsigned long i;
5506+
5507+ printk(KERN_ERR "PAX: bytes at PC: ");
5508+ for (i = 0; i < 8; i++) {
5509+ unsigned int c;
5510+ if (get_user(c, (unsigned int *)pc+i))
5511+ printk(KERN_CONT "???????? ");
5512+ else
5513+ printk(KERN_CONT "%08x ", c);
5514+ }
5515+ printk("\n");
5516+}
5517+#endif
5518+
5519 # define VM_READ_BIT 0
5520 # define VM_WRITE_BIT 1
5521 # define VM_EXEC_BIT 2
5522@@ -151,8 +168,21 @@ retry:
5523 if (((isr >> IA64_ISR_R_BIT) & 1UL) && (!(vma->vm_flags & (VM_READ | VM_WRITE))))
5524 goto bad_area;
5525
5526- if ((vma->vm_flags & mask) != mask)
5527+ if ((vma->vm_flags & mask) != mask) {
5528+
5529+#ifdef CONFIG_PAX_PAGEEXEC
5530+ if (!(vma->vm_flags & VM_EXEC) && (mask & VM_EXEC)) {
5531+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || address != regs->cr_iip)
5532+ goto bad_area;
5533+
5534+ up_read(&mm->mmap_sem);
5535+ pax_report_fault(regs, (void *)regs->cr_iip, (void *)regs->r12);
5536+ do_group_exit(SIGKILL);
5537+ }
5538+#endif
5539+
5540 goto bad_area;
5541+ }
5542
5543 /*
5544 * If for any reason at all we couldn't handle the fault, make
5545diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
5546index 52b7604b..455cb85 100644
5547--- a/arch/ia64/mm/hugetlbpage.c
5548+++ b/arch/ia64/mm/hugetlbpage.c
5549@@ -143,6 +143,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5550 unsigned long pgoff, unsigned long flags)
5551 {
5552 struct vm_unmapped_area_info info;
5553+ unsigned long offset = gr_rand_threadstack_offset(current->mm, file, flags);
5554
5555 if (len > RGN_MAP_LIMIT)
5556 return -ENOMEM;
5557@@ -166,6 +167,7 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, u
5558 info.high_limit = HPAGE_REGION_BASE + RGN_MAP_LIMIT;
5559 info.align_mask = PAGE_MASK & (HPAGE_SIZE - 1);
5560 info.align_offset = 0;
5561+ info.threadstack_offset = offset;
5562 return vm_unmapped_area(&info);
5563 }
5564
5565diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c
5566index 6b33457..88b5124 100644
5567--- a/arch/ia64/mm/init.c
5568+++ b/arch/ia64/mm/init.c
5569@@ -120,6 +120,19 @@ ia64_init_addr_space (void)
5570 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
5571 vma->vm_end = vma->vm_start + PAGE_SIZE;
5572 vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT;
5573+
5574+#ifdef CONFIG_PAX_PAGEEXEC
5575+ if (current->mm->pax_flags & MF_PAX_PAGEEXEC) {
5576+ vma->vm_flags &= ~VM_EXEC;
5577+
5578+#ifdef CONFIG_PAX_MPROTECT
5579+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
5580+ vma->vm_flags &= ~VM_MAYEXEC;
5581+#endif
5582+
5583+ }
5584+#endif
5585+
5586 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
5587 down_write(&current->mm->mmap_sem);
5588 if (insert_vm_struct(current->mm, vma)) {
5589@@ -286,7 +299,7 @@ static int __init gate_vma_init(void)
5590 gate_vma.vm_start = FIXADDR_USER_START;
5591 gate_vma.vm_end = FIXADDR_USER_END;
5592 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
5593- gate_vma.vm_page_prot = __P101;
5594+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
5595
5596 return 0;
5597 }
5598diff --git a/arch/m32r/include/asm/cache.h b/arch/m32r/include/asm/cache.h
5599index 40b3ee98..8c2c112 100644
5600--- a/arch/m32r/include/asm/cache.h
5601+++ b/arch/m32r/include/asm/cache.h
5602@@ -1,8 +1,10 @@
5603 #ifndef _ASM_M32R_CACHE_H
5604 #define _ASM_M32R_CACHE_H
5605
5606+#include <linux/const.h>
5607+
5608 /* L1 cache line size */
5609 #define L1_CACHE_SHIFT 4
5610-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5611+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5612
5613 #endif /* _ASM_M32R_CACHE_H */
5614diff --git a/arch/m32r/lib/usercopy.c b/arch/m32r/lib/usercopy.c
5615index 82abd15..d95ae5d 100644
5616--- a/arch/m32r/lib/usercopy.c
5617+++ b/arch/m32r/lib/usercopy.c
5618@@ -14,6 +14,9 @@
5619 unsigned long
5620 __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5621 {
5622+ if ((long)n < 0)
5623+ return n;
5624+
5625 prefetch(from);
5626 if (access_ok(VERIFY_WRITE, to, n))
5627 __copy_user(to,from,n);
5628@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
5629 unsigned long
5630 __generic_copy_from_user(void *to, const void __user *from, unsigned long n)
5631 {
5632+ if ((long)n < 0)
5633+ return n;
5634+
5635 prefetchw(to);
5636 if (access_ok(VERIFY_READ, from, n))
5637 __copy_user_zeroing(to,from,n);
5638diff --git a/arch/m68k/include/asm/cache.h b/arch/m68k/include/asm/cache.h
5639index 0395c51..5f26031 100644
5640--- a/arch/m68k/include/asm/cache.h
5641+++ b/arch/m68k/include/asm/cache.h
5642@@ -4,9 +4,11 @@
5643 #ifndef __ARCH_M68K_CACHE_H
5644 #define __ARCH_M68K_CACHE_H
5645
5646+#include <linux/const.h>
5647+
5648 /* bytes per L1 cache line */
5649 #define L1_CACHE_SHIFT 4
5650-#define L1_CACHE_BYTES (1<< L1_CACHE_SHIFT)
5651+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5652
5653 #define ARCH_DMA_MINALIGN L1_CACHE_BYTES
5654
5655diff --git a/arch/metag/include/asm/barrier.h b/arch/metag/include/asm/barrier.h
5656index d703d8e..a8e2d70 100644
5657--- a/arch/metag/include/asm/barrier.h
5658+++ b/arch/metag/include/asm/barrier.h
5659@@ -90,7 +90,7 @@ static inline void fence(void)
5660 do { \
5661 compiletime_assert_atomic_type(*p); \
5662 smp_mb(); \
5663- ACCESS_ONCE(*p) = (v); \
5664+ ACCESS_ONCE_RW(*p) = (v); \
5665 } while (0)
5666
5667 #define smp_load_acquire(p) \
5668diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
5669index 7ca80ac..794ba72 100644
5670--- a/arch/metag/mm/hugetlbpage.c
5671+++ b/arch/metag/mm/hugetlbpage.c
5672@@ -194,6 +194,7 @@ hugetlb_get_unmapped_area_new_pmd(unsigned long len)
5673 info.high_limit = TASK_SIZE;
5674 info.align_mask = PAGE_MASK & HUGEPT_MASK;
5675 info.align_offset = 0;
5676+ info.threadstack_offset = 0;
5677 return vm_unmapped_area(&info);
5678 }
5679
5680diff --git a/arch/microblaze/include/asm/cache.h b/arch/microblaze/include/asm/cache.h
5681index 4efe96a..60e8699 100644
5682--- a/arch/microblaze/include/asm/cache.h
5683+++ b/arch/microblaze/include/asm/cache.h
5684@@ -13,11 +13,12 @@
5685 #ifndef _ASM_MICROBLAZE_CACHE_H
5686 #define _ASM_MICROBLAZE_CACHE_H
5687
5688+#include <linux/const.h>
5689 #include <asm/registers.h>
5690
5691 #define L1_CACHE_SHIFT 5
5692 /* word-granular cache in microblaze */
5693-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
5694+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
5695
5696 #define SMP_CACHE_BYTES L1_CACHE_BYTES
5697
5698diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
5699index c7a1690..28c24b6 100644
5700--- a/arch/mips/Kconfig
5701+++ b/arch/mips/Kconfig
5702@@ -2504,6 +2504,7 @@ source "kernel/Kconfig.preempt"
5703
5704 config KEXEC
5705 bool "Kexec system call"
5706+ depends on !GRKERNSEC_KMEM
5707 help
5708 kexec is a system call that implements the ability to shutdown your
5709 current kernel, and to start another kernel. It is like a reboot
5710diff --git a/arch/mips/cavium-octeon/dma-octeon.c b/arch/mips/cavium-octeon/dma-octeon.c
5711index 7d89878..57c55b7 100644
5712--- a/arch/mips/cavium-octeon/dma-octeon.c
5713+++ b/arch/mips/cavium-octeon/dma-octeon.c
5714@@ -199,7 +199,7 @@ static void octeon_dma_free_coherent(struct device *dev, size_t size,
5715 if (dma_release_from_coherent(dev, order, vaddr))
5716 return;
5717
5718- swiotlb_free_coherent(dev, size, vaddr, dma_handle);
5719+ swiotlb_free_coherent(dev, size, vaddr, dma_handle, attrs);
5720 }
5721
5722 static dma_addr_t octeon_unity_phys_to_dma(struct device *dev, phys_addr_t paddr)
5723diff --git a/arch/mips/include/asm/atomic.h b/arch/mips/include/asm/atomic.h
5724index 26d4363..3c9a82e 100644
5725--- a/arch/mips/include/asm/atomic.h
5726+++ b/arch/mips/include/asm/atomic.h
5727@@ -22,15 +22,39 @@
5728 #include <asm/cmpxchg.h>
5729 #include <asm/war.h>
5730
5731+#ifdef CONFIG_GENERIC_ATOMIC64
5732+#include <asm-generic/atomic64.h>
5733+#endif
5734+
5735 #define ATOMIC_INIT(i) { (i) }
5736
5737+#ifdef CONFIG_64BIT
5738+#define _ASM_EXTABLE(from, to) \
5739+" .section __ex_table,\"a\"\n" \
5740+" .dword " #from ", " #to"\n" \
5741+" .previous\n"
5742+#else
5743+#define _ASM_EXTABLE(from, to) \
5744+" .section __ex_table,\"a\"\n" \
5745+" .word " #from ", " #to"\n" \
5746+" .previous\n"
5747+#endif
5748+
5749 /*
5750 * atomic_read - read atomic variable
5751 * @v: pointer of type atomic_t
5752 *
5753 * Atomically reads the value of @v.
5754 */
5755-#define atomic_read(v) ACCESS_ONCE((v)->counter)
5756+static inline int atomic_read(const atomic_t *v)
5757+{
5758+ return ACCESS_ONCE(v->counter);
5759+}
5760+
5761+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
5762+{
5763+ return ACCESS_ONCE(v->counter);
5764+}
5765
5766 /*
5767 * atomic_set - set atomic variable
5768@@ -39,47 +63,77 @@
5769 *
5770 * Atomically sets the value of @v to @i.
5771 */
5772-#define atomic_set(v, i) ((v)->counter = (i))
5773+static inline void atomic_set(atomic_t *v, int i)
5774+{
5775+ v->counter = i;
5776+}
5777
5778-#define ATOMIC_OP(op, c_op, asm_op) \
5779-static __inline__ void atomic_##op(int i, atomic_t * v) \
5780+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
5781+{
5782+ v->counter = i;
5783+}
5784+
5785+#ifdef CONFIG_PAX_REFCOUNT
5786+#define __OVERFLOW_POST \
5787+ " b 4f \n" \
5788+ " .set noreorder \n" \
5789+ "3: b 5f \n" \
5790+ " move %0, %1 \n" \
5791+ " .set reorder \n"
5792+#define __OVERFLOW_EXTABLE \
5793+ "3:\n" \
5794+ _ASM_EXTABLE(2b, 3b)
5795+#else
5796+#define __OVERFLOW_POST
5797+#define __OVERFLOW_EXTABLE
5798+#endif
5799+
5800+#define __ATOMIC_OP(op, suffix, asm_op, extable) \
5801+static inline void atomic_##op##suffix(int i, atomic##suffix##_t * v) \
5802 { \
5803 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
5804 int temp; \
5805 \
5806 __asm__ __volatile__( \
5807- " .set arch=r4000 \n" \
5808- "1: ll %0, %1 # atomic_" #op " \n" \
5809- " " #asm_op " %0, %2 \n" \
5810+ " .set mips3 \n" \
5811+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5812+ "2: " #asm_op " %0, %2 \n" \
5813 " sc %0, %1 \n" \
5814 " beqzl %0, 1b \n" \
5815+ extable \
5816 " .set mips0 \n" \
5817 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5818 : "Ir" (i)); \
5819 } else if (kernel_uses_llsc) { \
5820 int temp; \
5821 \
5822- do { \
5823- __asm__ __volatile__( \
5824- " .set "MIPS_ISA_LEVEL" \n" \
5825- " ll %0, %1 # atomic_" #op "\n" \
5826- " " #asm_op " %0, %2 \n" \
5827- " sc %0, %1 \n" \
5828- " .set mips0 \n" \
5829- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5830- : "Ir" (i)); \
5831- } while (unlikely(!temp)); \
5832+ __asm__ __volatile__( \
5833+ " .set "MIPS_ISA_LEVEL" \n" \
5834+ "1: ll %0, %1 # atomic_" #op #suffix "\n" \
5835+ "2: " #asm_op " %0, %2 \n" \
5836+ " sc %0, %1 \n" \
5837+ " beqz %0, 1b \n" \
5838+ extable \
5839+ " .set mips0 \n" \
5840+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5841+ : "Ir" (i)); \
5842 } else { \
5843 unsigned long flags; \
5844 \
5845 raw_local_irq_save(flags); \
5846- v->counter c_op i; \
5847+ __asm__ __volatile__( \
5848+ "2: " #asm_op " %0, %1 \n" \
5849+ extable \
5850+ : "+r" (v->counter) : "Ir" (i)); \
5851 raw_local_irq_restore(flags); \
5852 } \
5853 }
5854
5855-#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
5856-static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5857+#define ATOMIC_OP(op, asm_op) __ATOMIC_OP(op, _unchecked, asm_op##u, ) \
5858+ __ATOMIC_OP(op, , asm_op, __OVERFLOW_EXTABLE)
5859+
5860+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op, extable) \
5861+static inline int atomic_##op##_return##suffix(int i, atomic##suffix##_t * v) \
5862 { \
5863 int result; \
5864 \
5865@@ -89,12 +143,15 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5866 int temp; \
5867 \
5868 __asm__ __volatile__( \
5869- " .set arch=r4000 \n" \
5870- "1: ll %1, %2 # atomic_" #op "_return \n" \
5871- " " #asm_op " %0, %1, %3 \n" \
5872+ " .set mips3 \n" \
5873+ "1: ll %1, %2 # atomic_" #op "_return" #suffix"\n" \
5874+ "2: " #asm_op " %0, %1, %3 \n" \
5875 " sc %0, %2 \n" \
5876 " beqzl %0, 1b \n" \
5877- " " #asm_op " %0, %1, %3 \n" \
5878+ post_op \
5879+ extable \
5880+ "4: " #asm_op " %0, %1, %3 \n" \
5881+ "5: \n" \
5882 " .set mips0 \n" \
5883 : "=&r" (result), "=&r" (temp), \
5884 "+" GCC_OFF_SMALL_ASM() (v->counter) \
5885@@ -102,26 +159,33 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5886 } else if (kernel_uses_llsc) { \
5887 int temp; \
5888 \
5889- do { \
5890- __asm__ __volatile__( \
5891- " .set "MIPS_ISA_LEVEL" \n" \
5892- " ll %1, %2 # atomic_" #op "_return \n" \
5893- " " #asm_op " %0, %1, %3 \n" \
5894- " sc %0, %2 \n" \
5895- " .set mips0 \n" \
5896- : "=&r" (result), "=&r" (temp), \
5897- "+" GCC_OFF_SMALL_ASM() (v->counter) \
5898- : "Ir" (i)); \
5899- } while (unlikely(!result)); \
5900+ __asm__ __volatile__( \
5901+ " .set "MIPS_ISA_LEVEL" \n" \
5902+ "1: ll %1, %2 # atomic_" #op "_return" #suffix "\n" \
5903+ "2: " #asm_op " %0, %1, %3 \n" \
5904+ " sc %0, %2 \n" \
5905+ post_op \
5906+ extable \
5907+ "4: " #asm_op " %0, %1, %3 \n" \
5908+ "5: \n" \
5909+ " .set mips0 \n" \
5910+ : "=&r" (result), "=&r" (temp), \
5911+ "+" GCC_OFF_SMALL_ASM() (v->counter) \
5912+ : "Ir" (i)); \
5913 \
5914 result = temp; result c_op i; \
5915 } else { \
5916 unsigned long flags; \
5917 \
5918 raw_local_irq_save(flags); \
5919- result = v->counter; \
5920- result c_op i; \
5921- v->counter = result; \
5922+ __asm__ __volatile__( \
5923+ " lw %0, %1 \n" \
5924+ "2: " #asm_op " %0, %1, %2 \n" \
5925+ " sw %0, %1 \n" \
5926+ "3: \n" \
5927+ extable \
5928+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
5929+ : "Ir" (i)); \
5930 raw_local_irq_restore(flags); \
5931 } \
5932 \
5933@@ -130,16 +194,21 @@ static __inline__ int atomic_##op##_return(int i, atomic_t * v) \
5934 return result; \
5935 }
5936
5937-#define ATOMIC_OPS(op, c_op, asm_op) \
5938- ATOMIC_OP(op, c_op, asm_op) \
5939- ATOMIC_OP_RETURN(op, c_op, asm_op)
5940+#define ATOMIC_OP_RETURN(op, asm_op) __ATOMIC_OP_RETURN(op, _unchecked, asm_op##u, , ) \
5941+ __ATOMIC_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
5942
5943-ATOMIC_OPS(add, +=, addu)
5944-ATOMIC_OPS(sub, -=, subu)
5945+#define ATOMIC_OPS(op, asm_op) \
5946+ ATOMIC_OP(op, asm_op) \
5947+ ATOMIC_OP_RETURN(op, asm_op)
5948+
5949+ATOMIC_OPS(add, add)
5950+ATOMIC_OPS(sub, sub)
5951
5952 #undef ATOMIC_OPS
5953 #undef ATOMIC_OP_RETURN
5954+#undef __ATOMIC_OP_RETURN
5955 #undef ATOMIC_OP
5956+#undef __ATOMIC_OP
5957
5958 /*
5959 * atomic_sub_if_positive - conditionally subtract integer from atomic variable
5960@@ -149,7 +218,7 @@ ATOMIC_OPS(sub, -=, subu)
5961 * Atomically test @v and subtract @i if @v is greater or equal than @i.
5962 * The function returns the old value of @v minus @i.
5963 */
5964-static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5965+static __inline__ int atomic_sub_if_positive(int i, atomic_t *v)
5966 {
5967 int result;
5968
5969@@ -159,7 +228,7 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5970 int temp;
5971
5972 __asm__ __volatile__(
5973- " .set arch=r4000 \n"
5974+ " .set "MIPS_ISA_LEVEL" \n"
5975 "1: ll %1, %2 # atomic_sub_if_positive\n"
5976 " subu %0, %1, %3 \n"
5977 " bltz %0, 1f \n"
5978@@ -208,8 +277,26 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
5979 return result;
5980 }
5981
5982-#define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
5983-#define atomic_xchg(v, new) (xchg(&((v)->counter), (new)))
5984+static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
5985+{
5986+ return cmpxchg(&v->counter, old, new);
5987+}
5988+
5989+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old,
5990+ int new)
5991+{
5992+ return cmpxchg(&(v->counter), old, new);
5993+}
5994+
5995+static inline int atomic_xchg(atomic_t *v, int new)
5996+{
5997+ return xchg(&v->counter, new);
5998+}
5999+
6000+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
6001+{
6002+ return xchg(&(v->counter), new);
6003+}
6004
6005 /**
6006 * __atomic_add_unless - add unless the number is a given value
6007@@ -237,6 +324,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6008
6009 #define atomic_dec_return(v) atomic_sub_return(1, (v))
6010 #define atomic_inc_return(v) atomic_add_return(1, (v))
6011+static __inline__ int atomic_inc_return_unchecked(atomic_unchecked_t *v)
6012+{
6013+ return atomic_add_return_unchecked(1, v);
6014+}
6015
6016 /*
6017 * atomic_sub_and_test - subtract value from variable and test result
6018@@ -258,6 +349,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6019 * other cases.
6020 */
6021 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
6022+static __inline__ int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
6023+{
6024+ return atomic_add_return_unchecked(1, v) == 0;
6025+}
6026
6027 /*
6028 * atomic_dec_and_test - decrement by 1 and test
6029@@ -282,6 +377,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6030 * Atomically increments @v by 1.
6031 */
6032 #define atomic_inc(v) atomic_add(1, (v))
6033+static __inline__ void atomic_inc_unchecked(atomic_unchecked_t *v)
6034+{
6035+ atomic_add_unchecked(1, v);
6036+}
6037
6038 /*
6039 * atomic_dec - decrement and test
6040@@ -290,6 +389,10 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6041 * Atomically decrements @v by 1.
6042 */
6043 #define atomic_dec(v) atomic_sub(1, (v))
6044+static __inline__ void atomic_dec_unchecked(atomic_unchecked_t *v)
6045+{
6046+ atomic_sub_unchecked(1, v);
6047+}
6048
6049 /*
6050 * atomic_add_negative - add and test if negative
6051@@ -311,54 +414,77 @@ static __inline__ int __atomic_add_unless(atomic_t *v, int a, int u)
6052 * @v: pointer of type atomic64_t
6053 *
6054 */
6055-#define atomic64_read(v) ACCESS_ONCE((v)->counter)
6056+static inline long atomic64_read(const atomic64_t *v)
6057+{
6058+ return ACCESS_ONCE(v->counter);
6059+}
6060+
6061+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
6062+{
6063+ return ACCESS_ONCE(v->counter);
6064+}
6065
6066 /*
6067 * atomic64_set - set atomic variable
6068 * @v: pointer of type atomic64_t
6069 * @i: required value
6070 */
6071-#define atomic64_set(v, i) ((v)->counter = (i))
6072+static inline void atomic64_set(atomic64_t *v, long i)
6073+{
6074+ v->counter = i;
6075+}
6076
6077-#define ATOMIC64_OP(op, c_op, asm_op) \
6078-static __inline__ void atomic64_##op(long i, atomic64_t * v) \
6079+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
6080+{
6081+ v->counter = i;
6082+}
6083+
6084+#define __ATOMIC64_OP(op, suffix, asm_op, extable) \
6085+static inline void atomic64_##op##suffix(long i, atomic64##suffix##_t * v) \
6086 { \
6087 if (kernel_uses_llsc && R10000_LLSC_WAR) { \
6088 long temp; \
6089 \
6090 __asm__ __volatile__( \
6091- " .set arch=r4000 \n" \
6092- "1: lld %0, %1 # atomic64_" #op " \n" \
6093- " " #asm_op " %0, %2 \n" \
6094+ " .set "MIPS_ISA_LEVEL" \n" \
6095+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6096+ "2: " #asm_op " %0, %2 \n" \
6097 " scd %0, %1 \n" \
6098 " beqzl %0, 1b \n" \
6099+ extable \
6100 " .set mips0 \n" \
6101 : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6102 : "Ir" (i)); \
6103 } else if (kernel_uses_llsc) { \
6104 long temp; \
6105 \
6106- do { \
6107- __asm__ __volatile__( \
6108- " .set "MIPS_ISA_LEVEL" \n" \
6109- " lld %0, %1 # atomic64_" #op "\n" \
6110- " " #asm_op " %0, %2 \n" \
6111- " scd %0, %1 \n" \
6112- " .set mips0 \n" \
6113- : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6114- : "Ir" (i)); \
6115- } while (unlikely(!temp)); \
6116+ __asm__ __volatile__( \
6117+ " .set "MIPS_ISA_LEVEL" \n" \
6118+ "1: lld %0, %1 # atomic64_" #op #suffix "\n" \
6119+ "2: " #asm_op " %0, %2 \n" \
6120+ " scd %0, %1 \n" \
6121+ " beqz %0, 1b \n" \
6122+ extable \
6123+ " .set mips0 \n" \
6124+ : "=&r" (temp), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6125+ : "Ir" (i)); \
6126 } else { \
6127 unsigned long flags; \
6128 \
6129 raw_local_irq_save(flags); \
6130- v->counter c_op i; \
6131+ __asm__ __volatile__( \
6132+ "2: " #asm_op " %0, %1 \n" \
6133+ extable \
6134+ : "+" GCC_OFF_SMALL_ASM() (v->counter) : "Ir" (i)); \
6135 raw_local_irq_restore(flags); \
6136 } \
6137 }
6138
6139-#define ATOMIC64_OP_RETURN(op, c_op, asm_op) \
6140-static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6141+#define ATOMIC64_OP(op, asm_op) __ATOMIC64_OP(op, _unchecked, asm_op##u, ) \
6142+ __ATOMIC64_OP(op, , asm_op, __OVERFLOW_EXTABLE)
6143+
6144+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op, extable) \
6145+static inline long atomic64_##op##_return##suffix(long i, atomic64##suffix##_t * v)\
6146 { \
6147 long result; \
6148 \
6149@@ -368,12 +494,15 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6150 long temp; \
6151 \
6152 __asm__ __volatile__( \
6153- " .set arch=r4000 \n" \
6154+ " .set mips3 \n" \
6155 "1: lld %1, %2 # atomic64_" #op "_return\n" \
6156- " " #asm_op " %0, %1, %3 \n" \
6157+ "2: " #asm_op " %0, %1, %3 \n" \
6158 " scd %0, %2 \n" \
6159 " beqzl %0, 1b \n" \
6160- " " #asm_op " %0, %1, %3 \n" \
6161+ post_op \
6162+ extable \
6163+ "4: " #asm_op " %0, %1, %3 \n" \
6164+ "5: \n" \
6165 " .set mips0 \n" \
6166 : "=&r" (result), "=&r" (temp), \
6167 "+" GCC_OFF_SMALL_ASM() (v->counter) \
6168@@ -381,27 +510,35 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6169 } else if (kernel_uses_llsc) { \
6170 long temp; \
6171 \
6172- do { \
6173- __asm__ __volatile__( \
6174- " .set "MIPS_ISA_LEVEL" \n" \
6175- " lld %1, %2 # atomic64_" #op "_return\n" \
6176- " " #asm_op " %0, %1, %3 \n" \
6177- " scd %0, %2 \n" \
6178- " .set mips0 \n" \
6179- : "=&r" (result), "=&r" (temp), \
6180- "=" GCC_OFF_SMALL_ASM() (v->counter) \
6181- : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6182- : "memory"); \
6183- } while (unlikely(!result)); \
6184+ __asm__ __volatile__( \
6185+ " .set "MIPS_ISA_LEVEL" \n" \
6186+ "1: lld %1, %2 # atomic64_" #op "_return" #suffix "\n"\
6187+ "2: " #asm_op " %0, %1, %3 \n" \
6188+ " scd %0, %2 \n" \
6189+ " beqz %0, 1b \n" \
6190+ post_op \
6191+ extable \
6192+ "4: " #asm_op " %0, %1, %3 \n" \
6193+ "5: \n" \
6194+ " .set mips0 \n" \
6195+ : "=&r" (result), "=&r" (temp), \
6196+ "=" GCC_OFF_SMALL_ASM() (v->counter) \
6197+ : "Ir" (i), GCC_OFF_SMALL_ASM() (v->counter) \
6198+ : "memory"); \
6199 \
6200 result = temp; result c_op i; \
6201 } else { \
6202 unsigned long flags; \
6203 \
6204 raw_local_irq_save(flags); \
6205- result = v->counter; \
6206- result c_op i; \
6207- v->counter = result; \
6208+ __asm__ __volatile__( \
6209+ " ld %0, %1 \n" \
6210+ "2: " #asm_op " %0, %1, %2 \n" \
6211+ " sd %0, %1 \n" \
6212+ "3: \n" \
6213+ extable \
6214+ : "=&r" (result), "+" GCC_OFF_SMALL_ASM() (v->counter) \
6215+ : "Ir" (i)); \
6216 raw_local_irq_restore(flags); \
6217 } \
6218 \
6219@@ -410,16 +547,23 @@ static __inline__ long atomic64_##op##_return(long i, atomic64_t * v) \
6220 return result; \
6221 }
6222
6223-#define ATOMIC64_OPS(op, c_op, asm_op) \
6224- ATOMIC64_OP(op, c_op, asm_op) \
6225- ATOMIC64_OP_RETURN(op, c_op, asm_op)
6226+#define ATOMIC64_OP_RETURN(op, asm_op) __ATOMIC64_OP_RETURN(op, _unchecked, asm_op##u, , ) \
6227+ __ATOMIC64_OP_RETURN(op, , asm_op, __OVERFLOW_POST, __OVERFLOW_EXTABLE)
6228
6229-ATOMIC64_OPS(add, +=, daddu)
6230-ATOMIC64_OPS(sub, -=, dsubu)
6231+#define ATOMIC64_OPS(op, asm_op) \
6232+ ATOMIC64_OP(op, asm_op) \
6233+ ATOMIC64_OP_RETURN(op, asm_op)
6234+
6235+ATOMIC64_OPS(add, dadd)
6236+ATOMIC64_OPS(sub, dsub)
6237
6238 #undef ATOMIC64_OPS
6239 #undef ATOMIC64_OP_RETURN
6240+#undef __ATOMIC64_OP_RETURN
6241 #undef ATOMIC64_OP
6242+#undef __ATOMIC64_OP
6243+#undef __OVERFLOW_EXTABLE
6244+#undef __OVERFLOW_POST
6245
6246 /*
6247 * atomic64_sub_if_positive - conditionally subtract integer from atomic
6248@@ -430,7 +574,7 @@ ATOMIC64_OPS(sub, -=, dsubu)
6249 * Atomically test @v and subtract @i if @v is greater or equal than @i.
6250 * The function returns the old value of @v minus @i.
6251 */
6252-static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6253+static __inline__ long atomic64_sub_if_positive(long i, atomic64_t *v)
6254 {
6255 long result;
6256
6257@@ -440,7 +584,7 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6258 long temp;
6259
6260 __asm__ __volatile__(
6261- " .set arch=r4000 \n"
6262+ " .set "MIPS_ISA_LEVEL" \n"
6263 "1: lld %1, %2 # atomic64_sub_if_positive\n"
6264 " dsubu %0, %1, %3 \n"
6265 " bltz %0, 1f \n"
6266@@ -489,9 +633,26 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
6267 return result;
6268 }
6269
6270-#define atomic64_cmpxchg(v, o, n) \
6271- ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
6272-#define atomic64_xchg(v, new) (xchg(&((v)->counter), (new)))
6273+static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
6274+{
6275+ return cmpxchg(&v->counter, old, new);
6276+}
6277+
6278+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old,
6279+ long new)
6280+{
6281+ return cmpxchg(&(v->counter), old, new);
6282+}
6283+
6284+static inline long atomic64_xchg(atomic64_t *v, long new)
6285+{
6286+ return xchg(&v->counter, new);
6287+}
6288+
6289+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
6290+{
6291+ return xchg(&(v->counter), new);
6292+}
6293
6294 /**
6295 * atomic64_add_unless - add unless the number is a given value
6296@@ -521,6 +682,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6297
6298 #define atomic64_dec_return(v) atomic64_sub_return(1, (v))
6299 #define atomic64_inc_return(v) atomic64_add_return(1, (v))
6300+#define atomic64_inc_return_unchecked(v) atomic64_add_return_unchecked(1, (v))
6301
6302 /*
6303 * atomic64_sub_and_test - subtract value from variable and test result
6304@@ -542,6 +704,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6305 * other cases.
6306 */
6307 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
6308+#define atomic64_inc_and_test_unchecked(v) atomic64_add_return_unchecked(1, (v)) == 0)
6309
6310 /*
6311 * atomic64_dec_and_test - decrement by 1 and test
6312@@ -566,6 +729,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6313 * Atomically increments @v by 1.
6314 */
6315 #define atomic64_inc(v) atomic64_add(1, (v))
6316+#define atomic64_inc_unchecked(v) atomic64_add_unchecked(1, (v))
6317
6318 /*
6319 * atomic64_dec - decrement and test
6320@@ -574,6 +738,7 @@ static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
6321 * Atomically decrements @v by 1.
6322 */
6323 #define atomic64_dec(v) atomic64_sub(1, (v))
6324+#define atomic64_dec_unchecked(v) atomic64_sub_unchecked(1, (v))
6325
6326 /*
6327 * atomic64_add_negative - add and test if negative
6328diff --git a/arch/mips/include/asm/barrier.h b/arch/mips/include/asm/barrier.h
6329index 2b8bbbc..4556df6 100644
6330--- a/arch/mips/include/asm/barrier.h
6331+++ b/arch/mips/include/asm/barrier.h
6332@@ -133,7 +133,7 @@
6333 do { \
6334 compiletime_assert_atomic_type(*p); \
6335 smp_mb(); \
6336- ACCESS_ONCE(*p) = (v); \
6337+ ACCESS_ONCE_RW(*p) = (v); \
6338 } while (0)
6339
6340 #define smp_load_acquire(p) \
6341diff --git a/arch/mips/include/asm/cache.h b/arch/mips/include/asm/cache.h
6342index b4db69f..8f3b093 100644
6343--- a/arch/mips/include/asm/cache.h
6344+++ b/arch/mips/include/asm/cache.h
6345@@ -9,10 +9,11 @@
6346 #ifndef _ASM_CACHE_H
6347 #define _ASM_CACHE_H
6348
6349+#include <linux/const.h>
6350 #include <kmalloc.h>
6351
6352 #define L1_CACHE_SHIFT CONFIG_MIPS_L1_CACHE_SHIFT
6353-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6354+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
6355
6356 #define SMP_CACHE_SHIFT L1_CACHE_SHIFT
6357 #define SMP_CACHE_BYTES L1_CACHE_BYTES
6358diff --git a/arch/mips/include/asm/elf.h b/arch/mips/include/asm/elf.h
6359index 535f196..2ab029e 100644
6360--- a/arch/mips/include/asm/elf.h
6361+++ b/arch/mips/include/asm/elf.h
6362@@ -405,15 +405,18 @@ extern const char *__elf_platform;
6363 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
6364 #endif
6365
6366+#ifdef CONFIG_PAX_ASLR
6367+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6368+
6369+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6370+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6371+#endif
6372+
6373 #define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1
6374 struct linux_binprm;
6375 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
6376 int uses_interp);
6377
6378-struct mm_struct;
6379-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
6380-#define arch_randomize_brk arch_randomize_brk
6381-
6382 struct arch_elf_state {
6383 int fp_abi;
6384 int interp_fp_abi;
6385diff --git a/arch/mips/include/asm/exec.h b/arch/mips/include/asm/exec.h
6386index c1f6afa..38cc6e9 100644
6387--- a/arch/mips/include/asm/exec.h
6388+++ b/arch/mips/include/asm/exec.h
6389@@ -12,6 +12,6 @@
6390 #ifndef _ASM_EXEC_H
6391 #define _ASM_EXEC_H
6392
6393-extern unsigned long arch_align_stack(unsigned long sp);
6394+#define arch_align_stack(x) ((x) & ~0xfUL)
6395
6396 #endif /* _ASM_EXEC_H */
6397diff --git a/arch/mips/include/asm/hw_irq.h b/arch/mips/include/asm/hw_irq.h
6398index 9e8ef59..1139d6b 100644
6399--- a/arch/mips/include/asm/hw_irq.h
6400+++ b/arch/mips/include/asm/hw_irq.h
6401@@ -10,7 +10,7 @@
6402
6403 #include <linux/atomic.h>
6404
6405-extern atomic_t irq_err_count;
6406+extern atomic_unchecked_t irq_err_count;
6407
6408 /*
6409 * interrupt-retrigger: NOP for now. This may not be appropriate for all
6410diff --git a/arch/mips/include/asm/local.h b/arch/mips/include/asm/local.h
6411index 8feaed6..1bd8a64 100644
6412--- a/arch/mips/include/asm/local.h
6413+++ b/arch/mips/include/asm/local.h
6414@@ -13,15 +13,25 @@ typedef struct
6415 atomic_long_t a;
6416 } local_t;
6417
6418+typedef struct {
6419+ atomic_long_unchecked_t a;
6420+} local_unchecked_t;
6421+
6422 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
6423
6424 #define local_read(l) atomic_long_read(&(l)->a)
6425+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
6426 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
6427+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
6428
6429 #define local_add(i, l) atomic_long_add((i), (&(l)->a))
6430+#define local_add_unchecked(i, l) atomic_long_add_unchecked((i), (&(l)->a))
6431 #define local_sub(i, l) atomic_long_sub((i), (&(l)->a))
6432+#define local_sub_unchecked(i, l) atomic_long_sub_unchecked((i), (&(l)->a))
6433 #define local_inc(l) atomic_long_inc(&(l)->a)
6434+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
6435 #define local_dec(l) atomic_long_dec(&(l)->a)
6436+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
6437
6438 /*
6439 * Same as above, but return the result value
6440@@ -71,6 +81,51 @@ static __inline__ long local_add_return(long i, local_t * l)
6441 return result;
6442 }
6443
6444+static __inline__ long local_add_return_unchecked(long i, local_unchecked_t * l)
6445+{
6446+ unsigned long result;
6447+
6448+ if (kernel_uses_llsc && R10000_LLSC_WAR) {
6449+ unsigned long temp;
6450+
6451+ __asm__ __volatile__(
6452+ " .set mips3 \n"
6453+ "1:" __LL "%1, %2 # local_add_return \n"
6454+ " addu %0, %1, %3 \n"
6455+ __SC "%0, %2 \n"
6456+ " beqzl %0, 1b \n"
6457+ " addu %0, %1, %3 \n"
6458+ " .set mips0 \n"
6459+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6460+ : "Ir" (i), "m" (l->a.counter)
6461+ : "memory");
6462+ } else if (kernel_uses_llsc) {
6463+ unsigned long temp;
6464+
6465+ __asm__ __volatile__(
6466+ " .set mips3 \n"
6467+ "1:" __LL "%1, %2 # local_add_return \n"
6468+ " addu %0, %1, %3 \n"
6469+ __SC "%0, %2 \n"
6470+ " beqz %0, 1b \n"
6471+ " addu %0, %1, %3 \n"
6472+ " .set mips0 \n"
6473+ : "=&r" (result), "=&r" (temp), "=m" (l->a.counter)
6474+ : "Ir" (i), "m" (l->a.counter)
6475+ : "memory");
6476+ } else {
6477+ unsigned long flags;
6478+
6479+ local_irq_save(flags);
6480+ result = l->a.counter;
6481+ result += i;
6482+ l->a.counter = result;
6483+ local_irq_restore(flags);
6484+ }
6485+
6486+ return result;
6487+}
6488+
6489 static __inline__ long local_sub_return(long i, local_t * l)
6490 {
6491 unsigned long result;
6492@@ -118,6 +173,8 @@ static __inline__ long local_sub_return(long i, local_t * l)
6493
6494 #define local_cmpxchg(l, o, n) \
6495 ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6496+#define local_cmpxchg_unchecked(l, o, n) \
6497+ ((long)cmpxchg_local(&((l)->a.counter), (o), (n)))
6498 #define local_xchg(l, n) (atomic_long_xchg((&(l)->a), (n)))
6499
6500 /**
6501diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
6502index 154b70a..426ae3d 100644
6503--- a/arch/mips/include/asm/page.h
6504+++ b/arch/mips/include/asm/page.h
6505@@ -120,7 +120,7 @@ extern void copy_user_highpage(struct page *to, struct page *from,
6506 #ifdef CONFIG_CPU_MIPS32
6507 typedef struct { unsigned long pte_low, pte_high; } pte_t;
6508 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
6509- #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
6510+ #define __pte(x) ({ pte_t __pte = {(x), (x) >> 32}; __pte; })
6511 #else
6512 typedef struct { unsigned long long pte; } pte_t;
6513 #define pte_val(x) ((x).pte)
6514diff --git a/arch/mips/include/asm/pgalloc.h b/arch/mips/include/asm/pgalloc.h
6515index b336037..5b874cc 100644
6516--- a/arch/mips/include/asm/pgalloc.h
6517+++ b/arch/mips/include/asm/pgalloc.h
6518@@ -37,6 +37,11 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6519 {
6520 set_pud(pud, __pud((unsigned long)pmd));
6521 }
6522+
6523+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
6524+{
6525+ pud_populate(mm, pud, pmd);
6526+}
6527 #endif
6528
6529 /*
6530diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h
6531index bef782c..d99df93 100644
6532--- a/arch/mips/include/asm/pgtable.h
6533+++ b/arch/mips/include/asm/pgtable.h
6534@@ -20,6 +20,9 @@
6535 #include <asm/io.h>
6536 #include <asm/pgtable-bits.h>
6537
6538+#define ktla_ktva(addr) (addr)
6539+#define ktva_ktla(addr) (addr)
6540+
6541 struct mm_struct;
6542 struct vm_area_struct;
6543
6544diff --git a/arch/mips/include/asm/thread_info.h b/arch/mips/include/asm/thread_info.h
6545index 55ed660..3dc9422 100644
6546--- a/arch/mips/include/asm/thread_info.h
6547+++ b/arch/mips/include/asm/thread_info.h
6548@@ -102,6 +102,9 @@ static inline struct thread_info *current_thread_info(void)
6549 #define TIF_SECCOMP 4 /* secure computing */
6550 #define TIF_NOTIFY_RESUME 5 /* callback before returning to user */
6551 #define TIF_RESTORE_SIGMASK 9 /* restore signal mask in do_signal() */
6552+/* li takes a 32bit immediate */
6553+#define TIF_GRSEC_SETXID 10 /* update credentials on syscall entry/exit */
6554+
6555 #define TIF_USEDFPU 16 /* FPU was used by this task this quantum (SMP) */
6556 #define TIF_MEMDIE 18 /* is terminating due to OOM killer */
6557 #define TIF_NOHZ 19 /* in adaptive nohz mode */
6558@@ -137,14 +140,16 @@ static inline struct thread_info *current_thread_info(void)
6559 #define _TIF_USEDMSA (1<<TIF_USEDMSA)
6560 #define _TIF_MSA_CTX_LIVE (1<<TIF_MSA_CTX_LIVE)
6561 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
6562+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
6563
6564 #define _TIF_WORK_SYSCALL_ENTRY (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6565 _TIF_SYSCALL_AUDIT | \
6566- _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP)
6567+ _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
6568+ _TIF_GRSEC_SETXID)
6569
6570 /* work to do in syscall_trace_leave() */
6571 #define _TIF_WORK_SYSCALL_EXIT (_TIF_NOHZ | _TIF_SYSCALL_TRACE | \
6572- _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT)
6573+ _TIF_SYSCALL_AUDIT | _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6574
6575 /* work to do on interrupt/exception return */
6576 #define _TIF_WORK_MASK \
6577@@ -152,7 +157,7 @@ static inline struct thread_info *current_thread_info(void)
6578 /* work to do on any return to u-space */
6579 #define _TIF_ALLWORK_MASK (_TIF_NOHZ | _TIF_WORK_MASK | \
6580 _TIF_WORK_SYSCALL_EXIT | \
6581- _TIF_SYSCALL_TRACEPOINT)
6582+ _TIF_SYSCALL_TRACEPOINT | _TIF_GRSEC_SETXID)
6583
6584 /*
6585 * We stash processor id into a COP0 register to retrieve it fast
6586diff --git a/arch/mips/include/asm/uaccess.h b/arch/mips/include/asm/uaccess.h
6587index bf8b324..cec5705 100644
6588--- a/arch/mips/include/asm/uaccess.h
6589+++ b/arch/mips/include/asm/uaccess.h
6590@@ -130,6 +130,7 @@ extern u64 __ua_limit;
6591 __ok == 0; \
6592 })
6593
6594+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
6595 #define access_ok(type, addr, size) \
6596 likely(__access_ok((addr), (size), __access_mask))
6597
6598diff --git a/arch/mips/kernel/binfmt_elfn32.c b/arch/mips/kernel/binfmt_elfn32.c
6599index 1188e00..41cf144 100644
6600--- a/arch/mips/kernel/binfmt_elfn32.c
6601+++ b/arch/mips/kernel/binfmt_elfn32.c
6602@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6603 #undef ELF_ET_DYN_BASE
6604 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6605
6606+#ifdef CONFIG_PAX_ASLR
6607+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6608+
6609+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6610+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6611+#endif
6612+
6613 #include <asm/processor.h>
6614 #include <linux/module.h>
6615 #include <linux/elfcore.h>
6616diff --git a/arch/mips/kernel/binfmt_elfo32.c b/arch/mips/kernel/binfmt_elfo32.c
6617index 9287678..f870e47 100644
6618--- a/arch/mips/kernel/binfmt_elfo32.c
6619+++ b/arch/mips/kernel/binfmt_elfo32.c
6620@@ -70,6 +70,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_NFPREG];
6621 #undef ELF_ET_DYN_BASE
6622 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2)
6623
6624+#ifdef CONFIG_PAX_ASLR
6625+#define PAX_ELF_ET_DYN_BASE (TASK_IS_32BIT_ADDR ? 0x00400000UL : 0x00400000UL)
6626+
6627+#define PAX_DELTA_MMAP_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6628+#define PAX_DELTA_STACK_LEN (TASK_IS_32BIT_ADDR ? 27-PAGE_SHIFT : 36-PAGE_SHIFT)
6629+#endif
6630+
6631 #include <asm/processor.h>
6632
6633 #include <linux/module.h>
6634diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
6635index a74ec3a..4f06f18 100644
6636--- a/arch/mips/kernel/i8259.c
6637+++ b/arch/mips/kernel/i8259.c
6638@@ -202,7 +202,7 @@ spurious_8259A_irq:
6639 printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
6640 spurious_irq_mask |= irqmask;
6641 }
6642- atomic_inc(&irq_err_count);
6643+ atomic_inc_unchecked(&irq_err_count);
6644 /*
6645 * Theoretically we do not have to handle this IRQ,
6646 * but in Linux this does not cause problems and is
6647diff --git a/arch/mips/kernel/irq-gt641xx.c b/arch/mips/kernel/irq-gt641xx.c
6648index 44a1f79..2bd6aa3 100644
6649--- a/arch/mips/kernel/irq-gt641xx.c
6650+++ b/arch/mips/kernel/irq-gt641xx.c
6651@@ -110,7 +110,7 @@ void gt641xx_irq_dispatch(void)
6652 }
6653 }
6654
6655- atomic_inc(&irq_err_count);
6656+ atomic_inc_unchecked(&irq_err_count);
6657 }
6658
6659 void __init gt641xx_irq_init(void)
6660diff --git a/arch/mips/kernel/irq.c b/arch/mips/kernel/irq.c
6661index d2bfbc2..a8eacd2 100644
6662--- a/arch/mips/kernel/irq.c
6663+++ b/arch/mips/kernel/irq.c
6664@@ -76,17 +76,17 @@ void ack_bad_irq(unsigned int irq)
6665 printk("unexpected IRQ # %d\n", irq);
6666 }
6667
6668-atomic_t irq_err_count;
6669+atomic_unchecked_t irq_err_count;
6670
6671 int arch_show_interrupts(struct seq_file *p, int prec)
6672 {
6673- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
6674+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
6675 return 0;
6676 }
6677
6678 asmlinkage void spurious_interrupt(void)
6679 {
6680- atomic_inc(&irq_err_count);
6681+ atomic_inc_unchecked(&irq_err_count);
6682 }
6683
6684 void __init init_IRQ(void)
6685@@ -109,7 +109,10 @@ void __init init_IRQ(void)
6686 #endif
6687 }
6688
6689+
6690 #ifdef DEBUG_STACKOVERFLOW
6691+extern void gr_handle_kernel_exploit(void);
6692+
6693 static inline void check_stack_overflow(void)
6694 {
6695 unsigned long sp;
6696@@ -125,6 +128,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 226f8ca..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 3391d06..c23a2cc 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 e1ffea2..46ed66e 100644
7421--- a/arch/parisc/kernel/sys_parisc.c
7422+++ b/arch/parisc/kernel/sys_parisc.c
7423@@ -89,6 +89,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@@ -106,6 +107,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@@ -124,6 +129,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@@ -143,6 +149,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@@ -167,6 +174,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@@ -184,6 +195,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@@ -249,6 +261,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..371e85c 100644
9662--- a/arch/s390/mm/mmap.c
9663+++ b/arch/s390/mm/mmap.c
9664@@ -204,9 +204,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9665 */
9666 if (mmap_is_legacy()) {
9667 mm->mmap_base = mmap_base_legacy();
9668+
9669+#ifdef CONFIG_PAX_RANDMMAP
9670+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9671+ mm->mmap_base += mm->delta_mmap;
9672+#endif
9673+
9674 mm->get_unmapped_area = arch_get_unmapped_area;
9675 } else {
9676 mm->mmap_base = mmap_base();
9677+
9678+#ifdef CONFIG_PAX_RANDMMAP
9679+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9680+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9681+#endif
9682+
9683 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
9684 }
9685 }
9686@@ -279,9 +291,21 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
9687 */
9688 if (mmap_is_legacy()) {
9689 mm->mmap_base = mmap_base_legacy();
9690+
9691+#ifdef CONFIG_PAX_RANDMMAP
9692+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9693+ mm->mmap_base += mm->delta_mmap;
9694+#endif
9695+
9696 mm->get_unmapped_area = s390_get_unmapped_area;
9697 } else {
9698 mm->mmap_base = mmap_base();
9699+
9700+#ifdef CONFIG_PAX_RANDMMAP
9701+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9702+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
9703+#endif
9704+
9705 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
9706 }
9707 }
9708diff --git a/arch/score/include/asm/cache.h b/arch/score/include/asm/cache.h
9709index ae3d59f..f65f075 100644
9710--- a/arch/score/include/asm/cache.h
9711+++ b/arch/score/include/asm/cache.h
9712@@ -1,7 +1,9 @@
9713 #ifndef _ASM_SCORE_CACHE_H
9714 #define _ASM_SCORE_CACHE_H
9715
9716+#include <linux/const.h>
9717+
9718 #define L1_CACHE_SHIFT 4
9719-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9720+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9721
9722 #endif /* _ASM_SCORE_CACHE_H */
9723diff --git a/arch/score/include/asm/exec.h b/arch/score/include/asm/exec.h
9724index f9f3cd5..58ff438 100644
9725--- a/arch/score/include/asm/exec.h
9726+++ b/arch/score/include/asm/exec.h
9727@@ -1,6 +1,6 @@
9728 #ifndef _ASM_SCORE_EXEC_H
9729 #define _ASM_SCORE_EXEC_H
9730
9731-extern unsigned long arch_align_stack(unsigned long sp);
9732+#define arch_align_stack(x) (x)
9733
9734 #endif /* _ASM_SCORE_EXEC_H */
9735diff --git a/arch/score/kernel/process.c b/arch/score/kernel/process.c
9736index a1519ad3..e8ac1ff 100644
9737--- a/arch/score/kernel/process.c
9738+++ b/arch/score/kernel/process.c
9739@@ -116,8 +116,3 @@ unsigned long get_wchan(struct task_struct *task)
9740
9741 return task_pt_regs(task)->cp0_epc;
9742 }
9743-
9744-unsigned long arch_align_stack(unsigned long sp)
9745-{
9746- return sp;
9747-}
9748diff --git a/arch/sh/include/asm/cache.h b/arch/sh/include/asm/cache.h
9749index ef9e555..331bd29 100644
9750--- a/arch/sh/include/asm/cache.h
9751+++ b/arch/sh/include/asm/cache.h
9752@@ -9,10 +9,11 @@
9753 #define __ASM_SH_CACHE_H
9754 #ifdef __KERNEL__
9755
9756+#include <linux/const.h>
9757 #include <linux/init.h>
9758 #include <cpu/cache.h>
9759
9760-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
9761+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
9762
9763 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
9764
9765diff --git a/arch/sh/mm/mmap.c b/arch/sh/mm/mmap.c
9766index 6777177..cb5e44f 100644
9767--- a/arch/sh/mm/mmap.c
9768+++ b/arch/sh/mm/mmap.c
9769@@ -36,6 +36,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9770 struct mm_struct *mm = current->mm;
9771 struct vm_area_struct *vma;
9772 int do_colour_align;
9773+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9774 struct vm_unmapped_area_info info;
9775
9776 if (flags & MAP_FIXED) {
9777@@ -55,6 +56,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9778 if (filp || (flags & MAP_SHARED))
9779 do_colour_align = 1;
9780
9781+#ifdef CONFIG_PAX_RANDMMAP
9782+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9783+#endif
9784+
9785 if (addr) {
9786 if (do_colour_align)
9787 addr = COLOUR_ALIGN(addr, pgoff);
9788@@ -62,14 +67,13 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
9789 addr = PAGE_ALIGN(addr);
9790
9791 vma = find_vma(mm, addr);
9792- if (TASK_SIZE - len >= addr &&
9793- (!vma || addr + len <= vma->vm_start))
9794+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9795 return addr;
9796 }
9797
9798 info.flags = 0;
9799 info.length = len;
9800- info.low_limit = TASK_UNMAPPED_BASE;
9801+ info.low_limit = mm->mmap_base;
9802 info.high_limit = TASK_SIZE;
9803 info.align_mask = do_colour_align ? (PAGE_MASK & shm_align_mask) : 0;
9804 info.align_offset = pgoff << PAGE_SHIFT;
9805@@ -85,6 +89,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9806 struct mm_struct *mm = current->mm;
9807 unsigned long addr = addr0;
9808 int do_colour_align;
9809+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
9810 struct vm_unmapped_area_info info;
9811
9812 if (flags & MAP_FIXED) {
9813@@ -104,6 +109,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9814 if (filp || (flags & MAP_SHARED))
9815 do_colour_align = 1;
9816
9817+#ifdef CONFIG_PAX_RANDMMAP
9818+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
9819+#endif
9820+
9821 /* requesting a specific address */
9822 if (addr) {
9823 if (do_colour_align)
9824@@ -112,8 +121,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9825 addr = PAGE_ALIGN(addr);
9826
9827 vma = find_vma(mm, addr);
9828- if (TASK_SIZE - len >= addr &&
9829- (!vma || addr + len <= vma->vm_start))
9830+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
9831 return addr;
9832 }
9833
9834@@ -135,6 +143,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
9835 VM_BUG_ON(addr != -ENOMEM);
9836 info.flags = 0;
9837 info.low_limit = TASK_UNMAPPED_BASE;
9838+
9839+#ifdef CONFIG_PAX_RANDMMAP
9840+ if (mm->pax_flags & MF_PAX_RANDMMAP)
9841+ info.low_limit += mm->delta_mmap;
9842+#endif
9843+
9844 info.high_limit = TASK_SIZE;
9845 addr = vm_unmapped_area(&info);
9846 }
9847diff --git a/arch/sparc/include/asm/atomic_64.h b/arch/sparc/include/asm/atomic_64.h
9848index 4082749..fd97781 100644
9849--- a/arch/sparc/include/asm/atomic_64.h
9850+++ b/arch/sparc/include/asm/atomic_64.h
9851@@ -15,18 +15,38 @@
9852 #define ATOMIC64_INIT(i) { (i) }
9853
9854 #define atomic_read(v) ACCESS_ONCE((v)->counter)
9855+static inline int atomic_read_unchecked(const atomic_unchecked_t *v)
9856+{
9857+ return ACCESS_ONCE(v->counter);
9858+}
9859 #define atomic64_read(v) ACCESS_ONCE((v)->counter)
9860+static inline long atomic64_read_unchecked(const atomic64_unchecked_t *v)
9861+{
9862+ return ACCESS_ONCE(v->counter);
9863+}
9864
9865 #define atomic_set(v, i) (((v)->counter) = i)
9866+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
9867+{
9868+ v->counter = i;
9869+}
9870 #define atomic64_set(v, i) (((v)->counter) = i)
9871+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
9872+{
9873+ v->counter = i;
9874+}
9875
9876-#define ATOMIC_OP(op) \
9877-void atomic_##op(int, atomic_t *); \
9878-void atomic64_##op(long, atomic64_t *);
9879+#define __ATOMIC_OP(op, suffix) \
9880+void atomic_##op##suffix(int, atomic##suffix##_t *); \
9881+void atomic64_##op##suffix(long, atomic64##suffix##_t *);
9882
9883-#define ATOMIC_OP_RETURN(op) \
9884-int atomic_##op##_return(int, atomic_t *); \
9885-long atomic64_##op##_return(long, atomic64_t *);
9886+#define ATOMIC_OP(op) __ATOMIC_OP(op, ) __ATOMIC_OP(op, _unchecked)
9887+
9888+#define __ATOMIC_OP_RETURN(op, suffix) \
9889+int atomic_##op##_return##suffix(int, atomic##suffix##_t *); \
9890+long atomic64_##op##_return##suffix(long, atomic64##suffix##_t *);
9891+
9892+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, ) __ATOMIC_OP_RETURN(op, _unchecked)
9893
9894 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
9895
9896@@ -35,13 +55,23 @@ ATOMIC_OPS(sub)
9897
9898 #undef ATOMIC_OPS
9899 #undef ATOMIC_OP_RETURN
9900+#undef __ATOMIC_OP_RETURN
9901 #undef ATOMIC_OP
9902+#undef __ATOMIC_OP
9903
9904 #define atomic_dec_return(v) atomic_sub_return(1, v)
9905 #define atomic64_dec_return(v) atomic64_sub_return(1, v)
9906
9907 #define atomic_inc_return(v) atomic_add_return(1, v)
9908+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
9909+{
9910+ return atomic_add_return_unchecked(1, v);
9911+}
9912 #define atomic64_inc_return(v) atomic64_add_return(1, v)
9913+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
9914+{
9915+ return atomic64_add_return_unchecked(1, v);
9916+}
9917
9918 /*
9919 * atomic_inc_and_test - increment and test
9920@@ -52,6 +82,10 @@ ATOMIC_OPS(sub)
9921 * other cases.
9922 */
9923 #define atomic_inc_and_test(v) (atomic_inc_return(v) == 0)
9924+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
9925+{
9926+ return atomic_inc_return_unchecked(v) == 0;
9927+}
9928 #define atomic64_inc_and_test(v) (atomic64_inc_return(v) == 0)
9929
9930 #define atomic_sub_and_test(i, v) (atomic_sub_return(i, v) == 0)
9931@@ -61,25 +95,60 @@ ATOMIC_OPS(sub)
9932 #define atomic64_dec_and_test(v) (atomic64_sub_return(1, v) == 0)
9933
9934 #define atomic_inc(v) atomic_add(1, v)
9935+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
9936+{
9937+ atomic_add_unchecked(1, v);
9938+}
9939 #define atomic64_inc(v) atomic64_add(1, v)
9940+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
9941+{
9942+ atomic64_add_unchecked(1, v);
9943+}
9944
9945 #define atomic_dec(v) atomic_sub(1, v)
9946+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
9947+{
9948+ atomic_sub_unchecked(1, v);
9949+}
9950 #define atomic64_dec(v) atomic64_sub(1, v)
9951+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
9952+{
9953+ atomic64_sub_unchecked(1, v);
9954+}
9955
9956 #define atomic_add_negative(i, v) (atomic_add_return(i, v) < 0)
9957 #define atomic64_add_negative(i, v) (atomic64_add_return(i, v) < 0)
9958
9959 #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n)))
9960+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
9961+{
9962+ return cmpxchg(&v->counter, old, new);
9963+}
9964 #define atomic_xchg(v, new) (xchg(&((v)->counter), new))
9965+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
9966+{
9967+ return xchg(&v->counter, new);
9968+}
9969
9970 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9971 {
9972- int c, old;
9973+ int c, old, new;
9974 c = atomic_read(v);
9975 for (;;) {
9976- if (unlikely(c == (u)))
9977+ if (unlikely(c == u))
9978 break;
9979- old = atomic_cmpxchg((v), c, c + (a));
9980+
9981+ asm volatile("addcc %2, %0, %0\n"
9982+
9983+#ifdef CONFIG_PAX_REFCOUNT
9984+ "tvs %%icc, 6\n"
9985+#endif
9986+
9987+ : "=r" (new)
9988+ : "0" (c), "ir" (a)
9989+ : "cc");
9990+
9991+ old = atomic_cmpxchg(v, c, new);
9992 if (likely(old == c))
9993 break;
9994 c = old;
9995@@ -90,20 +159,35 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
9996 #define atomic64_cmpxchg(v, o, n) \
9997 ((__typeof__((v)->counter))cmpxchg(&((v)->counter), (o), (n)))
9998 #define atomic64_xchg(v, new) (xchg(&((v)->counter), new))
9999+static inline long atomic64_xchg_unchecked(atomic64_unchecked_t *v, long new)
10000+{
10001+ return xchg(&v->counter, new);
10002+}
10003
10004 static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
10005 {
10006- long c, old;
10007+ long c, old, new;
10008 c = atomic64_read(v);
10009 for (;;) {
10010- if (unlikely(c == (u)))
10011+ if (unlikely(c == u))
10012 break;
10013- old = atomic64_cmpxchg((v), c, c + (a));
10014+
10015+ asm volatile("addcc %2, %0, %0\n"
10016+
10017+#ifdef CONFIG_PAX_REFCOUNT
10018+ "tvs %%xcc, 6\n"
10019+#endif
10020+
10021+ : "=r" (new)
10022+ : "0" (c), "ir" (a)
10023+ : "cc");
10024+
10025+ old = atomic64_cmpxchg(v, c, new);
10026 if (likely(old == c))
10027 break;
10028 c = old;
10029 }
10030- return c != (u);
10031+ return c != u;
10032 }
10033
10034 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
10035diff --git a/arch/sparc/include/asm/barrier_64.h b/arch/sparc/include/asm/barrier_64.h
10036index 7664894..45a974b 100644
10037--- a/arch/sparc/include/asm/barrier_64.h
10038+++ b/arch/sparc/include/asm/barrier_64.h
10039@@ -60,7 +60,7 @@ do { __asm__ __volatile__("ba,pt %%xcc, 1f\n\t" \
10040 do { \
10041 compiletime_assert_atomic_type(*p); \
10042 barrier(); \
10043- ACCESS_ONCE(*p) = (v); \
10044+ ACCESS_ONCE_RW(*p) = (v); \
10045 } while (0)
10046
10047 #define smp_load_acquire(p) \
10048diff --git a/arch/sparc/include/asm/cache.h b/arch/sparc/include/asm/cache.h
10049index 5bb6991..5c2132e 100644
10050--- a/arch/sparc/include/asm/cache.h
10051+++ b/arch/sparc/include/asm/cache.h
10052@@ -7,10 +7,12 @@
10053 #ifndef _SPARC_CACHE_H
10054 #define _SPARC_CACHE_H
10055
10056+#include <linux/const.h>
10057+
10058 #define ARCH_SLAB_MINALIGN __alignof__(unsigned long long)
10059
10060 #define L1_CACHE_SHIFT 5
10061-#define L1_CACHE_BYTES 32
10062+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
10063
10064 #ifdef CONFIG_SPARC32
10065 #define SMP_CACHE_BYTES_SHIFT 5
10066diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
10067index a24e41f..47677ff 100644
10068--- a/arch/sparc/include/asm/elf_32.h
10069+++ b/arch/sparc/include/asm/elf_32.h
10070@@ -114,6 +114,13 @@ typedef struct {
10071
10072 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE)
10073
10074+#ifdef CONFIG_PAX_ASLR
10075+#define PAX_ELF_ET_DYN_BASE 0x10000UL
10076+
10077+#define PAX_DELTA_MMAP_LEN 16
10078+#define PAX_DELTA_STACK_LEN 16
10079+#endif
10080+
10081 /* This yields a mask that user programs can use to figure out what
10082 instruction set this cpu supports. This can NOT be done in userspace
10083 on Sparc. */
10084diff --git a/arch/sparc/include/asm/elf_64.h b/arch/sparc/include/asm/elf_64.h
10085index 370ca1e..d4f4a98 100644
10086--- a/arch/sparc/include/asm/elf_64.h
10087+++ b/arch/sparc/include/asm/elf_64.h
10088@@ -189,6 +189,13 @@ typedef struct {
10089 #define ELF_ET_DYN_BASE 0x0000010000000000UL
10090 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL
10091
10092+#ifdef CONFIG_PAX_ASLR
10093+#define PAX_ELF_ET_DYN_BASE (test_thread_flag(TIF_32BIT) ? 0x10000UL : 0x100000UL)
10094+
10095+#define PAX_DELTA_MMAP_LEN (test_thread_flag(TIF_32BIT) ? 14 : 28)
10096+#define PAX_DELTA_STACK_LEN (test_thread_flag(TIF_32BIT) ? 15 : 29)
10097+#endif
10098+
10099 extern unsigned long sparc64_elf_hwcap;
10100 #define ELF_HWCAP sparc64_elf_hwcap
10101
10102diff --git a/arch/sparc/include/asm/pgalloc_32.h b/arch/sparc/include/asm/pgalloc_32.h
10103index a3890da..f6a408e 100644
10104--- a/arch/sparc/include/asm/pgalloc_32.h
10105+++ b/arch/sparc/include/asm/pgalloc_32.h
10106@@ -35,6 +35,7 @@ static inline void pgd_set(pgd_t * pgdp, pmd_t * pmdp)
10107 }
10108
10109 #define pgd_populate(MM, PGD, PMD) pgd_set(PGD, PMD)
10110+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10111
10112 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm,
10113 unsigned long address)
10114diff --git a/arch/sparc/include/asm/pgalloc_64.h b/arch/sparc/include/asm/pgalloc_64.h
10115index 5e31871..13469c6 100644
10116--- a/arch/sparc/include/asm/pgalloc_64.h
10117+++ b/arch/sparc/include/asm/pgalloc_64.h
10118@@ -21,6 +21,7 @@ static inline void __pgd_populate(pgd_t *pgd, pud_t *pud)
10119 }
10120
10121 #define pgd_populate(MM, PGD, PUD) __pgd_populate(PGD, PUD)
10122+#define pgd_populate_kernel(MM, PGD, PMD) pgd_populate((MM), (PGD), (PMD))
10123
10124 static inline pgd_t *pgd_alloc(struct mm_struct *mm)
10125 {
10126@@ -38,6 +39,7 @@ static inline void __pud_populate(pud_t *pud, pmd_t *pmd)
10127 }
10128
10129 #define pud_populate(MM, PUD, PMD) __pud_populate(PUD, PMD)
10130+#define pud_populate_kernel(MM, PUD, PMD) pud_populate((MM), (PUD), (PMD))
10131
10132 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
10133 {
10134diff --git a/arch/sparc/include/asm/pgtable.h b/arch/sparc/include/asm/pgtable.h
10135index 59ba6f6..4518128 100644
10136--- a/arch/sparc/include/asm/pgtable.h
10137+++ b/arch/sparc/include/asm/pgtable.h
10138@@ -5,4 +5,8 @@
10139 #else
10140 #include <asm/pgtable_32.h>
10141 #endif
10142+
10143+#define ktla_ktva(addr) (addr)
10144+#define ktva_ktla(addr) (addr)
10145+
10146 #endif
10147diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
10148index f06b36a..bca3189 100644
10149--- a/arch/sparc/include/asm/pgtable_32.h
10150+++ b/arch/sparc/include/asm/pgtable_32.h
10151@@ -51,6 +51,9 @@ unsigned long __init bootmem_init(unsigned long *pages_avail);
10152 #define PAGE_SHARED SRMMU_PAGE_SHARED
10153 #define PAGE_COPY SRMMU_PAGE_COPY
10154 #define PAGE_READONLY SRMMU_PAGE_RDONLY
10155+#define PAGE_SHARED_NOEXEC SRMMU_PAGE_SHARED_NOEXEC
10156+#define PAGE_COPY_NOEXEC SRMMU_PAGE_COPY_NOEXEC
10157+#define PAGE_READONLY_NOEXEC SRMMU_PAGE_RDONLY_NOEXEC
10158 #define PAGE_KERNEL SRMMU_PAGE_KERNEL
10159
10160 /* Top-level page directory - dummy used by init-mm.
10161@@ -63,18 +66,18 @@ extern unsigned long ptr_in_current_pgd;
10162
10163 /* xwr */
10164 #define __P000 PAGE_NONE
10165-#define __P001 PAGE_READONLY
10166-#define __P010 PAGE_COPY
10167-#define __P011 PAGE_COPY
10168+#define __P001 PAGE_READONLY_NOEXEC
10169+#define __P010 PAGE_COPY_NOEXEC
10170+#define __P011 PAGE_COPY_NOEXEC
10171 #define __P100 PAGE_READONLY
10172 #define __P101 PAGE_READONLY
10173 #define __P110 PAGE_COPY
10174 #define __P111 PAGE_COPY
10175
10176 #define __S000 PAGE_NONE
10177-#define __S001 PAGE_READONLY
10178-#define __S010 PAGE_SHARED
10179-#define __S011 PAGE_SHARED
10180+#define __S001 PAGE_READONLY_NOEXEC
10181+#define __S010 PAGE_SHARED_NOEXEC
10182+#define __S011 PAGE_SHARED_NOEXEC
10183 #define __S100 PAGE_READONLY
10184 #define __S101 PAGE_READONLY
10185 #define __S110 PAGE_SHARED
10186diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
10187index ae51a11..eadfd03 100644
10188--- a/arch/sparc/include/asm/pgtsrmmu.h
10189+++ b/arch/sparc/include/asm/pgtsrmmu.h
10190@@ -111,6 +111,11 @@
10191 SRMMU_EXEC | SRMMU_REF)
10192 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \
10193 SRMMU_EXEC | SRMMU_REF)
10194+
10195+#define SRMMU_PAGE_SHARED_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_WRITE | SRMMU_REF)
10196+#define SRMMU_PAGE_COPY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10197+#define SRMMU_PAGE_RDONLY_NOEXEC __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_REF)
10198+
10199 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
10200 SRMMU_DIRTY | SRMMU_REF)
10201
10202diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
10203index 29d64b1..4272fe8 100644
10204--- a/arch/sparc/include/asm/setup.h
10205+++ b/arch/sparc/include/asm/setup.h
10206@@ -55,8 +55,8 @@ int handle_ldf_stq(u32 insn, struct pt_regs *regs);
10207 void handle_ld_nf(u32 insn, struct pt_regs *regs);
10208
10209 /* init_64.c */
10210-extern atomic_t dcpage_flushes;
10211-extern atomic_t dcpage_flushes_xcall;
10212+extern atomic_unchecked_t dcpage_flushes;
10213+extern atomic_unchecked_t dcpage_flushes_xcall;
10214
10215 extern int sysctl_tsb_ratio;
10216 #endif
10217diff --git a/arch/sparc/include/asm/spinlock_64.h b/arch/sparc/include/asm/spinlock_64.h
10218index 9689176..63c18ea 100644
10219--- a/arch/sparc/include/asm/spinlock_64.h
10220+++ b/arch/sparc/include/asm/spinlock_64.h
10221@@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(arch_spinlock_t *lock, unsigned long fla
10222
10223 /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
10224
10225-static void inline arch_read_lock(arch_rwlock_t *lock)
10226+static inline void arch_read_lock(arch_rwlock_t *lock)
10227 {
10228 unsigned long tmp1, tmp2;
10229
10230 __asm__ __volatile__ (
10231 "1: ldsw [%2], %0\n"
10232 " brlz,pn %0, 2f\n"
10233-"4: add %0, 1, %1\n"
10234+"4: addcc %0, 1, %1\n"
10235+
10236+#ifdef CONFIG_PAX_REFCOUNT
10237+" tvs %%icc, 6\n"
10238+#endif
10239+
10240 " cas [%2], %0, %1\n"
10241 " cmp %0, %1\n"
10242 " bne,pn %%icc, 1b\n"
10243@@ -112,10 +117,10 @@ static void inline arch_read_lock(arch_rwlock_t *lock)
10244 " .previous"
10245 : "=&r" (tmp1), "=&r" (tmp2)
10246 : "r" (lock)
10247- : "memory");
10248+ : "memory", "cc");
10249 }
10250
10251-static int inline arch_read_trylock(arch_rwlock_t *lock)
10252+static inline int arch_read_trylock(arch_rwlock_t *lock)
10253 {
10254 int tmp1, tmp2;
10255
10256@@ -123,7 +128,12 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10257 "1: ldsw [%2], %0\n"
10258 " brlz,a,pn %0, 2f\n"
10259 " mov 0, %0\n"
10260-" add %0, 1, %1\n"
10261+" addcc %0, 1, %1\n"
10262+
10263+#ifdef CONFIG_PAX_REFCOUNT
10264+" tvs %%icc, 6\n"
10265+#endif
10266+
10267 " cas [%2], %0, %1\n"
10268 " cmp %0, %1\n"
10269 " bne,pn %%icc, 1b\n"
10270@@ -136,13 +146,18 @@ static int inline arch_read_trylock(arch_rwlock_t *lock)
10271 return tmp1;
10272 }
10273
10274-static void inline arch_read_unlock(arch_rwlock_t *lock)
10275+static inline void arch_read_unlock(arch_rwlock_t *lock)
10276 {
10277 unsigned long tmp1, tmp2;
10278
10279 __asm__ __volatile__(
10280 "1: lduw [%2], %0\n"
10281-" sub %0, 1, %1\n"
10282+" subcc %0, 1, %1\n"
10283+
10284+#ifdef CONFIG_PAX_REFCOUNT
10285+" tvs %%icc, 6\n"
10286+#endif
10287+
10288 " cas [%2], %0, %1\n"
10289 " cmp %0, %1\n"
10290 " bne,pn %%xcc, 1b\n"
10291@@ -152,7 +167,7 @@ static void inline arch_read_unlock(arch_rwlock_t *lock)
10292 : "memory");
10293 }
10294
10295-static void inline arch_write_lock(arch_rwlock_t *lock)
10296+static inline void arch_write_lock(arch_rwlock_t *lock)
10297 {
10298 unsigned long mask, tmp1, tmp2;
10299
10300@@ -177,7 +192,7 @@ static void inline arch_write_lock(arch_rwlock_t *lock)
10301 : "memory");
10302 }
10303
10304-static void inline arch_write_unlock(arch_rwlock_t *lock)
10305+static inline void arch_write_unlock(arch_rwlock_t *lock)
10306 {
10307 __asm__ __volatile__(
10308 " stw %%g0, [%0]"
10309@@ -186,7 +201,7 @@ static void inline arch_write_unlock(arch_rwlock_t *lock)
10310 : "memory");
10311 }
10312
10313-static int inline arch_write_trylock(arch_rwlock_t *lock)
10314+static inline int arch_write_trylock(arch_rwlock_t *lock)
10315 {
10316 unsigned long mask, tmp1, tmp2, result;
10317
10318diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
10319index fd7bd0a..2e2fa7a 100644
10320--- a/arch/sparc/include/asm/thread_info_32.h
10321+++ b/arch/sparc/include/asm/thread_info_32.h
10322@@ -47,6 +47,7 @@ struct thread_info {
10323 struct reg_window32 reg_window[NSWINS]; /* align for ldd! */
10324 unsigned long rwbuf_stkptrs[NSWINS];
10325 unsigned long w_saved;
10326+ unsigned long lowest_stack;
10327 };
10328
10329 /*
10330diff --git a/arch/sparc/include/asm/thread_info_64.h b/arch/sparc/include/asm/thread_info_64.h
10331index ff45516..73001ab 100644
10332--- a/arch/sparc/include/asm/thread_info_64.h
10333+++ b/arch/sparc/include/asm/thread_info_64.h
10334@@ -61,6 +61,8 @@ struct thread_info {
10335 struct pt_regs *kern_una_regs;
10336 unsigned int kern_una_insn;
10337
10338+ unsigned long lowest_stack;
10339+
10340 unsigned long fpregs[(7 * 256) / sizeof(unsigned long)]
10341 __attribute__ ((aligned(64)));
10342 };
10343@@ -184,12 +186,13 @@ register struct thread_info *current_thread_info_reg asm("g6");
10344 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
10345 /* flag bit 4 is available */
10346 #define TIF_UNALIGNED 5 /* allowed to do unaligned accesses */
10347-/* flag bit 6 is available */
10348+#define TIF_GRSEC_SETXID 6 /* update credentials on syscall entry/exit */
10349 #define TIF_32BIT 7 /* 32-bit binary */
10350 #define TIF_NOHZ 8 /* in adaptive nohz mode */
10351 #define TIF_SECCOMP 9 /* secure computing */
10352 #define TIF_SYSCALL_AUDIT 10 /* syscall auditing active */
10353 #define TIF_SYSCALL_TRACEPOINT 11 /* syscall tracepoint instrumentation */
10354+
10355 /* NOTE: Thread flags >= 12 should be ones we have no interest
10356 * in using in assembly, else we can't use the mask as
10357 * an immediate value in instructions such as andcc.
10358@@ -209,12 +212,17 @@ register struct thread_info *current_thread_info_reg asm("g6");
10359 #define _TIF_SYSCALL_AUDIT (1<<TIF_SYSCALL_AUDIT)
10360 #define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
10361 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
10362+#define _TIF_GRSEC_SETXID (1<<TIF_GRSEC_SETXID)
10363
10364 #define _TIF_USER_WORK_MASK ((0xff << TI_FLAG_WSAVED_SHIFT) | \
10365 _TIF_DO_NOTIFY_RESUME_MASK | \
10366 _TIF_NEED_RESCHED)
10367 #define _TIF_DO_NOTIFY_RESUME_MASK (_TIF_NOTIFY_RESUME | _TIF_SIGPENDING)
10368
10369+#define _TIF_WORK_SYSCALL \
10370+ (_TIF_SYSCALL_TRACE | _TIF_SECCOMP | _TIF_SYSCALL_AUDIT | \
10371+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
10372+
10373 #define is_32bit_task() (test_thread_flag(TIF_32BIT))
10374
10375 /*
10376diff --git a/arch/sparc/include/asm/uaccess.h b/arch/sparc/include/asm/uaccess.h
10377index bd56c28..4b63d83 100644
10378--- a/arch/sparc/include/asm/uaccess.h
10379+++ b/arch/sparc/include/asm/uaccess.h
10380@@ -1,5 +1,6 @@
10381 #ifndef ___ASM_SPARC_UACCESS_H
10382 #define ___ASM_SPARC_UACCESS_H
10383+
10384 #if defined(__sparc__) && defined(__arch64__)
10385 #include <asm/uaccess_64.h>
10386 #else
10387diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h
10388index 64ee103..388aef0 100644
10389--- a/arch/sparc/include/asm/uaccess_32.h
10390+++ b/arch/sparc/include/asm/uaccess_32.h
10391@@ -47,6 +47,7 @@
10392 #define __user_ok(addr, size) ({ (void)(size); (addr) < STACK_TOP; })
10393 #define __kernel_ok (segment_eq(get_fs(), KERNEL_DS))
10394 #define __access_ok(addr, size) (__user_ok((addr) & get_fs().seg, (size)))
10395+#define access_ok_noprefault(type, addr, size) access_ok((type), (addr), (size))
10396 #define access_ok(type, addr, size) \
10397 ({ (void)(type); __access_ok((unsigned long)(addr), size); })
10398
10399@@ -313,27 +314,46 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon
10400
10401 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
10402 {
10403- if (n && __access_ok((unsigned long) to, n))
10404+ if ((long)n < 0)
10405+ return n;
10406+
10407+ if (n && __access_ok((unsigned long) to, n)) {
10408+ if (!__builtin_constant_p(n))
10409+ check_object_size(from, n, true);
10410 return __copy_user(to, (__force void __user *) from, n);
10411- else
10412+ } else
10413 return n;
10414 }
10415
10416 static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n)
10417 {
10418+ if ((long)n < 0)
10419+ return n;
10420+
10421+ if (!__builtin_constant_p(n))
10422+ check_object_size(from, n, true);
10423+
10424 return __copy_user(to, (__force void __user *) from, n);
10425 }
10426
10427 static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n)
10428 {
10429- if (n && __access_ok((unsigned long) from, n))
10430+ if ((long)n < 0)
10431+ return n;
10432+
10433+ if (n && __access_ok((unsigned long) from, n)) {
10434+ if (!__builtin_constant_p(n))
10435+ check_object_size(to, n, false);
10436 return __copy_user((__force void __user *) to, from, n);
10437- else
10438+ } else
10439 return n;
10440 }
10441
10442 static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n)
10443 {
10444+ if ((long)n < 0)
10445+ return n;
10446+
10447 return __copy_user((__force void __user *) to, from, n);
10448 }
10449
10450diff --git a/arch/sparc/include/asm/uaccess_64.h b/arch/sparc/include/asm/uaccess_64.h
10451index a35194b..47dabc0d 100644
10452--- a/arch/sparc/include/asm/uaccess_64.h
10453+++ b/arch/sparc/include/asm/uaccess_64.h
10454@@ -10,6 +10,7 @@
10455 #include <linux/compiler.h>
10456 #include <linux/string.h>
10457 #include <linux/thread_info.h>
10458+#include <linux/kernel.h>
10459 #include <asm/asi.h>
10460 #include <asm/spitfire.h>
10461 #include <asm-generic/uaccess-unaligned.h>
10462@@ -54,6 +55,11 @@ static inline int __access_ok(const void __user * addr, unsigned long size)
10463 return 1;
10464 }
10465
10466+static inline int access_ok_noprefault(int type, const void __user * addr, unsigned long size)
10467+{
10468+ return 1;
10469+}
10470+
10471 static inline int access_ok(int type, const void __user * addr, unsigned long size)
10472 {
10473 return 1;
10474@@ -228,8 +234,15 @@ unsigned long copy_from_user_fixup(void *to, const void __user *from,
10475 static inline unsigned long __must_check
10476 copy_from_user(void *to, const void __user *from, unsigned long size)
10477 {
10478- unsigned long ret = ___copy_from_user(to, from, size);
10479+ unsigned long ret;
10480
10481+ if ((long)size < 0 || size > INT_MAX)
10482+ return size;
10483+
10484+ if (!__builtin_constant_p(size))
10485+ check_object_size(to, size, false);
10486+
10487+ ret = ___copy_from_user(to, from, size);
10488 if (unlikely(ret))
10489 ret = copy_from_user_fixup(to, from, size);
10490
10491@@ -245,8 +258,15 @@ unsigned long copy_to_user_fixup(void __user *to, const void *from,
10492 static inline unsigned long __must_check
10493 copy_to_user(void __user *to, const void *from, unsigned long size)
10494 {
10495- unsigned long ret = ___copy_to_user(to, from, size);
10496+ unsigned long ret;
10497
10498+ if ((long)size < 0 || size > INT_MAX)
10499+ return size;
10500+
10501+ if (!__builtin_constant_p(size))
10502+ check_object_size(from, size, true);
10503+
10504+ ret = ___copy_to_user(to, from, size);
10505 if (unlikely(ret))
10506 ret = copy_to_user_fixup(to, from, size);
10507 return ret;
10508diff --git a/arch/sparc/kernel/Makefile b/arch/sparc/kernel/Makefile
10509index 7cf9c6e..6206648 100644
10510--- a/arch/sparc/kernel/Makefile
10511+++ b/arch/sparc/kernel/Makefile
10512@@ -4,7 +4,7 @@
10513 #
10514
10515 asflags-y := -ansi
10516-ccflags-y := -Werror
10517+#ccflags-y := -Werror
10518
10519 extra-y := head_$(BITS).o
10520
10521diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
10522index 50e7b62..79fae35 100644
10523--- a/arch/sparc/kernel/process_32.c
10524+++ b/arch/sparc/kernel/process_32.c
10525@@ -123,14 +123,14 @@ void show_regs(struct pt_regs *r)
10526
10527 printk("PSR: %08lx PC: %08lx NPC: %08lx Y: %08lx %s\n",
10528 r->psr, r->pc, r->npc, r->y, print_tainted());
10529- printk("PC: <%pS>\n", (void *) r->pc);
10530+ printk("PC: <%pA>\n", (void *) r->pc);
10531 printk("%%G: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10532 r->u_regs[0], r->u_regs[1], r->u_regs[2], r->u_regs[3],
10533 r->u_regs[4], r->u_regs[5], r->u_regs[6], r->u_regs[7]);
10534 printk("%%O: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10535 r->u_regs[8], r->u_regs[9], r->u_regs[10], r->u_regs[11],
10536 r->u_regs[12], r->u_regs[13], r->u_regs[14], r->u_regs[15]);
10537- printk("RPC: <%pS>\n", (void *) r->u_regs[15]);
10538+ printk("RPC: <%pA>\n", (void *) r->u_regs[15]);
10539
10540 printk("%%L: %08lx %08lx %08lx %08lx %08lx %08lx %08lx %08lx\n",
10541 rw->locals[0], rw->locals[1], rw->locals[2], rw->locals[3],
10542@@ -167,7 +167,7 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
10543 rw = (struct reg_window32 *) fp;
10544 pc = rw->ins[7];
10545 printk("[%08lx : ", pc);
10546- printk("%pS ] ", (void *) pc);
10547+ printk("%pA ] ", (void *) pc);
10548 fp = rw->ins[6];
10549 } while (++count < 16);
10550 printk("\n");
10551diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c
10552index 46a5964..a35c62c 100644
10553--- a/arch/sparc/kernel/process_64.c
10554+++ b/arch/sparc/kernel/process_64.c
10555@@ -161,7 +161,7 @@ static void show_regwindow(struct pt_regs *regs)
10556 printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
10557 rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
10558 if (regs->tstate & TSTATE_PRIV)
10559- printk("I7: <%pS>\n", (void *) rwk->ins[7]);
10560+ printk("I7: <%pA>\n", (void *) rwk->ins[7]);
10561 }
10562
10563 void show_regs(struct pt_regs *regs)
10564@@ -170,7 +170,7 @@ void show_regs(struct pt_regs *regs)
10565
10566 printk("TSTATE: %016lx TPC: %016lx TNPC: %016lx Y: %08x %s\n", regs->tstate,
10567 regs->tpc, regs->tnpc, regs->y, print_tainted());
10568- printk("TPC: <%pS>\n", (void *) regs->tpc);
10569+ printk("TPC: <%pA>\n", (void *) regs->tpc);
10570 printk("g0: %016lx g1: %016lx g2: %016lx g3: %016lx\n",
10571 regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
10572 regs->u_regs[3]);
10573@@ -183,7 +183,7 @@ void show_regs(struct pt_regs *regs)
10574 printk("o4: %016lx o5: %016lx sp: %016lx ret_pc: %016lx\n",
10575 regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
10576 regs->u_regs[15]);
10577- printk("RPC: <%pS>\n", (void *) regs->u_regs[15]);
10578+ printk("RPC: <%pA>\n", (void *) regs->u_regs[15]);
10579 show_regwindow(regs);
10580 show_stack(current, (unsigned long *) regs->u_regs[UREG_FP]);
10581 }
10582@@ -278,7 +278,7 @@ void arch_trigger_all_cpu_backtrace(bool include_self)
10583 ((tp && tp->task) ? tp->task->pid : -1));
10584
10585 if (gp->tstate & TSTATE_PRIV) {
10586- printk(" TPC[%pS] O7[%pS] I7[%pS] RPC[%pS]\n",
10587+ printk(" TPC[%pA] O7[%pA] I7[%pA] RPC[%pA]\n",
10588 (void *) gp->tpc,
10589 (void *) gp->o7,
10590 (void *) gp->i7,
10591diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c
10592index 79cc0d1..ec62734 100644
10593--- a/arch/sparc/kernel/prom_common.c
10594+++ b/arch/sparc/kernel/prom_common.c
10595@@ -144,7 +144,7 @@ static int __init prom_common_nextprop(phandle node, char *prev, char *buf)
10596
10597 unsigned int prom_early_allocated __initdata;
10598
10599-static struct of_pdt_ops prom_sparc_ops __initdata = {
10600+static struct of_pdt_ops prom_sparc_ops __initconst = {
10601 .nextprop = prom_common_nextprop,
10602 .getproplen = prom_getproplen,
10603 .getproperty = prom_getproperty,
10604diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
10605index 9ddc492..27a5619 100644
10606--- a/arch/sparc/kernel/ptrace_64.c
10607+++ b/arch/sparc/kernel/ptrace_64.c
10608@@ -1060,6 +1060,10 @@ long arch_ptrace(struct task_struct *child, long request,
10609 return ret;
10610 }
10611
10612+#ifdef CONFIG_GRKERNSEC_SETXID
10613+extern void gr_delayed_cred_worker(void);
10614+#endif
10615+
10616 asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10617 {
10618 int ret = 0;
10619@@ -1070,6 +1074,11 @@ asmlinkage int syscall_trace_enter(struct pt_regs *regs)
10620 if (test_thread_flag(TIF_NOHZ))
10621 user_exit();
10622
10623+#ifdef CONFIG_GRKERNSEC_SETXID
10624+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10625+ gr_delayed_cred_worker();
10626+#endif
10627+
10628 if (test_thread_flag(TIF_SYSCALL_TRACE))
10629 ret = tracehook_report_syscall_entry(regs);
10630
10631@@ -1088,6 +1097,11 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
10632 if (test_thread_flag(TIF_NOHZ))
10633 user_exit();
10634
10635+#ifdef CONFIG_GRKERNSEC_SETXID
10636+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
10637+ gr_delayed_cred_worker();
10638+#endif
10639+
10640 audit_syscall_exit(regs);
10641
10642 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
10643diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
10644index 61139d9..c1a5f28 100644
10645--- a/arch/sparc/kernel/smp_64.c
10646+++ b/arch/sparc/kernel/smp_64.c
10647@@ -887,7 +887,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10648 return;
10649
10650 #ifdef CONFIG_DEBUG_DCFLUSH
10651- atomic_inc(&dcpage_flushes);
10652+ atomic_inc_unchecked(&dcpage_flushes);
10653 #endif
10654
10655 this_cpu = get_cpu();
10656@@ -911,7 +911,7 @@ void smp_flush_dcache_page_impl(struct page *page, int cpu)
10657 xcall_deliver(data0, __pa(pg_addr),
10658 (u64) pg_addr, cpumask_of(cpu));
10659 #ifdef CONFIG_DEBUG_DCFLUSH
10660- atomic_inc(&dcpage_flushes_xcall);
10661+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10662 #endif
10663 }
10664 }
10665@@ -930,7 +930,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10666 preempt_disable();
10667
10668 #ifdef CONFIG_DEBUG_DCFLUSH
10669- atomic_inc(&dcpage_flushes);
10670+ atomic_inc_unchecked(&dcpage_flushes);
10671 #endif
10672 data0 = 0;
10673 pg_addr = page_address(page);
10674@@ -947,7 +947,7 @@ void flush_dcache_page_all(struct mm_struct *mm, struct page *page)
10675 xcall_deliver(data0, __pa(pg_addr),
10676 (u64) pg_addr, cpu_online_mask);
10677 #ifdef CONFIG_DEBUG_DCFLUSH
10678- atomic_inc(&dcpage_flushes_xcall);
10679+ atomic_inc_unchecked(&dcpage_flushes_xcall);
10680 #endif
10681 }
10682 __local_flush_dcache_page(page);
10683diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc_32.c
10684index 646988d..b88905f 100644
10685--- a/arch/sparc/kernel/sys_sparc_32.c
10686+++ b/arch/sparc/kernel/sys_sparc_32.c
10687@@ -54,7 +54,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10688 if (len > TASK_SIZE - PAGE_SIZE)
10689 return -ENOMEM;
10690 if (!addr)
10691- addr = TASK_UNMAPPED_BASE;
10692+ addr = current->mm->mmap_base;
10693
10694 info.flags = 0;
10695 info.length = len;
10696diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc_64.c
10697index 30e7ddb..266a3b0 100644
10698--- a/arch/sparc/kernel/sys_sparc_64.c
10699+++ b/arch/sparc/kernel/sys_sparc_64.c
10700@@ -89,13 +89,14 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10701 struct vm_area_struct * vma;
10702 unsigned long task_size = TASK_SIZE;
10703 int do_color_align;
10704+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10705 struct vm_unmapped_area_info info;
10706
10707 if (flags & MAP_FIXED) {
10708 /* We do not accept a shared mapping if it would violate
10709 * cache aliasing constraints.
10710 */
10711- if ((flags & MAP_SHARED) &&
10712+ if ((filp || (flags & MAP_SHARED)) &&
10713 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10714 return -EINVAL;
10715 return addr;
10716@@ -110,6 +111,10 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10717 if (filp || (flags & MAP_SHARED))
10718 do_color_align = 1;
10719
10720+#ifdef CONFIG_PAX_RANDMMAP
10721+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10722+#endif
10723+
10724 if (addr) {
10725 if (do_color_align)
10726 addr = COLOR_ALIGN(addr, pgoff);
10727@@ -117,22 +122,28 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi
10728 addr = PAGE_ALIGN(addr);
10729
10730 vma = find_vma(mm, addr);
10731- if (task_size - len >= addr &&
10732- (!vma || addr + len <= vma->vm_start))
10733+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10734 return addr;
10735 }
10736
10737 info.flags = 0;
10738 info.length = len;
10739- info.low_limit = TASK_UNMAPPED_BASE;
10740+ info.low_limit = mm->mmap_base;
10741 info.high_limit = min(task_size, VA_EXCLUDE_START);
10742 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10743 info.align_offset = pgoff << PAGE_SHIFT;
10744+ info.threadstack_offset = offset;
10745 addr = vm_unmapped_area(&info);
10746
10747 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
10748 VM_BUG_ON(addr != -ENOMEM);
10749 info.low_limit = VA_EXCLUDE_END;
10750+
10751+#ifdef CONFIG_PAX_RANDMMAP
10752+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10753+ info.low_limit += mm->delta_mmap;
10754+#endif
10755+
10756 info.high_limit = task_size;
10757 addr = vm_unmapped_area(&info);
10758 }
10759@@ -150,6 +161,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10760 unsigned long task_size = STACK_TOP32;
10761 unsigned long addr = addr0;
10762 int do_color_align;
10763+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
10764 struct vm_unmapped_area_info info;
10765
10766 /* This should only ever run for 32-bit processes. */
10767@@ -159,7 +171,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10768 /* We do not accept a shared mapping if it would violate
10769 * cache aliasing constraints.
10770 */
10771- if ((flags & MAP_SHARED) &&
10772+ if ((filp || (flags & MAP_SHARED)) &&
10773 ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1)))
10774 return -EINVAL;
10775 return addr;
10776@@ -172,6 +184,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10777 if (filp || (flags & MAP_SHARED))
10778 do_color_align = 1;
10779
10780+#ifdef CONFIG_PAX_RANDMMAP
10781+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10782+#endif
10783+
10784 /* requesting a specific address */
10785 if (addr) {
10786 if (do_color_align)
10787@@ -180,8 +196,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10788 addr = PAGE_ALIGN(addr);
10789
10790 vma = find_vma(mm, addr);
10791- if (task_size - len >= addr &&
10792- (!vma || addr + len <= vma->vm_start))
10793+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
10794 return addr;
10795 }
10796
10797@@ -191,6 +206,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10798 info.high_limit = mm->mmap_base;
10799 info.align_mask = do_color_align ? (PAGE_MASK & (SHMLBA - 1)) : 0;
10800 info.align_offset = pgoff << PAGE_SHIFT;
10801+ info.threadstack_offset = offset;
10802 addr = vm_unmapped_area(&info);
10803
10804 /*
10805@@ -203,6 +219,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
10806 VM_BUG_ON(addr != -ENOMEM);
10807 info.flags = 0;
10808 info.low_limit = TASK_UNMAPPED_BASE;
10809+
10810+#ifdef CONFIG_PAX_RANDMMAP
10811+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10812+ info.low_limit += mm->delta_mmap;
10813+#endif
10814+
10815 info.high_limit = STACK_TOP32;
10816 addr = vm_unmapped_area(&info);
10817 }
10818@@ -259,10 +281,14 @@ unsigned long get_fb_unmapped_area(struct file *filp, unsigned long orig_addr, u
10819 EXPORT_SYMBOL(get_fb_unmapped_area);
10820
10821 /* Essentially the same as PowerPC. */
10822-static unsigned long mmap_rnd(void)
10823+static unsigned long mmap_rnd(struct mm_struct *mm)
10824 {
10825 unsigned long rnd = 0UL;
10826
10827+#ifdef CONFIG_PAX_RANDMMAP
10828+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
10829+#endif
10830+
10831 if (current->flags & PF_RANDOMIZE) {
10832 unsigned long val = get_random_int();
10833 if (test_thread_flag(TIF_32BIT))
10834@@ -275,7 +301,7 @@ static unsigned long mmap_rnd(void)
10835
10836 void arch_pick_mmap_layout(struct mm_struct *mm)
10837 {
10838- unsigned long random_factor = mmap_rnd();
10839+ unsigned long random_factor = mmap_rnd(mm);
10840 unsigned long gap;
10841
10842 /*
10843@@ -288,6 +314,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10844 gap == RLIM_INFINITY ||
10845 sysctl_legacy_va_layout) {
10846 mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
10847+
10848+#ifdef CONFIG_PAX_RANDMMAP
10849+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10850+ mm->mmap_base += mm->delta_mmap;
10851+#endif
10852+
10853 mm->get_unmapped_area = arch_get_unmapped_area;
10854 } else {
10855 /* We know it's 32-bit */
10856@@ -299,6 +331,12 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
10857 gap = (task_size / 6 * 5);
10858
10859 mm->mmap_base = PAGE_ALIGN(task_size - gap - random_factor);
10860+
10861+#ifdef CONFIG_PAX_RANDMMAP
10862+ if (mm->pax_flags & MF_PAX_RANDMMAP)
10863+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
10864+#endif
10865+
10866 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
10867 }
10868 }
10869diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
10870index bb00089..e0ea580 100644
10871--- a/arch/sparc/kernel/syscalls.S
10872+++ b/arch/sparc/kernel/syscalls.S
10873@@ -62,7 +62,7 @@ sys32_rt_sigreturn:
10874 #endif
10875 .align 32
10876 1: ldx [%g6 + TI_FLAGS], %l5
10877- andcc %l5, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10878+ andcc %l5, _TIF_WORK_SYSCALL, %g0
10879 be,pt %icc, rtrap
10880 nop
10881 call syscall_trace_leave
10882@@ -194,7 +194,7 @@ linux_sparc_syscall32:
10883
10884 srl %i3, 0, %o3 ! IEU0
10885 srl %i2, 0, %o2 ! IEU0 Group
10886- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10887+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10888 bne,pn %icc, linux_syscall_trace32 ! CTI
10889 mov %i0, %l5 ! IEU1
10890 5: call %l7 ! CTI Group brk forced
10891@@ -218,7 +218,7 @@ linux_sparc_syscall:
10892
10893 mov %i3, %o3 ! IEU1
10894 mov %i4, %o4 ! IEU0 Group
10895- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10896+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10897 bne,pn %icc, linux_syscall_trace ! CTI Group
10898 mov %i0, %l5 ! IEU0
10899 2: call %l7 ! CTI Group brk forced
10900@@ -233,7 +233,7 @@ ret_sys_call:
10901
10902 cmp %o0, -ERESTART_RESTARTBLOCK
10903 bgeu,pn %xcc, 1f
10904- andcc %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT|_TIF_NOHZ), %g0
10905+ andcc %l0, _TIF_WORK_SYSCALL, %g0
10906 ldx [%sp + PTREGS_OFF + PT_V9_TNPC], %l1 ! pc = npc
10907
10908 2:
10909diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
10910index 6fd386c5..6907d81 100644
10911--- a/arch/sparc/kernel/traps_32.c
10912+++ b/arch/sparc/kernel/traps_32.c
10913@@ -44,6 +44,8 @@ static void instruction_dump(unsigned long *pc)
10914 #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
10915 #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
10916
10917+extern void gr_handle_kernel_exploit(void);
10918+
10919 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10920 {
10921 static int die_counter;
10922@@ -76,15 +78,17 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
10923 count++ < 30 &&
10924 (((unsigned long) rw) >= PAGE_OFFSET) &&
10925 !(((unsigned long) rw) & 0x7)) {
10926- printk("Caller[%08lx]: %pS\n", rw->ins[7],
10927+ printk("Caller[%08lx]: %pA\n", rw->ins[7],
10928 (void *) rw->ins[7]);
10929 rw = (struct reg_window32 *)rw->ins[6];
10930 }
10931 }
10932 printk("Instruction DUMP:");
10933 instruction_dump ((unsigned long *) regs->pc);
10934- if(regs->psr & PSR_PS)
10935+ if(regs->psr & PSR_PS) {
10936+ gr_handle_kernel_exploit();
10937 do_exit(SIGKILL);
10938+ }
10939 do_exit(SIGSEGV);
10940 }
10941
10942diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c
10943index 0e69974..0c15a6e 100644
10944--- a/arch/sparc/kernel/traps_64.c
10945+++ b/arch/sparc/kernel/traps_64.c
10946@@ -79,7 +79,7 @@ static void dump_tl1_traplog(struct tl1_traplog *p)
10947 i + 1,
10948 p->trapstack[i].tstate, p->trapstack[i].tpc,
10949 p->trapstack[i].tnpc, p->trapstack[i].tt);
10950- printk("TRAPLOG: TPC<%pS>\n", (void *) p->trapstack[i].tpc);
10951+ printk("TRAPLOG: TPC<%pA>\n", (void *) p->trapstack[i].tpc);
10952 }
10953 }
10954
10955@@ -99,6 +99,12 @@ void bad_trap(struct pt_regs *regs, long lvl)
10956
10957 lvl -= 0x100;
10958 if (regs->tstate & TSTATE_PRIV) {
10959+
10960+#ifdef CONFIG_PAX_REFCOUNT
10961+ if (lvl == 6)
10962+ pax_report_refcount_overflow(regs);
10963+#endif
10964+
10965 sprintf(buffer, "Kernel bad sw trap %lx", lvl);
10966 die_if_kernel(buffer, regs);
10967 }
10968@@ -117,11 +123,16 @@ void bad_trap(struct pt_regs *regs, long lvl)
10969 void bad_trap_tl1(struct pt_regs *regs, long lvl)
10970 {
10971 char buffer[32];
10972-
10973+
10974 if (notify_die(DIE_TRAP_TL1, "bad trap tl1", regs,
10975 0, lvl, SIGTRAP) == NOTIFY_STOP)
10976 return;
10977
10978+#ifdef CONFIG_PAX_REFCOUNT
10979+ if (lvl == 6)
10980+ pax_report_refcount_overflow(regs);
10981+#endif
10982+
10983 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
10984
10985 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
10986@@ -1151,7 +1162,7 @@ static void cheetah_log_errors(struct pt_regs *regs, struct cheetah_err_info *in
10987 regs->tpc, regs->tnpc, regs->u_regs[UREG_I7], regs->tstate);
10988 printk("%s" "ERROR(%d): ",
10989 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id());
10990- printk("TPC<%pS>\n", (void *) regs->tpc);
10991+ printk("TPC<%pA>\n", (void *) regs->tpc);
10992 printk("%s" "ERROR(%d): M_SYND(%lx), E_SYND(%lx)%s%s\n",
10993 (recoverable ? KERN_WARNING : KERN_CRIT), smp_processor_id(),
10994 (afsr & CHAFSR_M_SYNDROME) >> CHAFSR_M_SYNDROME_SHIFT,
10995@@ -1758,7 +1769,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
10996 smp_processor_id(),
10997 (type & 0x1) ? 'I' : 'D',
10998 regs->tpc);
10999- printk(KERN_EMERG "TPC<%pS>\n", (void *) regs->tpc);
11000+ printk(KERN_EMERG "TPC<%pA>\n", (void *) regs->tpc);
11001 panic("Irrecoverable Cheetah+ parity error.");
11002 }
11003
11004@@ -1766,7 +1777,7 @@ void cheetah_plus_parity_error(int type, struct pt_regs *regs)
11005 smp_processor_id(),
11006 (type & 0x1) ? 'I' : 'D',
11007 regs->tpc);
11008- printk(KERN_WARNING "TPC<%pS>\n", (void *) regs->tpc);
11009+ printk(KERN_WARNING "TPC<%pA>\n", (void *) regs->tpc);
11010 }
11011
11012 struct sun4v_error_entry {
11013@@ -1839,8 +1850,8 @@ struct sun4v_error_entry {
11014 /*0x38*/u64 reserved_5;
11015 };
11016
11017-static atomic_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11018-static atomic_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11019+static atomic_unchecked_t sun4v_resum_oflow_cnt = ATOMIC_INIT(0);
11020+static atomic_unchecked_t sun4v_nonresum_oflow_cnt = ATOMIC_INIT(0);
11021
11022 static const char *sun4v_err_type_to_str(u8 type)
11023 {
11024@@ -1932,7 +1943,7 @@ static void sun4v_report_real_raddr(const char *pfx, struct pt_regs *regs)
11025 }
11026
11027 static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11028- int cpu, const char *pfx, atomic_t *ocnt)
11029+ int cpu, const char *pfx, atomic_unchecked_t *ocnt)
11030 {
11031 u64 *raw_ptr = (u64 *) ent;
11032 u32 attrs;
11033@@ -1990,8 +2001,8 @@ static void sun4v_log_error(struct pt_regs *regs, struct sun4v_error_entry *ent,
11034
11035 show_regs(regs);
11036
11037- if ((cnt = atomic_read(ocnt)) != 0) {
11038- atomic_set(ocnt, 0);
11039+ if ((cnt = atomic_read_unchecked(ocnt)) != 0) {
11040+ atomic_set_unchecked(ocnt, 0);
11041 wmb();
11042 printk("%s: Queue overflowed %d times.\n",
11043 pfx, cnt);
11044@@ -2048,7 +2059,7 @@ out:
11045 */
11046 void sun4v_resum_overflow(struct pt_regs *regs)
11047 {
11048- atomic_inc(&sun4v_resum_oflow_cnt);
11049+ atomic_inc_unchecked(&sun4v_resum_oflow_cnt);
11050 }
11051
11052 /* We run with %pil set to PIL_NORMAL_MAX and PSTATE_IE enabled in %pstate.
11053@@ -2101,7 +2112,7 @@ void sun4v_nonresum_overflow(struct pt_regs *regs)
11054 /* XXX Actually even this can make not that much sense. Perhaps
11055 * XXX we should just pull the plug and panic directly from here?
11056 */
11057- atomic_inc(&sun4v_nonresum_oflow_cnt);
11058+ atomic_inc_unchecked(&sun4v_nonresum_oflow_cnt);
11059 }
11060
11061 static void sun4v_tlb_error(struct pt_regs *regs)
11062@@ -2120,9 +2131,9 @@ void sun4v_itlb_error_report(struct pt_regs *regs, int tl)
11063
11064 printk(KERN_EMERG "SUN4V-ITLB: Error at TPC[%lx], tl %d\n",
11065 regs->tpc, tl);
11066- printk(KERN_EMERG "SUN4V-ITLB: TPC<%pS>\n", (void *) regs->tpc);
11067+ printk(KERN_EMERG "SUN4V-ITLB: TPC<%pA>\n", (void *) regs->tpc);
11068 printk(KERN_EMERG "SUN4V-ITLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11069- printk(KERN_EMERG "SUN4V-ITLB: O7<%pS>\n",
11070+ printk(KERN_EMERG "SUN4V-ITLB: O7<%pA>\n",
11071 (void *) regs->u_regs[UREG_I7]);
11072 printk(KERN_EMERG "SUN4V-ITLB: vaddr[%lx] ctx[%lx] "
11073 "pte[%lx] error[%lx]\n",
11074@@ -2143,9 +2154,9 @@ void sun4v_dtlb_error_report(struct pt_regs *regs, int tl)
11075
11076 printk(KERN_EMERG "SUN4V-DTLB: Error at TPC[%lx], tl %d\n",
11077 regs->tpc, tl);
11078- printk(KERN_EMERG "SUN4V-DTLB: TPC<%pS>\n", (void *) regs->tpc);
11079+ printk(KERN_EMERG "SUN4V-DTLB: TPC<%pA>\n", (void *) regs->tpc);
11080 printk(KERN_EMERG "SUN4V-DTLB: O7[%lx]\n", regs->u_regs[UREG_I7]);
11081- printk(KERN_EMERG "SUN4V-DTLB: O7<%pS>\n",
11082+ printk(KERN_EMERG "SUN4V-DTLB: O7<%pA>\n",
11083 (void *) regs->u_regs[UREG_I7]);
11084 printk(KERN_EMERG "SUN4V-DTLB: vaddr[%lx] ctx[%lx] "
11085 "pte[%lx] error[%lx]\n",
11086@@ -2362,13 +2373,13 @@ void show_stack(struct task_struct *tsk, unsigned long *_ksp)
11087 fp = (unsigned long)sf->fp + STACK_BIAS;
11088 }
11089
11090- printk(" [%016lx] %pS\n", pc, (void *) pc);
11091+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11092 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
11093 if ((pc + 8UL) == (unsigned long) &return_to_handler) {
11094 int index = tsk->curr_ret_stack;
11095 if (tsk->ret_stack && index >= graph) {
11096 pc = tsk->ret_stack[index - graph].ret;
11097- printk(" [%016lx] %pS\n", pc, (void *) pc);
11098+ printk(" [%016lx] %pA\n", pc, (void *) pc);
11099 graph++;
11100 }
11101 }
11102@@ -2386,6 +2397,8 @@ static inline struct reg_window *kernel_stack_up(struct reg_window *rw)
11103 return (struct reg_window *) (fp + STACK_BIAS);
11104 }
11105
11106+extern void gr_handle_kernel_exploit(void);
11107+
11108 void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11109 {
11110 static int die_counter;
11111@@ -2414,7 +2427,7 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11112 while (rw &&
11113 count++ < 30 &&
11114 kstack_valid(tp, (unsigned long) rw)) {
11115- printk("Caller[%016lx]: %pS\n", rw->ins[7],
11116+ printk("Caller[%016lx]: %pA\n", rw->ins[7],
11117 (void *) rw->ins[7]);
11118
11119 rw = kernel_stack_up(rw);
11120@@ -2429,8 +2442,10 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs)
11121 }
11122 if (panic_on_oops)
11123 panic("Fatal exception");
11124- if (regs->tstate & TSTATE_PRIV)
11125+ if (regs->tstate & TSTATE_PRIV) {
11126+ gr_handle_kernel_exploit();
11127 do_exit(SIGKILL);
11128+ }
11129 do_exit(SIGSEGV);
11130 }
11131 EXPORT_SYMBOL(die_if_kernel);
11132diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c
11133index 62098a8..547ab2c 100644
11134--- a/arch/sparc/kernel/unaligned_64.c
11135+++ b/arch/sparc/kernel/unaligned_64.c
11136@@ -297,7 +297,7 @@ static void log_unaligned(struct pt_regs *regs)
11137 static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
11138
11139 if (__ratelimit(&ratelimit)) {
11140- printk("Kernel unaligned access at TPC[%lx] %pS\n",
11141+ printk("Kernel unaligned access at TPC[%lx] %pA\n",
11142 regs->tpc, (void *) regs->tpc);
11143 }
11144 }
11145diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
11146index 3269b02..64f5231 100644
11147--- a/arch/sparc/lib/Makefile
11148+++ b/arch/sparc/lib/Makefile
11149@@ -2,7 +2,7 @@
11150 #
11151
11152 asflags-y := -ansi -DST_DIV0=0x02
11153-ccflags-y := -Werror
11154+#ccflags-y := -Werror
11155
11156 lib-$(CONFIG_SPARC32) += ashrdi3.o
11157 lib-$(CONFIG_SPARC32) += memcpy.o memset.o
11158diff --git a/arch/sparc/lib/atomic_64.S b/arch/sparc/lib/atomic_64.S
11159index 05dac43..76f8ed4 100644
11160--- a/arch/sparc/lib/atomic_64.S
11161+++ b/arch/sparc/lib/atomic_64.S
11162@@ -15,11 +15,22 @@
11163 * a value and does the barriers.
11164 */
11165
11166-#define ATOMIC_OP(op) \
11167-ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11168+#ifdef CONFIG_PAX_REFCOUNT
11169+#define __REFCOUNT_OP(op) op##cc
11170+#define __OVERFLOW_IOP tvs %icc, 6;
11171+#define __OVERFLOW_XOP tvs %xcc, 6;
11172+#else
11173+#define __REFCOUNT_OP(op) op
11174+#define __OVERFLOW_IOP
11175+#define __OVERFLOW_XOP
11176+#endif
11177+
11178+#define __ATOMIC_OP(op, suffix, asm_op, post_op) \
11179+ENTRY(atomic_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11180 BACKOFF_SETUP(%o2); \
11181 1: lduw [%o1], %g1; \
11182- op %g1, %o0, %g7; \
11183+ asm_op %g1, %o0, %g7; \
11184+ post_op \
11185 cas [%o1], %g1, %g7; \
11186 cmp %g1, %g7; \
11187 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11188@@ -29,11 +40,15 @@ ENTRY(atomic_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11189 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11190 ENDPROC(atomic_##op); \
11191
11192-#define ATOMIC_OP_RETURN(op) \
11193-ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11194+#define ATOMIC_OP(op) __ATOMIC_OP(op, , op, ) \
11195+ __ATOMIC_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11196+
11197+#define __ATOMIC_OP_RETURN(op, suffix, asm_op, post_op) \
11198+ENTRY(atomic_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11199 BACKOFF_SETUP(%o2); \
11200 1: lduw [%o1], %g1; \
11201- op %g1, %o0, %g7; \
11202+ asm_op %g1, %o0, %g7; \
11203+ post_op \
11204 cas [%o1], %g1, %g7; \
11205 cmp %g1, %g7; \
11206 bne,pn %icc, BACKOFF_LABEL(2f, 1b); \
11207@@ -43,6 +58,9 @@ ENTRY(atomic_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11208 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11209 ENDPROC(atomic_##op##_return);
11210
11211+#define ATOMIC_OP_RETURN(op) __ATOMIC_OP_RETURN(op, , op, ) \
11212+ __ATOMIC_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_IOP)
11213+
11214 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11215
11216 ATOMIC_OPS(add)
11217@@ -50,13 +68,16 @@ ATOMIC_OPS(sub)
11218
11219 #undef ATOMIC_OPS
11220 #undef ATOMIC_OP_RETURN
11221+#undef __ATOMIC_OP_RETURN
11222 #undef ATOMIC_OP
11223+#undef __ATOMIC_OP
11224
11225-#define ATOMIC64_OP(op) \
11226-ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11227+#define __ATOMIC64_OP(op, suffix, asm_op, post_op) \
11228+ENTRY(atomic64_##op##suffix) /* %o0 = increment, %o1 = atomic_ptr */ \
11229 BACKOFF_SETUP(%o2); \
11230 1: ldx [%o1], %g1; \
11231- op %g1, %o0, %g7; \
11232+ asm_op %g1, %o0, %g7; \
11233+ post_op \
11234 casx [%o1], %g1, %g7; \
11235 cmp %g1, %g7; \
11236 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11237@@ -66,11 +87,15 @@ ENTRY(atomic64_##op) /* %o0 = increment, %o1 = atomic_ptr */ \
11238 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11239 ENDPROC(atomic64_##op); \
11240
11241-#define ATOMIC64_OP_RETURN(op) \
11242-ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11243+#define ATOMIC64_OP(op) __ATOMIC64_OP(op, , op, ) \
11244+ __ATOMIC64_OP(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11245+
11246+#define __ATOMIC64_OP_RETURN(op, suffix, asm_op, post_op) \
11247+ENTRY(atomic64_##op##_return##suffix) /* %o0 = increment, %o1 = atomic_ptr */\
11248 BACKOFF_SETUP(%o2); \
11249 1: ldx [%o1], %g1; \
11250- op %g1, %o0, %g7; \
11251+ asm_op %g1, %o0, %g7; \
11252+ post_op \
11253 casx [%o1], %g1, %g7; \
11254 cmp %g1, %g7; \
11255 bne,pn %xcc, BACKOFF_LABEL(2f, 1b); \
11256@@ -80,6 +105,9 @@ ENTRY(atomic64_##op##_return) /* %o0 = increment, %o1 = atomic_ptr */ \
11257 2: BACKOFF_SPIN(%o2, %o3, 1b); \
11258 ENDPROC(atomic64_##op##_return);
11259
11260+#define ATOMIC64_OP_RETURN(op) __ATOMIC64_OP_RETURN(op, , op, ) \
11261+i __ATOMIC64_OP_RETURN(op, _unchecked, __REFCOUNT_OP(op), __OVERFLOW_XOP)
11262+
11263 #define ATOMIC64_OPS(op) ATOMIC64_OP(op) ATOMIC64_OP_RETURN(op)
11264
11265 ATOMIC64_OPS(add)
11266@@ -87,7 +115,12 @@ ATOMIC64_OPS(sub)
11267
11268 #undef ATOMIC64_OPS
11269 #undef ATOMIC64_OP_RETURN
11270+#undef __ATOMIC64_OP_RETURN
11271 #undef ATOMIC64_OP
11272+#undef __ATOMIC64_OP
11273+#undef __OVERFLOW_XOP
11274+#undef __OVERFLOW_IOP
11275+#undef __REFCOUNT_OP
11276
11277 ENTRY(atomic64_dec_if_positive) /* %o0 = atomic_ptr */
11278 BACKOFF_SETUP(%o2)
11279diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
11280index 1d649a9..fbc5bfc 100644
11281--- a/arch/sparc/lib/ksyms.c
11282+++ b/arch/sparc/lib/ksyms.c
11283@@ -101,7 +101,9 @@ EXPORT_SYMBOL(__clear_user);
11284 /* Atomic counter implementation. */
11285 #define ATOMIC_OP(op) \
11286 EXPORT_SYMBOL(atomic_##op); \
11287-EXPORT_SYMBOL(atomic64_##op);
11288+EXPORT_SYMBOL(atomic_##op##_unchecked); \
11289+EXPORT_SYMBOL(atomic64_##op); \
11290+EXPORT_SYMBOL(atomic64_##op##_unchecked);
11291
11292 #define ATOMIC_OP_RETURN(op) \
11293 EXPORT_SYMBOL(atomic_##op##_return); \
11294@@ -110,6 +112,8 @@ EXPORT_SYMBOL(atomic64_##op##_return);
11295 #define ATOMIC_OPS(op) ATOMIC_OP(op) ATOMIC_OP_RETURN(op)
11296
11297 ATOMIC_OPS(add)
11298+EXPORT_SYMBOL(atomic_add_ret_unchecked);
11299+EXPORT_SYMBOL(atomic64_add_ret_unchecked);
11300 ATOMIC_OPS(sub)
11301
11302 #undef ATOMIC_OPS
11303diff --git a/arch/sparc/mm/Makefile b/arch/sparc/mm/Makefile
11304index 30c3ecc..736f015 100644
11305--- a/arch/sparc/mm/Makefile
11306+++ b/arch/sparc/mm/Makefile
11307@@ -2,7 +2,7 @@
11308 #
11309
11310 asflags-y := -ansi
11311-ccflags-y := -Werror
11312+#ccflags-y := -Werror
11313
11314 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o gup.o
11315 obj-y += fault_$(BITS).o
11316diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
11317index 70d8171..274c6c0 100644
11318--- a/arch/sparc/mm/fault_32.c
11319+++ b/arch/sparc/mm/fault_32.c
11320@@ -21,6 +21,9 @@
11321 #include <linux/perf_event.h>
11322 #include <linux/interrupt.h>
11323 #include <linux/kdebug.h>
11324+#include <linux/slab.h>
11325+#include <linux/pagemap.h>
11326+#include <linux/compiler.h>
11327
11328 #include <asm/page.h>
11329 #include <asm/pgtable.h>
11330@@ -156,6 +159,277 @@ static unsigned long compute_si_addr(struct pt_regs *regs, int text_fault)
11331 return safe_compute_effective_address(regs, insn);
11332 }
11333
11334+#ifdef CONFIG_PAX_PAGEEXEC
11335+#ifdef CONFIG_PAX_DLRESOLVE
11336+static void pax_emuplt_close(struct vm_area_struct *vma)
11337+{
11338+ vma->vm_mm->call_dl_resolve = 0UL;
11339+}
11340+
11341+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11342+{
11343+ unsigned int *kaddr;
11344+
11345+ vmf->page = alloc_page(GFP_HIGHUSER);
11346+ if (!vmf->page)
11347+ return VM_FAULT_OOM;
11348+
11349+ kaddr = kmap(vmf->page);
11350+ memset(kaddr, 0, PAGE_SIZE);
11351+ kaddr[0] = 0x9DE3BFA8U; /* save */
11352+ flush_dcache_page(vmf->page);
11353+ kunmap(vmf->page);
11354+ return VM_FAULT_MAJOR;
11355+}
11356+
11357+static const struct vm_operations_struct pax_vm_ops = {
11358+ .close = pax_emuplt_close,
11359+ .fault = pax_emuplt_fault
11360+};
11361+
11362+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11363+{
11364+ int ret;
11365+
11366+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11367+ vma->vm_mm = current->mm;
11368+ vma->vm_start = addr;
11369+ vma->vm_end = addr + PAGE_SIZE;
11370+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11371+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11372+ vma->vm_ops = &pax_vm_ops;
11373+
11374+ ret = insert_vm_struct(current->mm, vma);
11375+ if (ret)
11376+ return ret;
11377+
11378+ ++current->mm->total_vm;
11379+ return 0;
11380+}
11381+#endif
11382+
11383+/*
11384+ * PaX: decide what to do with offenders (regs->pc = fault address)
11385+ *
11386+ * returns 1 when task should be killed
11387+ * 2 when patched PLT trampoline was detected
11388+ * 3 when unpatched PLT trampoline was detected
11389+ */
11390+static int pax_handle_fetch_fault(struct pt_regs *regs)
11391+{
11392+
11393+#ifdef CONFIG_PAX_EMUPLT
11394+ int err;
11395+
11396+ do { /* PaX: patched PLT emulation #1 */
11397+ unsigned int sethi1, sethi2, jmpl;
11398+
11399+ err = get_user(sethi1, (unsigned int *)regs->pc);
11400+ err |= get_user(sethi2, (unsigned int *)(regs->pc+4));
11401+ err |= get_user(jmpl, (unsigned int *)(regs->pc+8));
11402+
11403+ if (err)
11404+ break;
11405+
11406+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11407+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11408+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11409+ {
11410+ unsigned int addr;
11411+
11412+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11413+ addr = regs->u_regs[UREG_G1];
11414+ addr += (((jmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11415+ regs->pc = addr;
11416+ regs->npc = addr+4;
11417+ return 2;
11418+ }
11419+ } while (0);
11420+
11421+ do { /* PaX: patched PLT emulation #2 */
11422+ unsigned int ba;
11423+
11424+ err = get_user(ba, (unsigned int *)regs->pc);
11425+
11426+ if (err)
11427+ break;
11428+
11429+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11430+ unsigned int addr;
11431+
11432+ if ((ba & 0xFFC00000U) == 0x30800000U)
11433+ addr = regs->pc + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11434+ else
11435+ addr = regs->pc + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11436+ regs->pc = addr;
11437+ regs->npc = addr+4;
11438+ return 2;
11439+ }
11440+ } while (0);
11441+
11442+ do { /* PaX: patched PLT emulation #3 */
11443+ unsigned int sethi, bajmpl, nop;
11444+
11445+ err = get_user(sethi, (unsigned int *)regs->pc);
11446+ err |= get_user(bajmpl, (unsigned int *)(regs->pc+4));
11447+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11448+
11449+ if (err)
11450+ break;
11451+
11452+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11453+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11454+ nop == 0x01000000U)
11455+ {
11456+ unsigned int addr;
11457+
11458+ addr = (sethi & 0x003FFFFFU) << 10;
11459+ regs->u_regs[UREG_G1] = addr;
11460+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11461+ addr += (((bajmpl | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11462+ else
11463+ addr = regs->pc + ((((bajmpl | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11464+ regs->pc = addr;
11465+ regs->npc = addr+4;
11466+ return 2;
11467+ }
11468+ } while (0);
11469+
11470+ do { /* PaX: unpatched PLT emulation step 1 */
11471+ unsigned int sethi, ba, nop;
11472+
11473+ err = get_user(sethi, (unsigned int *)regs->pc);
11474+ err |= get_user(ba, (unsigned int *)(regs->pc+4));
11475+ err |= get_user(nop, (unsigned int *)(regs->pc+8));
11476+
11477+ if (err)
11478+ break;
11479+
11480+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11481+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11482+ nop == 0x01000000U)
11483+ {
11484+ unsigned int addr, save, call;
11485+
11486+ if ((ba & 0xFFC00000U) == 0x30800000U)
11487+ addr = regs->pc + 4 + ((((ba | 0xFFC00000U) ^ 0x00200000U) + 0x00200000U) << 2);
11488+ else
11489+ addr = regs->pc + 4 + ((((ba | 0xFFF80000U) ^ 0x00040000U) + 0x00040000U) << 2);
11490+
11491+ err = get_user(save, (unsigned int *)addr);
11492+ err |= get_user(call, (unsigned int *)(addr+4));
11493+ err |= get_user(nop, (unsigned int *)(addr+8));
11494+ if (err)
11495+ break;
11496+
11497+#ifdef CONFIG_PAX_DLRESOLVE
11498+ if (save == 0x9DE3BFA8U &&
11499+ (call & 0xC0000000U) == 0x40000000U &&
11500+ nop == 0x01000000U)
11501+ {
11502+ struct vm_area_struct *vma;
11503+ unsigned long call_dl_resolve;
11504+
11505+ down_read(&current->mm->mmap_sem);
11506+ call_dl_resolve = current->mm->call_dl_resolve;
11507+ up_read(&current->mm->mmap_sem);
11508+ if (likely(call_dl_resolve))
11509+ goto emulate;
11510+
11511+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11512+
11513+ down_write(&current->mm->mmap_sem);
11514+ if (current->mm->call_dl_resolve) {
11515+ call_dl_resolve = current->mm->call_dl_resolve;
11516+ up_write(&current->mm->mmap_sem);
11517+ if (vma)
11518+ kmem_cache_free(vm_area_cachep, vma);
11519+ goto emulate;
11520+ }
11521+
11522+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11523+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11524+ up_write(&current->mm->mmap_sem);
11525+ if (vma)
11526+ kmem_cache_free(vm_area_cachep, vma);
11527+ return 1;
11528+ }
11529+
11530+ if (pax_insert_vma(vma, call_dl_resolve)) {
11531+ up_write(&current->mm->mmap_sem);
11532+ kmem_cache_free(vm_area_cachep, vma);
11533+ return 1;
11534+ }
11535+
11536+ current->mm->call_dl_resolve = call_dl_resolve;
11537+ up_write(&current->mm->mmap_sem);
11538+
11539+emulate:
11540+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11541+ regs->pc = call_dl_resolve;
11542+ regs->npc = addr+4;
11543+ return 3;
11544+ }
11545+#endif
11546+
11547+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11548+ if ((save & 0xFFC00000U) == 0x05000000U &&
11549+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11550+ nop == 0x01000000U)
11551+ {
11552+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11553+ regs->u_regs[UREG_G2] = addr + 4;
11554+ addr = (save & 0x003FFFFFU) << 10;
11555+ addr += (((call | 0xFFFFE000U) ^ 0x00001000U) + 0x00001000U);
11556+ regs->pc = addr;
11557+ regs->npc = addr+4;
11558+ return 3;
11559+ }
11560+ }
11561+ } while (0);
11562+
11563+ do { /* PaX: unpatched PLT emulation step 2 */
11564+ unsigned int save, call, nop;
11565+
11566+ err = get_user(save, (unsigned int *)(regs->pc-4));
11567+ err |= get_user(call, (unsigned int *)regs->pc);
11568+ err |= get_user(nop, (unsigned int *)(regs->pc+4));
11569+ if (err)
11570+ break;
11571+
11572+ if (save == 0x9DE3BFA8U &&
11573+ (call & 0xC0000000U) == 0x40000000U &&
11574+ nop == 0x01000000U)
11575+ {
11576+ unsigned int dl_resolve = regs->pc + ((((call | 0xC0000000U) ^ 0x20000000U) + 0x20000000U) << 2);
11577+
11578+ regs->u_regs[UREG_RETPC] = regs->pc;
11579+ regs->pc = dl_resolve;
11580+ regs->npc = dl_resolve+4;
11581+ return 3;
11582+ }
11583+ } while (0);
11584+#endif
11585+
11586+ return 1;
11587+}
11588+
11589+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
11590+{
11591+ unsigned long i;
11592+
11593+ printk(KERN_ERR "PAX: bytes at PC: ");
11594+ for (i = 0; i < 8; i++) {
11595+ unsigned int c;
11596+ if (get_user(c, (unsigned int *)pc+i))
11597+ printk(KERN_CONT "???????? ");
11598+ else
11599+ printk(KERN_CONT "%08x ", c);
11600+ }
11601+ printk("\n");
11602+}
11603+#endif
11604+
11605 static noinline void do_fault_siginfo(int code, int sig, struct pt_regs *regs,
11606 int text_fault)
11607 {
11608@@ -226,6 +500,24 @@ good_area:
11609 if (!(vma->vm_flags & VM_WRITE))
11610 goto bad_area;
11611 } else {
11612+
11613+#ifdef CONFIG_PAX_PAGEEXEC
11614+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && text_fault && !(vma->vm_flags & VM_EXEC)) {
11615+ up_read(&mm->mmap_sem);
11616+ switch (pax_handle_fetch_fault(regs)) {
11617+
11618+#ifdef CONFIG_PAX_EMUPLT
11619+ case 2:
11620+ case 3:
11621+ return;
11622+#endif
11623+
11624+ }
11625+ pax_report_fault(regs, (void *)regs->pc, (void *)regs->u_regs[UREG_FP]);
11626+ do_group_exit(SIGKILL);
11627+ }
11628+#endif
11629+
11630 /* Allow reads even for write-only mappings */
11631 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
11632 goto bad_area;
11633diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
11634index 4798232..f76e3aa 100644
11635--- a/arch/sparc/mm/fault_64.c
11636+++ b/arch/sparc/mm/fault_64.c
11637@@ -22,6 +22,9 @@
11638 #include <linux/kdebug.h>
11639 #include <linux/percpu.h>
11640 #include <linux/context_tracking.h>
11641+#include <linux/slab.h>
11642+#include <linux/pagemap.h>
11643+#include <linux/compiler.h>
11644
11645 #include <asm/page.h>
11646 #include <asm/pgtable.h>
11647@@ -76,7 +79,7 @@ static void __kprobes bad_kernel_pc(struct pt_regs *regs, unsigned long vaddr)
11648 printk(KERN_CRIT "OOPS: Bogus kernel PC [%016lx] in fault handler\n",
11649 regs->tpc);
11650 printk(KERN_CRIT "OOPS: RPC [%016lx]\n", regs->u_regs[15]);
11651- printk("OOPS: RPC <%pS>\n", (void *) regs->u_regs[15]);
11652+ printk("OOPS: RPC <%pA>\n", (void *) regs->u_regs[15]);
11653 printk(KERN_CRIT "OOPS: Fault was to vaddr[%lx]\n", vaddr);
11654 dump_stack();
11655 unhandled_fault(regs->tpc, current, regs);
11656@@ -279,6 +282,466 @@ static void noinline __kprobes bogus_32bit_fault_tpc(struct pt_regs *regs)
11657 show_regs(regs);
11658 }
11659
11660+#ifdef CONFIG_PAX_PAGEEXEC
11661+#ifdef CONFIG_PAX_DLRESOLVE
11662+static void pax_emuplt_close(struct vm_area_struct *vma)
11663+{
11664+ vma->vm_mm->call_dl_resolve = 0UL;
11665+}
11666+
11667+static int pax_emuplt_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
11668+{
11669+ unsigned int *kaddr;
11670+
11671+ vmf->page = alloc_page(GFP_HIGHUSER);
11672+ if (!vmf->page)
11673+ return VM_FAULT_OOM;
11674+
11675+ kaddr = kmap(vmf->page);
11676+ memset(kaddr, 0, PAGE_SIZE);
11677+ kaddr[0] = 0x9DE3BFA8U; /* save */
11678+ flush_dcache_page(vmf->page);
11679+ kunmap(vmf->page);
11680+ return VM_FAULT_MAJOR;
11681+}
11682+
11683+static const struct vm_operations_struct pax_vm_ops = {
11684+ .close = pax_emuplt_close,
11685+ .fault = pax_emuplt_fault
11686+};
11687+
11688+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
11689+{
11690+ int ret;
11691+
11692+ INIT_LIST_HEAD(&vma->anon_vma_chain);
11693+ vma->vm_mm = current->mm;
11694+ vma->vm_start = addr;
11695+ vma->vm_end = addr + PAGE_SIZE;
11696+ vma->vm_flags = VM_READ | VM_EXEC | VM_MAYREAD | VM_MAYEXEC;
11697+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
11698+ vma->vm_ops = &pax_vm_ops;
11699+
11700+ ret = insert_vm_struct(current->mm, vma);
11701+ if (ret)
11702+ return ret;
11703+
11704+ ++current->mm->total_vm;
11705+ return 0;
11706+}
11707+#endif
11708+
11709+/*
11710+ * PaX: decide what to do with offenders (regs->tpc = fault address)
11711+ *
11712+ * returns 1 when task should be killed
11713+ * 2 when patched PLT trampoline was detected
11714+ * 3 when unpatched PLT trampoline was detected
11715+ */
11716+static int pax_handle_fetch_fault(struct pt_regs *regs)
11717+{
11718+
11719+#ifdef CONFIG_PAX_EMUPLT
11720+ int err;
11721+
11722+ do { /* PaX: patched PLT emulation #1 */
11723+ unsigned int sethi1, sethi2, jmpl;
11724+
11725+ err = get_user(sethi1, (unsigned int *)regs->tpc);
11726+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+4));
11727+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+8));
11728+
11729+ if (err)
11730+ break;
11731+
11732+ if ((sethi1 & 0xFFC00000U) == 0x03000000U &&
11733+ (sethi2 & 0xFFC00000U) == 0x03000000U &&
11734+ (jmpl & 0xFFFFE000U) == 0x81C06000U)
11735+ {
11736+ unsigned long addr;
11737+
11738+ regs->u_regs[UREG_G1] = (sethi2 & 0x003FFFFFU) << 10;
11739+ addr = regs->u_regs[UREG_G1];
11740+ addr += (((jmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11741+
11742+ if (test_thread_flag(TIF_32BIT))
11743+ addr &= 0xFFFFFFFFUL;
11744+
11745+ regs->tpc = addr;
11746+ regs->tnpc = addr+4;
11747+ return 2;
11748+ }
11749+ } while (0);
11750+
11751+ do { /* PaX: patched PLT emulation #2 */
11752+ unsigned int ba;
11753+
11754+ err = get_user(ba, (unsigned int *)regs->tpc);
11755+
11756+ if (err)
11757+ break;
11758+
11759+ if ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30480000U) {
11760+ unsigned long addr;
11761+
11762+ if ((ba & 0xFFC00000U) == 0x30800000U)
11763+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11764+ else
11765+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11766+
11767+ if (test_thread_flag(TIF_32BIT))
11768+ addr &= 0xFFFFFFFFUL;
11769+
11770+ regs->tpc = addr;
11771+ regs->tnpc = addr+4;
11772+ return 2;
11773+ }
11774+ } while (0);
11775+
11776+ do { /* PaX: patched PLT emulation #3 */
11777+ unsigned int sethi, bajmpl, nop;
11778+
11779+ err = get_user(sethi, (unsigned int *)regs->tpc);
11780+ err |= get_user(bajmpl, (unsigned int *)(regs->tpc+4));
11781+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11782+
11783+ if (err)
11784+ break;
11785+
11786+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11787+ ((bajmpl & 0xFFFFE000U) == 0x81C06000U || (bajmpl & 0xFFF80000U) == 0x30480000U) &&
11788+ nop == 0x01000000U)
11789+ {
11790+ unsigned long addr;
11791+
11792+ addr = (sethi & 0x003FFFFFU) << 10;
11793+ regs->u_regs[UREG_G1] = addr;
11794+ if ((bajmpl & 0xFFFFE000U) == 0x81C06000U)
11795+ addr += (((bajmpl | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11796+ else
11797+ addr = regs->tpc + ((((bajmpl | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11798+
11799+ if (test_thread_flag(TIF_32BIT))
11800+ addr &= 0xFFFFFFFFUL;
11801+
11802+ regs->tpc = addr;
11803+ regs->tnpc = addr+4;
11804+ return 2;
11805+ }
11806+ } while (0);
11807+
11808+ do { /* PaX: patched PLT emulation #4 */
11809+ unsigned int sethi, mov1, call, mov2;
11810+
11811+ err = get_user(sethi, (unsigned int *)regs->tpc);
11812+ err |= get_user(mov1, (unsigned int *)(regs->tpc+4));
11813+ err |= get_user(call, (unsigned int *)(regs->tpc+8));
11814+ err |= get_user(mov2, (unsigned int *)(regs->tpc+12));
11815+
11816+ if (err)
11817+ break;
11818+
11819+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11820+ mov1 == 0x8210000FU &&
11821+ (call & 0xC0000000U) == 0x40000000U &&
11822+ mov2 == 0x9E100001U)
11823+ {
11824+ unsigned long addr;
11825+
11826+ regs->u_regs[UREG_G1] = regs->u_regs[UREG_RETPC];
11827+ addr = regs->tpc + 4 + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
11828+
11829+ if (test_thread_flag(TIF_32BIT))
11830+ addr &= 0xFFFFFFFFUL;
11831+
11832+ regs->tpc = addr;
11833+ regs->tnpc = addr+4;
11834+ return 2;
11835+ }
11836+ } while (0);
11837+
11838+ do { /* PaX: patched PLT emulation #5 */
11839+ unsigned int sethi, sethi1, sethi2, or1, or2, sllx, jmpl, nop;
11840+
11841+ err = get_user(sethi, (unsigned int *)regs->tpc);
11842+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11843+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11844+ err |= get_user(or1, (unsigned int *)(regs->tpc+12));
11845+ err |= get_user(or2, (unsigned int *)(regs->tpc+16));
11846+ err |= get_user(sllx, (unsigned int *)(regs->tpc+20));
11847+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+24));
11848+ err |= get_user(nop, (unsigned int *)(regs->tpc+28));
11849+
11850+ if (err)
11851+ break;
11852+
11853+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11854+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11855+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11856+ (or1 & 0xFFFFE000U) == 0x82106000U &&
11857+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
11858+ sllx == 0x83287020U &&
11859+ jmpl == 0x81C04005U &&
11860+ nop == 0x01000000U)
11861+ {
11862+ unsigned long addr;
11863+
11864+ regs->u_regs[UREG_G1] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
11865+ regs->u_regs[UREG_G1] <<= 32;
11866+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
11867+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11868+ regs->tpc = addr;
11869+ regs->tnpc = addr+4;
11870+ return 2;
11871+ }
11872+ } while (0);
11873+
11874+ do { /* PaX: patched PLT emulation #6 */
11875+ unsigned int sethi, sethi1, sethi2, sllx, or, jmpl, nop;
11876+
11877+ err = get_user(sethi, (unsigned int *)regs->tpc);
11878+ err |= get_user(sethi1, (unsigned int *)(regs->tpc+4));
11879+ err |= get_user(sethi2, (unsigned int *)(regs->tpc+8));
11880+ err |= get_user(sllx, (unsigned int *)(regs->tpc+12));
11881+ err |= get_user(or, (unsigned int *)(regs->tpc+16));
11882+ err |= get_user(jmpl, (unsigned int *)(regs->tpc+20));
11883+ err |= get_user(nop, (unsigned int *)(regs->tpc+24));
11884+
11885+ if (err)
11886+ break;
11887+
11888+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11889+ (sethi1 & 0xFFC00000U) == 0x03000000U &&
11890+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
11891+ sllx == 0x83287020U &&
11892+ (or & 0xFFFFE000U) == 0x8A116000U &&
11893+ jmpl == 0x81C04005U &&
11894+ nop == 0x01000000U)
11895+ {
11896+ unsigned long addr;
11897+
11898+ regs->u_regs[UREG_G1] = (sethi1 & 0x003FFFFFU) << 10;
11899+ regs->u_regs[UREG_G1] <<= 32;
11900+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or & 0x3FFU);
11901+ addr = regs->u_regs[UREG_G1] + regs->u_regs[UREG_G5];
11902+ regs->tpc = addr;
11903+ regs->tnpc = addr+4;
11904+ return 2;
11905+ }
11906+ } while (0);
11907+
11908+ do { /* PaX: unpatched PLT emulation step 1 */
11909+ unsigned int sethi, ba, nop;
11910+
11911+ err = get_user(sethi, (unsigned int *)regs->tpc);
11912+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
11913+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
11914+
11915+ if (err)
11916+ break;
11917+
11918+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
11919+ ((ba & 0xFFC00000U) == 0x30800000U || (ba & 0xFFF80000U) == 0x30680000U) &&
11920+ nop == 0x01000000U)
11921+ {
11922+ unsigned long addr;
11923+ unsigned int save, call;
11924+ unsigned int sethi1, sethi2, or1, or2, sllx, add, jmpl;
11925+
11926+ if ((ba & 0xFFC00000U) == 0x30800000U)
11927+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFC00000UL) ^ 0x00200000UL) + 0x00200000UL) << 2);
11928+ else
11929+ addr = regs->tpc + 4 + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
11930+
11931+ if (test_thread_flag(TIF_32BIT))
11932+ addr &= 0xFFFFFFFFUL;
11933+
11934+ err = get_user(save, (unsigned int *)addr);
11935+ err |= get_user(call, (unsigned int *)(addr+4));
11936+ err |= get_user(nop, (unsigned int *)(addr+8));
11937+ if (err)
11938+ break;
11939+
11940+#ifdef CONFIG_PAX_DLRESOLVE
11941+ if (save == 0x9DE3BFA8U &&
11942+ (call & 0xC0000000U) == 0x40000000U &&
11943+ nop == 0x01000000U)
11944+ {
11945+ struct vm_area_struct *vma;
11946+ unsigned long call_dl_resolve;
11947+
11948+ down_read(&current->mm->mmap_sem);
11949+ call_dl_resolve = current->mm->call_dl_resolve;
11950+ up_read(&current->mm->mmap_sem);
11951+ if (likely(call_dl_resolve))
11952+ goto emulate;
11953+
11954+ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
11955+
11956+ down_write(&current->mm->mmap_sem);
11957+ if (current->mm->call_dl_resolve) {
11958+ call_dl_resolve = current->mm->call_dl_resolve;
11959+ up_write(&current->mm->mmap_sem);
11960+ if (vma)
11961+ kmem_cache_free(vm_area_cachep, vma);
11962+ goto emulate;
11963+ }
11964+
11965+ call_dl_resolve = get_unmapped_area(NULL, 0UL, PAGE_SIZE, 0UL, MAP_PRIVATE);
11966+ if (!vma || (call_dl_resolve & ~PAGE_MASK)) {
11967+ up_write(&current->mm->mmap_sem);
11968+ if (vma)
11969+ kmem_cache_free(vm_area_cachep, vma);
11970+ return 1;
11971+ }
11972+
11973+ if (pax_insert_vma(vma, call_dl_resolve)) {
11974+ up_write(&current->mm->mmap_sem);
11975+ kmem_cache_free(vm_area_cachep, vma);
11976+ return 1;
11977+ }
11978+
11979+ current->mm->call_dl_resolve = call_dl_resolve;
11980+ up_write(&current->mm->mmap_sem);
11981+
11982+emulate:
11983+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11984+ regs->tpc = call_dl_resolve;
11985+ regs->tnpc = addr+4;
11986+ return 3;
11987+ }
11988+#endif
11989+
11990+ /* PaX: glibc 2.4+ generates sethi/jmpl instead of save/call */
11991+ if ((save & 0xFFC00000U) == 0x05000000U &&
11992+ (call & 0xFFFFE000U) == 0x85C0A000U &&
11993+ nop == 0x01000000U)
11994+ {
11995+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
11996+ regs->u_regs[UREG_G2] = addr + 4;
11997+ addr = (save & 0x003FFFFFU) << 10;
11998+ addr += (((call | 0xFFFFFFFFFFFFE000UL) ^ 0x00001000UL) + 0x00001000UL);
11999+
12000+ if (test_thread_flag(TIF_32BIT))
12001+ addr &= 0xFFFFFFFFUL;
12002+
12003+ regs->tpc = addr;
12004+ regs->tnpc = addr+4;
12005+ return 3;
12006+ }
12007+
12008+ /* PaX: 64-bit PLT stub */
12009+ err = get_user(sethi1, (unsigned int *)addr);
12010+ err |= get_user(sethi2, (unsigned int *)(addr+4));
12011+ err |= get_user(or1, (unsigned int *)(addr+8));
12012+ err |= get_user(or2, (unsigned int *)(addr+12));
12013+ err |= get_user(sllx, (unsigned int *)(addr+16));
12014+ err |= get_user(add, (unsigned int *)(addr+20));
12015+ err |= get_user(jmpl, (unsigned int *)(addr+24));
12016+ err |= get_user(nop, (unsigned int *)(addr+28));
12017+ if (err)
12018+ break;
12019+
12020+ if ((sethi1 & 0xFFC00000U) == 0x09000000U &&
12021+ (sethi2 & 0xFFC00000U) == 0x0B000000U &&
12022+ (or1 & 0xFFFFE000U) == 0x88112000U &&
12023+ (or2 & 0xFFFFE000U) == 0x8A116000U &&
12024+ sllx == 0x89293020U &&
12025+ add == 0x8A010005U &&
12026+ jmpl == 0x89C14000U &&
12027+ nop == 0x01000000U)
12028+ {
12029+ regs->u_regs[UREG_G1] = (sethi & 0x003FFFFFU) << 10;
12030+ regs->u_regs[UREG_G4] = ((sethi1 & 0x003FFFFFU) << 10) | (or1 & 0x000003FFU);
12031+ regs->u_regs[UREG_G4] <<= 32;
12032+ regs->u_regs[UREG_G5] = ((sethi2 & 0x003FFFFFU) << 10) | (or2 & 0x000003FFU);
12033+ regs->u_regs[UREG_G5] += regs->u_regs[UREG_G4];
12034+ regs->u_regs[UREG_G4] = addr + 24;
12035+ addr = regs->u_regs[UREG_G5];
12036+ regs->tpc = addr;
12037+ regs->tnpc = addr+4;
12038+ return 3;
12039+ }
12040+ }
12041+ } while (0);
12042+
12043+#ifdef CONFIG_PAX_DLRESOLVE
12044+ do { /* PaX: unpatched PLT emulation step 2 */
12045+ unsigned int save, call, nop;
12046+
12047+ err = get_user(save, (unsigned int *)(regs->tpc-4));
12048+ err |= get_user(call, (unsigned int *)regs->tpc);
12049+ err |= get_user(nop, (unsigned int *)(regs->tpc+4));
12050+ if (err)
12051+ break;
12052+
12053+ if (save == 0x9DE3BFA8U &&
12054+ (call & 0xC0000000U) == 0x40000000U &&
12055+ nop == 0x01000000U)
12056+ {
12057+ unsigned long dl_resolve = regs->tpc + ((((call | 0xFFFFFFFFC0000000UL) ^ 0x20000000UL) + 0x20000000UL) << 2);
12058+
12059+ if (test_thread_flag(TIF_32BIT))
12060+ dl_resolve &= 0xFFFFFFFFUL;
12061+
12062+ regs->u_regs[UREG_RETPC] = regs->tpc;
12063+ regs->tpc = dl_resolve;
12064+ regs->tnpc = dl_resolve+4;
12065+ return 3;
12066+ }
12067+ } while (0);
12068+#endif
12069+
12070+ do { /* PaX: patched PLT emulation #7, must be AFTER the unpatched PLT emulation */
12071+ unsigned int sethi, ba, nop;
12072+
12073+ err = get_user(sethi, (unsigned int *)regs->tpc);
12074+ err |= get_user(ba, (unsigned int *)(regs->tpc+4));
12075+ err |= get_user(nop, (unsigned int *)(regs->tpc+8));
12076+
12077+ if (err)
12078+ break;
12079+
12080+ if ((sethi & 0xFFC00000U) == 0x03000000U &&
12081+ (ba & 0xFFF00000U) == 0x30600000U &&
12082+ nop == 0x01000000U)
12083+ {
12084+ unsigned long addr;
12085+
12086+ addr = (sethi & 0x003FFFFFU) << 10;
12087+ regs->u_regs[UREG_G1] = addr;
12088+ addr = regs->tpc + ((((ba | 0xFFFFFFFFFFF80000UL) ^ 0x00040000UL) + 0x00040000UL) << 2);
12089+
12090+ if (test_thread_flag(TIF_32BIT))
12091+ addr &= 0xFFFFFFFFUL;
12092+
12093+ regs->tpc = addr;
12094+ regs->tnpc = addr+4;
12095+ return 2;
12096+ }
12097+ } while (0);
12098+
12099+#endif
12100+
12101+ return 1;
12102+}
12103+
12104+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
12105+{
12106+ unsigned long i;
12107+
12108+ printk(KERN_ERR "PAX: bytes at PC: ");
12109+ for (i = 0; i < 8; i++) {
12110+ unsigned int c;
12111+ if (get_user(c, (unsigned int *)pc+i))
12112+ printk(KERN_CONT "???????? ");
12113+ else
12114+ printk(KERN_CONT "%08x ", c);
12115+ }
12116+ printk("\n");
12117+}
12118+#endif
12119+
12120 asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
12121 {
12122 enum ctx_state prev_state = exception_enter();
12123@@ -353,6 +816,29 @@ retry:
12124 if (!vma)
12125 goto bad_area;
12126
12127+#ifdef CONFIG_PAX_PAGEEXEC
12128+ /* PaX: detect ITLB misses on non-exec pages */
12129+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && vma->vm_start <= address &&
12130+ !(vma->vm_flags & VM_EXEC) && (fault_code & FAULT_CODE_ITLB))
12131+ {
12132+ if (address != regs->tpc)
12133+ goto good_area;
12134+
12135+ up_read(&mm->mmap_sem);
12136+ switch (pax_handle_fetch_fault(regs)) {
12137+
12138+#ifdef CONFIG_PAX_EMUPLT
12139+ case 2:
12140+ case 3:
12141+ return;
12142+#endif
12143+
12144+ }
12145+ pax_report_fault(regs, (void *)regs->tpc, (void *)(regs->u_regs[UREG_FP] + STACK_BIAS));
12146+ do_group_exit(SIGKILL);
12147+ }
12148+#endif
12149+
12150 /* Pure DTLB misses do not tell us whether the fault causing
12151 * load/store/atomic was a write or not, it only says that there
12152 * was no match. So in such a case we (carefully) read the
12153diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
12154index 4242eab..9ae6360 100644
12155--- a/arch/sparc/mm/hugetlbpage.c
12156+++ b/arch/sparc/mm/hugetlbpage.c
12157@@ -25,8 +25,10 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12158 unsigned long addr,
12159 unsigned long len,
12160 unsigned long pgoff,
12161- unsigned long flags)
12162+ unsigned long flags,
12163+ unsigned long offset)
12164 {
12165+ struct mm_struct *mm = current->mm;
12166 unsigned long task_size = TASK_SIZE;
12167 struct vm_unmapped_area_info info;
12168
12169@@ -35,15 +37,22 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *filp,
12170
12171 info.flags = 0;
12172 info.length = len;
12173- info.low_limit = TASK_UNMAPPED_BASE;
12174+ info.low_limit = mm->mmap_base;
12175 info.high_limit = min(task_size, VA_EXCLUDE_START);
12176 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12177 info.align_offset = 0;
12178+ info.threadstack_offset = offset;
12179 addr = vm_unmapped_area(&info);
12180
12181 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) {
12182 VM_BUG_ON(addr != -ENOMEM);
12183 info.low_limit = VA_EXCLUDE_END;
12184+
12185+#ifdef CONFIG_PAX_RANDMMAP
12186+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12187+ info.low_limit += mm->delta_mmap;
12188+#endif
12189+
12190 info.high_limit = task_size;
12191 addr = vm_unmapped_area(&info);
12192 }
12193@@ -55,7 +64,8 @@ static unsigned long
12194 hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12195 const unsigned long len,
12196 const unsigned long pgoff,
12197- const unsigned long flags)
12198+ const unsigned long flags,
12199+ const unsigned long offset)
12200 {
12201 struct mm_struct *mm = current->mm;
12202 unsigned long addr = addr0;
12203@@ -70,6 +80,7 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12204 info.high_limit = mm->mmap_base;
12205 info.align_mask = PAGE_MASK & ~HPAGE_MASK;
12206 info.align_offset = 0;
12207+ info.threadstack_offset = offset;
12208 addr = vm_unmapped_area(&info);
12209
12210 /*
12211@@ -82,6 +93,12 @@ hugetlb_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
12212 VM_BUG_ON(addr != -ENOMEM);
12213 info.flags = 0;
12214 info.low_limit = TASK_UNMAPPED_BASE;
12215+
12216+#ifdef CONFIG_PAX_RANDMMAP
12217+ if (mm->pax_flags & MF_PAX_RANDMMAP)
12218+ info.low_limit += mm->delta_mmap;
12219+#endif
12220+
12221 info.high_limit = STACK_TOP32;
12222 addr = vm_unmapped_area(&info);
12223 }
12224@@ -96,6 +113,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12225 struct mm_struct *mm = current->mm;
12226 struct vm_area_struct *vma;
12227 unsigned long task_size = TASK_SIZE;
12228+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
12229
12230 if (test_thread_flag(TIF_32BIT))
12231 task_size = STACK_TOP32;
12232@@ -111,19 +129,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
12233 return addr;
12234 }
12235
12236+#ifdef CONFIG_PAX_RANDMMAP
12237+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
12238+#endif
12239+
12240 if (addr) {
12241 addr = ALIGN(addr, HPAGE_SIZE);
12242 vma = find_vma(mm, addr);
12243- if (task_size - len >= addr &&
12244- (!vma || addr + len <= vma->vm_start))
12245+ if (task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
12246 return addr;
12247 }
12248 if (mm->get_unmapped_area == arch_get_unmapped_area)
12249 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
12250- pgoff, flags);
12251+ pgoff, flags, offset);
12252 else
12253 return hugetlb_get_unmapped_area_topdown(file, addr, len,
12254- pgoff, flags);
12255+ pgoff, flags, offset);
12256 }
12257
12258 pte_t *huge_pte_alloc(struct mm_struct *mm,
12259diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
12260index 4ca0d6b..e89bca1 100644
12261--- a/arch/sparc/mm/init_64.c
12262+++ b/arch/sparc/mm/init_64.c
12263@@ -186,9 +186,9 @@ unsigned long sparc64_kern_sec_context __read_mostly;
12264 int num_kernel_image_mappings;
12265
12266 #ifdef CONFIG_DEBUG_DCFLUSH
12267-atomic_t dcpage_flushes = ATOMIC_INIT(0);
12268+atomic_unchecked_t dcpage_flushes = ATOMIC_INIT(0);
12269 #ifdef CONFIG_SMP
12270-atomic_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12271+atomic_unchecked_t dcpage_flushes_xcall = ATOMIC_INIT(0);
12272 #endif
12273 #endif
12274
12275@@ -196,7 +196,7 @@ inline void flush_dcache_page_impl(struct page *page)
12276 {
12277 BUG_ON(tlb_type == hypervisor);
12278 #ifdef CONFIG_DEBUG_DCFLUSH
12279- atomic_inc(&dcpage_flushes);
12280+ atomic_inc_unchecked(&dcpage_flushes);
12281 #endif
12282
12283 #ifdef DCACHE_ALIASING_POSSIBLE
12284@@ -468,10 +468,10 @@ void mmu_info(struct seq_file *m)
12285
12286 #ifdef CONFIG_DEBUG_DCFLUSH
12287 seq_printf(m, "DCPageFlushes\t: %d\n",
12288- atomic_read(&dcpage_flushes));
12289+ atomic_read_unchecked(&dcpage_flushes));
12290 #ifdef CONFIG_SMP
12291 seq_printf(m, "DCPageFlushesXC\t: %d\n",
12292- atomic_read(&dcpage_flushes_xcall));
12293+ atomic_read_unchecked(&dcpage_flushes_xcall));
12294 #endif /* CONFIG_SMP */
12295 #endif /* CONFIG_DEBUG_DCFLUSH */
12296 }
12297diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
12298index 7cca418..53fc030 100644
12299--- a/arch/tile/Kconfig
12300+++ b/arch/tile/Kconfig
12301@@ -192,6 +192,7 @@ source "kernel/Kconfig.hz"
12302
12303 config KEXEC
12304 bool "kexec system call"
12305+ depends on !GRKERNSEC_KMEM
12306 ---help---
12307 kexec is a system call that implements the ability to shutdown your
12308 current kernel, and to start another kernel. It is like a reboot
12309diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
12310index 7b11c5f..755a026 100644
12311--- a/arch/tile/include/asm/atomic_64.h
12312+++ b/arch/tile/include/asm/atomic_64.h
12313@@ -105,6 +105,16 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
12314
12315 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
12316
12317+#define atomic64_read_unchecked(v) atomic64_read(v)
12318+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
12319+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
12320+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
12321+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
12322+#define atomic64_inc_unchecked(v) atomic64_inc(v)
12323+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
12324+#define atomic64_dec_unchecked(v) atomic64_dec(v)
12325+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
12326+
12327 /* Define this to indicate that cmpxchg is an efficient operation. */
12328 #define __HAVE_ARCH_CMPXCHG
12329
12330diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
12331index 6160761..00cac88 100644
12332--- a/arch/tile/include/asm/cache.h
12333+++ b/arch/tile/include/asm/cache.h
12334@@ -15,11 +15,12 @@
12335 #ifndef _ASM_TILE_CACHE_H
12336 #define _ASM_TILE_CACHE_H
12337
12338+#include <linux/const.h>
12339 #include <arch/chip.h>
12340
12341 /* bytes per L1 data cache line */
12342 #define L1_CACHE_SHIFT CHIP_L1D_LOG_LINE_SIZE()
12343-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12344+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12345
12346 /* bytes per L2 cache line */
12347 #define L2_CACHE_SHIFT CHIP_L2_LOG_LINE_SIZE()
12348diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
12349index f41cb53..31d3ab4 100644
12350--- a/arch/tile/include/asm/uaccess.h
12351+++ b/arch/tile/include/asm/uaccess.h
12352@@ -417,9 +417,9 @@ static inline unsigned long __must_check copy_from_user(void *to,
12353 const void __user *from,
12354 unsigned long n)
12355 {
12356- int sz = __compiletime_object_size(to);
12357+ size_t sz = __compiletime_object_size(to);
12358
12359- if (likely(sz == -1 || sz >= n))
12360+ if (likely(sz == (size_t)-1 || sz >= n))
12361 n = _copy_from_user(to, from, n);
12362 else
12363 copy_from_user_overflow();
12364diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
12365index 8416240..a012fb7 100644
12366--- a/arch/tile/mm/hugetlbpage.c
12367+++ b/arch/tile/mm/hugetlbpage.c
12368@@ -179,6 +179,7 @@ static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
12369 info.high_limit = TASK_SIZE;
12370 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12371 info.align_offset = 0;
12372+ info.threadstack_offset = 0;
12373 return vm_unmapped_area(&info);
12374 }
12375
12376@@ -196,6 +197,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
12377 info.high_limit = current->mm->mmap_base;
12378 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
12379 info.align_offset = 0;
12380+ info.threadstack_offset = 0;
12381 addr = vm_unmapped_area(&info);
12382
12383 /*
12384diff --git a/arch/um/Makefile b/arch/um/Makefile
12385index e4b1a96..16162f8 100644
12386--- a/arch/um/Makefile
12387+++ b/arch/um/Makefile
12388@@ -72,6 +72,10 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
12389 $(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \
12390 $(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include
12391
12392+ifdef CONSTIFY_PLUGIN
12393+USER_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12394+endif
12395+
12396 #This will adjust *FLAGS accordingly to the platform.
12397 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
12398
12399diff --git a/arch/um/include/asm/cache.h b/arch/um/include/asm/cache.h
12400index 19e1bdd..3665b77 100644
12401--- a/arch/um/include/asm/cache.h
12402+++ b/arch/um/include/asm/cache.h
12403@@ -1,6 +1,7 @@
12404 #ifndef __UM_CACHE_H
12405 #define __UM_CACHE_H
12406
12407+#include <linux/const.h>
12408
12409 #if defined(CONFIG_UML_X86) && !defined(CONFIG_64BIT)
12410 # define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
12411@@ -12,6 +13,6 @@
12412 # define L1_CACHE_SHIFT 5
12413 #endif
12414
12415-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12416+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12417
12418 #endif
12419diff --git a/arch/um/include/asm/kmap_types.h b/arch/um/include/asm/kmap_types.h
12420index 2e0a6b1..a64d0f5 100644
12421--- a/arch/um/include/asm/kmap_types.h
12422+++ b/arch/um/include/asm/kmap_types.h
12423@@ -8,6 +8,6 @@
12424
12425 /* No more #include "asm/arch/kmap_types.h" ! */
12426
12427-#define KM_TYPE_NR 14
12428+#define KM_TYPE_NR 15
12429
12430 #endif
12431diff --git a/arch/um/include/asm/page.h b/arch/um/include/asm/page.h
12432index 71c5d13..4c7b9f1 100644
12433--- a/arch/um/include/asm/page.h
12434+++ b/arch/um/include/asm/page.h
12435@@ -14,6 +14,9 @@
12436 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
12437 #define PAGE_MASK (~(PAGE_SIZE-1))
12438
12439+#define ktla_ktva(addr) (addr)
12440+#define ktva_ktla(addr) (addr)
12441+
12442 #ifndef __ASSEMBLY__
12443
12444 struct page;
12445diff --git a/arch/um/include/asm/pgtable-3level.h b/arch/um/include/asm/pgtable-3level.h
12446index 2b4274e..754fe06 100644
12447--- a/arch/um/include/asm/pgtable-3level.h
12448+++ b/arch/um/include/asm/pgtable-3level.h
12449@@ -58,6 +58,7 @@
12450 #define pud_present(x) (pud_val(x) & _PAGE_PRESENT)
12451 #define pud_populate(mm, pud, pmd) \
12452 set_pud(pud, __pud(_PAGE_TABLE + __pa(pmd)))
12453+#define pud_populate_kernel(mm, pud, pmd) pud_populate((mm), (pud), (pmd))
12454
12455 #ifdef CONFIG_64BIT
12456 #define set_pud(pudptr, pudval) set_64bit((u64 *) (pudptr), pud_val(pudval))
12457diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
12458index f17bca8..48adb87 100644
12459--- a/arch/um/kernel/process.c
12460+++ b/arch/um/kernel/process.c
12461@@ -356,22 +356,6 @@ int singlestepping(void * t)
12462 return 2;
12463 }
12464
12465-/*
12466- * Only x86 and x86_64 have an arch_align_stack().
12467- * All other arches have "#define arch_align_stack(x) (x)"
12468- * in their asm/exec.h
12469- * As this is included in UML from asm-um/system-generic.h,
12470- * we can use it to behave as the subarch does.
12471- */
12472-#ifndef arch_align_stack
12473-unsigned long arch_align_stack(unsigned long sp)
12474-{
12475- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
12476- sp -= get_random_int() % 8192;
12477- return sp & ~0xf;
12478-}
12479-#endif
12480-
12481 unsigned long get_wchan(struct task_struct *p)
12482 {
12483 unsigned long stack_page, sp, ip;
12484diff --git a/arch/unicore32/include/asm/cache.h b/arch/unicore32/include/asm/cache.h
12485index ad8f795..2c7eec6 100644
12486--- a/arch/unicore32/include/asm/cache.h
12487+++ b/arch/unicore32/include/asm/cache.h
12488@@ -12,8 +12,10 @@
12489 #ifndef __UNICORE_CACHE_H__
12490 #define __UNICORE_CACHE_H__
12491
12492-#define L1_CACHE_SHIFT (5)
12493-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
12494+#include <linux/const.h>
12495+
12496+#define L1_CACHE_SHIFT 5
12497+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
12498
12499 /*
12500 * Memory returned by kmalloc() may be used for DMA, so we must make
12501diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
12502index b7d31ca..9481ec5 100644
12503--- a/arch/x86/Kconfig
12504+++ b/arch/x86/Kconfig
12505@@ -132,7 +132,7 @@ config X86
12506 select RTC_LIB
12507 select HAVE_DEBUG_STACKOVERFLOW
12508 select HAVE_IRQ_EXIT_ON_IRQ_STACK if X86_64
12509- select HAVE_CC_STACKPROTECTOR
12510+ select HAVE_CC_STACKPROTECTOR if X86_64 || !PAX_MEMORY_UDEREF
12511 select GENERIC_CPU_AUTOPROBE
12512 select HAVE_ARCH_AUDITSYSCALL
12513 select ARCH_SUPPORTS_ATOMIC_RMW
12514@@ -266,7 +266,7 @@ config X86_HT
12515
12516 config X86_32_LAZY_GS
12517 def_bool y
12518- depends on X86_32 && !CC_STACKPROTECTOR
12519+ depends on X86_32 && !CC_STACKPROTECTOR && !PAX_MEMORY_UDEREF
12520
12521 config ARCH_HWEIGHT_CFLAGS
12522 string
12523@@ -632,6 +632,7 @@ config SCHED_OMIT_FRAME_POINTER
12524
12525 menuconfig HYPERVISOR_GUEST
12526 bool "Linux guest support"
12527+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_GUEST || (GRKERNSEC_CONFIG_VIRT_HOST && GRKERNSEC_CONFIG_VIRT_XEN)
12528 ---help---
12529 Say Y here to enable options for running Linux under various hyper-
12530 visors. This option enables basic hypervisor detection and platform
12531@@ -1013,6 +1014,7 @@ config VM86
12532
12533 config X86_16BIT
12534 bool "Enable support for 16-bit segments" if EXPERT
12535+ depends on !GRKERNSEC
12536 default y
12537 ---help---
12538 This option is required by programs like Wine to run 16-bit
12539@@ -1186,6 +1188,7 @@ choice
12540
12541 config NOHIGHMEM
12542 bool "off"
12543+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12544 ---help---
12545 Linux can use up to 64 Gigabytes of physical memory on x86 systems.
12546 However, the address space of 32-bit x86 processors is only 4
12547@@ -1222,6 +1225,7 @@ config NOHIGHMEM
12548
12549 config HIGHMEM4G
12550 bool "4GB"
12551+ depends on !(PAX_PAGEEXEC && PAX_ENABLE_PAE)
12552 ---help---
12553 Select this if you have a 32-bit processor and between 1 and 4
12554 gigabytes of physical RAM.
12555@@ -1274,7 +1278,7 @@ config PAGE_OFFSET
12556 hex
12557 default 0xB0000000 if VMSPLIT_3G_OPT
12558 default 0x80000000 if VMSPLIT_2G
12559- default 0x78000000 if VMSPLIT_2G_OPT
12560+ default 0x70000000 if VMSPLIT_2G_OPT
12561 default 0x40000000 if VMSPLIT_1G
12562 default 0xC0000000
12563 depends on X86_32
12564@@ -1715,6 +1719,7 @@ source kernel/Kconfig.hz
12565
12566 config KEXEC
12567 bool "kexec system call"
12568+ depends on !GRKERNSEC_KMEM
12569 ---help---
12570 kexec is a system call that implements the ability to shutdown your
12571 current kernel, and to start another kernel. It is like a reboot
12572@@ -1900,7 +1905,9 @@ config X86_NEED_RELOCS
12573
12574 config PHYSICAL_ALIGN
12575 hex "Alignment value to which kernel should be aligned"
12576- default "0x200000"
12577+ default "0x1000000"
12578+ range 0x200000 0x1000000 if PAX_KERNEXEC && X86_PAE
12579+ range 0x400000 0x1000000 if PAX_KERNEXEC && !X86_PAE
12580 range 0x2000 0x1000000 if X86_32
12581 range 0x200000 0x1000000 if X86_64
12582 ---help---
12583@@ -1983,6 +1990,7 @@ config COMPAT_VDSO
12584 def_bool n
12585 prompt "Disable the 32-bit vDSO (needed for glibc 2.3.3)"
12586 depends on X86_32 || IA32_EMULATION
12587+ depends on !PAX_PAGEEXEC && !PAX_SEGMEXEC && !PAX_KERNEXEC && !PAX_MEMORY_UDEREF
12588 ---help---
12589 Certain buggy versions of glibc will crash if they are
12590 presented with a 32-bit vDSO that is not mapped at the address
12591diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
12592index 6983314..54ad7e8 100644
12593--- a/arch/x86/Kconfig.cpu
12594+++ b/arch/x86/Kconfig.cpu
12595@@ -319,7 +319,7 @@ config X86_PPRO_FENCE
12596
12597 config X86_F00F_BUG
12598 def_bool y
12599- depends on M586MMX || M586TSC || M586 || M486
12600+ depends on (M586MMX || M586TSC || M586 || M486) && !PAX_KERNEXEC
12601
12602 config X86_INVD_BUG
12603 def_bool y
12604@@ -327,7 +327,7 @@ config X86_INVD_BUG
12605
12606 config X86_ALIGNMENT_16
12607 def_bool y
12608- depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12609+ depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || X86_ELAN || MK8 || MK7 || MK6 || MCORE2 || MPENTIUM4 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || M486 || MVIAC3_2 || MGEODEGX1
12610
12611 config X86_INTEL_USERCOPY
12612 def_bool y
12613@@ -369,7 +369,7 @@ config X86_CMPXCHG64
12614 # generates cmov.
12615 config X86_CMOV
12616 def_bool y
12617- depends on (MK8 || MK7 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12618+ depends on (MK8 || MK7 || MCORE2 || MPSC || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MCRUSOE || MEFFICEON || X86_64 || MATOM || MGEODE_LX)
12619
12620 config X86_MINIMUM_CPU_FAMILY
12621 int
12622diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
12623index 20028da..88d5946 100644
12624--- a/arch/x86/Kconfig.debug
12625+++ b/arch/x86/Kconfig.debug
12626@@ -93,7 +93,7 @@ config EFI_PGT_DUMP
12627 config DEBUG_RODATA
12628 bool "Write protect kernel read-only data structures"
12629 default y
12630- depends on DEBUG_KERNEL
12631+ depends on DEBUG_KERNEL && BROKEN
12632 ---help---
12633 Mark the kernel read-only data as write-protected in the pagetables,
12634 in order to catch accidental (and incorrect) writes to such const
12635@@ -111,7 +111,7 @@ config DEBUG_RODATA_TEST
12636
12637 config DEBUG_SET_MODULE_RONX
12638 bool "Set loadable kernel module data as NX and text as RO"
12639- depends on MODULES
12640+ depends on MODULES && BROKEN
12641 ---help---
12642 This option helps catch unintended modifications to loadable
12643 kernel module's text and read-only data. It also prevents execution
12644diff --git a/arch/x86/Makefile b/arch/x86/Makefile
12645index 5ba2d9c..41e5bb6 100644
12646--- a/arch/x86/Makefile
12647+++ b/arch/x86/Makefile
12648@@ -65,9 +65,6 @@ ifeq ($(CONFIG_X86_32),y)
12649 # CPU-specific tuning. Anything which can be shared with UML should go here.
12650 include $(srctree)/arch/x86/Makefile_32.cpu
12651 KBUILD_CFLAGS += $(cflags-y)
12652-
12653- # temporary until string.h is fixed
12654- KBUILD_CFLAGS += -ffreestanding
12655 else
12656 BITS := 64
12657 UTS_MACHINE := x86_64
12658@@ -107,6 +104,9 @@ else
12659 KBUILD_CFLAGS += $(call cc-option,-maccumulate-outgoing-args)
12660 endif
12661
12662+# temporary until string.h is fixed
12663+KBUILD_CFLAGS += -ffreestanding
12664+
12665 # Make sure compiler does not have buggy stack-protector support.
12666 ifdef CONFIG_CC_STACKPROTECTOR
12667 cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh
12668@@ -181,6 +181,7 @@ archheaders:
12669 $(Q)$(MAKE) $(build)=arch/x86/syscalls all
12670
12671 archprepare:
12672+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
12673 ifeq ($(CONFIG_KEXEC_FILE),y)
12674 $(Q)$(MAKE) $(build)=arch/x86/purgatory arch/x86/purgatory/kexec-purgatory.c
12675 endif
12676@@ -264,3 +265,9 @@ define archhelp
12677 echo ' FDARGS="..." arguments for the booted kernel'
12678 echo ' FDINITRD=file initrd for the booted kernel'
12679 endef
12680+
12681+define OLD_LD
12682+
12683+*** ${VERSION}.${PATCHLEVEL} PaX kernels no longer build correctly with old versions of binutils.
12684+*** Please upgrade your binutils to 2.18 or newer
12685+endef
12686diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
12687index 57bbf2f..b100fce 100644
12688--- a/arch/x86/boot/Makefile
12689+++ b/arch/x86/boot/Makefile
12690@@ -58,6 +58,9 @@ clean-files += cpustr.h
12691 # ---------------------------------------------------------------------------
12692
12693 KBUILD_CFLAGS := $(USERINCLUDE) $(REALMODE_CFLAGS) -D_SETUP
12694+ifdef CONSTIFY_PLUGIN
12695+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12696+endif
12697 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12698 GCOV_PROFILE := n
12699
12700diff --git a/arch/x86/boot/bitops.h b/arch/x86/boot/bitops.h
12701index 878e4b9..20537ab 100644
12702--- a/arch/x86/boot/bitops.h
12703+++ b/arch/x86/boot/bitops.h
12704@@ -26,7 +26,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12705 u8 v;
12706 const u32 *p = (const u32 *)addr;
12707
12708- asm("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12709+ asm volatile("btl %2,%1; setc %0" : "=qm" (v) : "m" (*p), "Ir" (nr));
12710 return v;
12711 }
12712
12713@@ -37,7 +37,7 @@ static inline int variable_test_bit(int nr, const void *addr)
12714
12715 static inline void set_bit(int nr, void *addr)
12716 {
12717- asm("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12718+ asm volatile("btsl %1,%0" : "+m" (*(u32 *)addr) : "Ir" (nr));
12719 }
12720
12721 #endif /* BOOT_BITOPS_H */
12722diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
12723index bd49ec6..94c7f58 100644
12724--- a/arch/x86/boot/boot.h
12725+++ b/arch/x86/boot/boot.h
12726@@ -84,7 +84,7 @@ static inline void io_delay(void)
12727 static inline u16 ds(void)
12728 {
12729 u16 seg;
12730- asm("movw %%ds,%0" : "=rm" (seg));
12731+ asm volatile("movw %%ds,%0" : "=rm" (seg));
12732 return seg;
12733 }
12734
12735diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
12736index 0a291cd..9686efc 100644
12737--- a/arch/x86/boot/compressed/Makefile
12738+++ b/arch/x86/boot/compressed/Makefile
12739@@ -30,6 +30,9 @@ KBUILD_CFLAGS += $(cflags-y)
12740 KBUILD_CFLAGS += -mno-mmx -mno-sse
12741 KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
12742 KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector)
12743+ifdef CONSTIFY_PLUGIN
12744+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
12745+endif
12746
12747 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
12748 GCOV_PROFILE := n
12749diff --git a/arch/x86/boot/compressed/efi_stub_32.S b/arch/x86/boot/compressed/efi_stub_32.S
12750index a53440e..c3dbf1e 100644
12751--- a/arch/x86/boot/compressed/efi_stub_32.S
12752+++ b/arch/x86/boot/compressed/efi_stub_32.S
12753@@ -46,16 +46,13 @@ ENTRY(efi_call_phys)
12754 * parameter 2, ..., param n. To make things easy, we save the return
12755 * address of efi_call_phys in a global variable.
12756 */
12757- popl %ecx
12758- movl %ecx, saved_return_addr(%edx)
12759- /* get the function pointer into ECX*/
12760- popl %ecx
12761- movl %ecx, efi_rt_function_ptr(%edx)
12762+ popl saved_return_addr(%edx)
12763+ popl efi_rt_function_ptr(%edx)
12764
12765 /*
12766 * 3. Call the physical function.
12767 */
12768- call *%ecx
12769+ call *efi_rt_function_ptr(%edx)
12770
12771 /*
12772 * 4. Balance the stack. And because EAX contain the return value,
12773@@ -67,15 +64,12 @@ ENTRY(efi_call_phys)
12774 1: popl %edx
12775 subl $1b, %edx
12776
12777- movl efi_rt_function_ptr(%edx), %ecx
12778- pushl %ecx
12779+ pushl efi_rt_function_ptr(%edx)
12780
12781 /*
12782 * 10. Push the saved return address onto the stack and return.
12783 */
12784- movl saved_return_addr(%edx), %ecx
12785- pushl %ecx
12786- ret
12787+ jmpl *saved_return_addr(%edx)
12788 ENDPROC(efi_call_phys)
12789 .previous
12790
12791diff --git a/arch/x86/boot/compressed/efi_thunk_64.S b/arch/x86/boot/compressed/efi_thunk_64.S
12792index 630384a..278e788 100644
12793--- a/arch/x86/boot/compressed/efi_thunk_64.S
12794+++ b/arch/x86/boot/compressed/efi_thunk_64.S
12795@@ -189,8 +189,8 @@ efi_gdt64:
12796 .long 0 /* Filled out by user */
12797 .word 0
12798 .quad 0x0000000000000000 /* NULL descriptor */
12799- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12800- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12801+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12802+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12803 .quad 0x0080890000000000 /* TS descriptor */
12804 .quad 0x0000000000000000 /* TS continued */
12805 efi_gdt64_end:
12806diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
12807index 1d7fbbc..36ecd58 100644
12808--- a/arch/x86/boot/compressed/head_32.S
12809+++ b/arch/x86/boot/compressed/head_32.S
12810@@ -140,10 +140,10 @@ preferred_addr:
12811 addl %eax, %ebx
12812 notl %eax
12813 andl %eax, %ebx
12814- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12815+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12816 jge 1f
12817 #endif
12818- movl $LOAD_PHYSICAL_ADDR, %ebx
12819+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12820 1:
12821
12822 /* Target address to relocate to for decompression */
12823diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
12824index 6b1766c..ad465c9 100644
12825--- a/arch/x86/boot/compressed/head_64.S
12826+++ b/arch/x86/boot/compressed/head_64.S
12827@@ -94,10 +94,10 @@ ENTRY(startup_32)
12828 addl %eax, %ebx
12829 notl %eax
12830 andl %eax, %ebx
12831- cmpl $LOAD_PHYSICAL_ADDR, %ebx
12832+ cmpl $____LOAD_PHYSICAL_ADDR, %ebx
12833 jge 1f
12834 #endif
12835- movl $LOAD_PHYSICAL_ADDR, %ebx
12836+ movl $____LOAD_PHYSICAL_ADDR, %ebx
12837 1:
12838
12839 /* Target address to relocate to for decompression */
12840@@ -322,10 +322,10 @@ preferred_addr:
12841 addq %rax, %rbp
12842 notq %rax
12843 andq %rax, %rbp
12844- cmpq $LOAD_PHYSICAL_ADDR, %rbp
12845+ cmpq $____LOAD_PHYSICAL_ADDR, %rbp
12846 jge 1f
12847 #endif
12848- movq $LOAD_PHYSICAL_ADDR, %rbp
12849+ movq $____LOAD_PHYSICAL_ADDR, %rbp
12850 1:
12851
12852 /* Target address to relocate to for decompression */
12853@@ -434,8 +434,8 @@ gdt:
12854 .long gdt
12855 .word 0
12856 .quad 0x0000000000000000 /* NULL descriptor */
12857- .quad 0x00af9a000000ffff /* __KERNEL_CS */
12858- .quad 0x00cf92000000ffff /* __KERNEL_DS */
12859+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
12860+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
12861 .quad 0x0080890000000000 /* TS descriptor */
12862 .quad 0x0000000000000000 /* TS continued */
12863 gdt_end:
12864diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
12865index a950864..c710239 100644
12866--- a/arch/x86/boot/compressed/misc.c
12867+++ b/arch/x86/boot/compressed/misc.c
12868@@ -242,7 +242,7 @@ static void handle_relocations(void *output, unsigned long output_len)
12869 * Calculate the delta between where vmlinux was linked to load
12870 * and where it was actually loaded.
12871 */
12872- delta = min_addr - LOAD_PHYSICAL_ADDR;
12873+ delta = min_addr - ____LOAD_PHYSICAL_ADDR;
12874 if (!delta) {
12875 debug_putstr("No relocation needed... ");
12876 return;
12877@@ -324,7 +324,7 @@ static void parse_elf(void *output)
12878 Elf32_Ehdr ehdr;
12879 Elf32_Phdr *phdrs, *phdr;
12880 #endif
12881- void *dest;
12882+ void *dest, *prev;
12883 int i;
12884
12885 memcpy(&ehdr, output, sizeof(ehdr));
12886@@ -351,13 +351,16 @@ static void parse_elf(void *output)
12887 case PT_LOAD:
12888 #ifdef CONFIG_RELOCATABLE
12889 dest = output;
12890- dest += (phdr->p_paddr - LOAD_PHYSICAL_ADDR);
12891+ dest += (phdr->p_paddr - ____LOAD_PHYSICAL_ADDR);
12892 #else
12893 dest = (void *)(phdr->p_paddr);
12894 #endif
12895 memcpy(dest,
12896 output + phdr->p_offset,
12897 phdr->p_filesz);
12898+ if (i)
12899+ memset(prev, 0xff, dest - prev);
12900+ prev = dest + phdr->p_filesz;
12901 break;
12902 default: /* Ignore other PT_* */ break;
12903 }
12904@@ -416,7 +419,7 @@ asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap,
12905 error("Destination address too large");
12906 #endif
12907 #ifndef CONFIG_RELOCATABLE
12908- if ((unsigned long)output != LOAD_PHYSICAL_ADDR)
12909+ if ((unsigned long)output != ____LOAD_PHYSICAL_ADDR)
12910 error("Wrong destination address");
12911 #endif
12912
12913diff --git a/arch/x86/boot/cpucheck.c b/arch/x86/boot/cpucheck.c
12914index 1fd7d57..0f7d096 100644
12915--- a/arch/x86/boot/cpucheck.c
12916+++ b/arch/x86/boot/cpucheck.c
12917@@ -125,9 +125,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12918 u32 ecx = MSR_K7_HWCR;
12919 u32 eax, edx;
12920
12921- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12922+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12923 eax &= ~(1 << 15);
12924- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12925+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12926
12927 get_cpuflags(); /* Make sure it really did something */
12928 err = check_cpuflags();
12929@@ -140,9 +140,9 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12930 u32 ecx = MSR_VIA_FCR;
12931 u32 eax, edx;
12932
12933- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12934+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12935 eax |= (1<<1)|(1<<7);
12936- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12937+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12938
12939 set_bit(X86_FEATURE_CX8, cpu.flags);
12940 err = check_cpuflags();
12941@@ -153,12 +153,12 @@ int check_cpu(int *cpu_level_ptr, int *req_level_ptr, u32 **err_flags_ptr)
12942 u32 eax, edx;
12943 u32 level = 1;
12944
12945- asm("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12946- asm("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12947- asm("cpuid"
12948+ asm volatile("rdmsr" : "=a" (eax), "=d" (edx) : "c" (ecx));
12949+ asm volatile("wrmsr" : : "a" (~0), "d" (edx), "c" (ecx));
12950+ asm volatile("cpuid"
12951 : "+a" (level), "=d" (cpu.flags[0])
12952 : : "ecx", "ebx");
12953- asm("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12954+ asm volatile("wrmsr" : : "a" (eax), "d" (edx), "c" (ecx));
12955
12956 err = check_cpuflags();
12957 } else if (err == 0x01 &&
12958diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
12959index 16ef025..91e033b 100644
12960--- a/arch/x86/boot/header.S
12961+++ b/arch/x86/boot/header.S
12962@@ -438,10 +438,14 @@ setup_data: .quad 0 # 64-bit physical pointer to
12963 # single linked list of
12964 # struct setup_data
12965
12966-pref_address: .quad LOAD_PHYSICAL_ADDR # preferred load addr
12967+pref_address: .quad ____LOAD_PHYSICAL_ADDR # preferred load addr
12968
12969 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
12970+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
12971+#define VO_INIT_SIZE (VO__end - VO__text - __PAGE_OFFSET - ____LOAD_PHYSICAL_ADDR)
12972+#else
12973 #define VO_INIT_SIZE (VO__end - VO__text)
12974+#endif
12975 #if ZO_INIT_SIZE > VO_INIT_SIZE
12976 #define INIT_SIZE ZO_INIT_SIZE
12977 #else
12978diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c
12979index db75d07..8e6d0af 100644
12980--- a/arch/x86/boot/memory.c
12981+++ b/arch/x86/boot/memory.c
12982@@ -19,7 +19,7 @@
12983
12984 static int detect_memory_e820(void)
12985 {
12986- int count = 0;
12987+ unsigned int count = 0;
12988 struct biosregs ireg, oreg;
12989 struct e820entry *desc = boot_params.e820_map;
12990 static struct e820entry buf; /* static so it is zeroed */
12991diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
12992index ba3e100..6501b8f 100644
12993--- a/arch/x86/boot/video-vesa.c
12994+++ b/arch/x86/boot/video-vesa.c
12995@@ -201,6 +201,7 @@ static void vesa_store_pm_info(void)
12996
12997 boot_params.screen_info.vesapm_seg = oreg.es;
12998 boot_params.screen_info.vesapm_off = oreg.di;
12999+ boot_params.screen_info.vesapm_size = oreg.cx;
13000 }
13001
13002 /*
13003diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c
13004index 43eda28..5ab5fdb 100644
13005--- a/arch/x86/boot/video.c
13006+++ b/arch/x86/boot/video.c
13007@@ -96,7 +96,7 @@ static void store_mode_params(void)
13008 static unsigned int get_entry(void)
13009 {
13010 char entry_buf[4];
13011- int i, len = 0;
13012+ unsigned int i, len = 0;
13013 int key;
13014 unsigned int v;
13015
13016diff --git a/arch/x86/crypto/aes-x86_64-asm_64.S b/arch/x86/crypto/aes-x86_64-asm_64.S
13017index 9105655..41779c1 100644
13018--- a/arch/x86/crypto/aes-x86_64-asm_64.S
13019+++ b/arch/x86/crypto/aes-x86_64-asm_64.S
13020@@ -8,6 +8,8 @@
13021 * including this sentence is retained in full.
13022 */
13023
13024+#include <asm/alternative-asm.h>
13025+
13026 .extern crypto_ft_tab
13027 .extern crypto_it_tab
13028 .extern crypto_fl_tab
13029@@ -70,6 +72,8 @@
13030 je B192; \
13031 leaq 32(r9),r9;
13032
13033+#define ret pax_force_retaddr; ret
13034+
13035 #define epilogue(FUNC,r1,r2,r3,r4,r5,r6,r7,r8,r9) \
13036 movq r1,r2; \
13037 movq r3,r4; \
13038diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S
13039index 6bd2c6c..368c93e 100644
13040--- a/arch/x86/crypto/aesni-intel_asm.S
13041+++ b/arch/x86/crypto/aesni-intel_asm.S
13042@@ -31,6 +31,7 @@
13043
13044 #include <linux/linkage.h>
13045 #include <asm/inst.h>
13046+#include <asm/alternative-asm.h>
13047
13048 /*
13049 * The following macros are used to move an (un)aligned 16 byte value to/from
13050@@ -217,7 +218,7 @@ enc: .octa 0x2
13051 * num_initial_blocks = b mod 4
13052 * encrypt the initial num_initial_blocks blocks and apply ghash on
13053 * the ciphertext
13054-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13055+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13056 * are clobbered
13057 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13058 */
13059@@ -227,8 +228,8 @@ enc: .octa 0x2
13060 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13061 MOVADQ SHUF_MASK(%rip), %xmm14
13062 mov arg7, %r10 # %r10 = AAD
13063- mov arg8, %r12 # %r12 = aadLen
13064- mov %r12, %r11
13065+ mov arg8, %r15 # %r15 = aadLen
13066+ mov %r15, %r11
13067 pxor %xmm\i, %xmm\i
13068
13069 _get_AAD_loop\num_initial_blocks\operation:
13070@@ -237,17 +238,17 @@ _get_AAD_loop\num_initial_blocks\operation:
13071 psrldq $4, %xmm\i
13072 pxor \TMP1, %xmm\i
13073 add $4, %r10
13074- sub $4, %r12
13075+ sub $4, %r15
13076 jne _get_AAD_loop\num_initial_blocks\operation
13077
13078 cmp $16, %r11
13079 je _get_AAD_loop2_done\num_initial_blocks\operation
13080
13081- mov $16, %r12
13082+ mov $16, %r15
13083 _get_AAD_loop2\num_initial_blocks\operation:
13084 psrldq $4, %xmm\i
13085- sub $4, %r12
13086- cmp %r11, %r12
13087+ sub $4, %r15
13088+ cmp %r11, %r15
13089 jne _get_AAD_loop2\num_initial_blocks\operation
13090
13091 _get_AAD_loop2_done\num_initial_blocks\operation:
13092@@ -442,7 +443,7 @@ _initial_blocks_done\num_initial_blocks\operation:
13093 * num_initial_blocks = b mod 4
13094 * encrypt the initial num_initial_blocks blocks and apply ghash on
13095 * the ciphertext
13096-* %r10, %r11, %r12, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13097+* %r10, %r11, %r15, %rax, %xmm5, %xmm6, %xmm7, %xmm8, %xmm9 registers
13098 * are clobbered
13099 * arg1, %arg2, %arg3, %r14 are used as a pointer only, not modified
13100 */
13101@@ -452,8 +453,8 @@ _initial_blocks_done\num_initial_blocks\operation:
13102 XMM2 XMM3 XMM4 XMMDst TMP6 TMP7 i i_seq operation
13103 MOVADQ SHUF_MASK(%rip), %xmm14
13104 mov arg7, %r10 # %r10 = AAD
13105- mov arg8, %r12 # %r12 = aadLen
13106- mov %r12, %r11
13107+ mov arg8, %r15 # %r15 = aadLen
13108+ mov %r15, %r11
13109 pxor %xmm\i, %xmm\i
13110 _get_AAD_loop\num_initial_blocks\operation:
13111 movd (%r10), \TMP1
13112@@ -461,15 +462,15 @@ _get_AAD_loop\num_initial_blocks\operation:
13113 psrldq $4, %xmm\i
13114 pxor \TMP1, %xmm\i
13115 add $4, %r10
13116- sub $4, %r12
13117+ sub $4, %r15
13118 jne _get_AAD_loop\num_initial_blocks\operation
13119 cmp $16, %r11
13120 je _get_AAD_loop2_done\num_initial_blocks\operation
13121- mov $16, %r12
13122+ mov $16, %r15
13123 _get_AAD_loop2\num_initial_blocks\operation:
13124 psrldq $4, %xmm\i
13125- sub $4, %r12
13126- cmp %r11, %r12
13127+ sub $4, %r15
13128+ cmp %r11, %r15
13129 jne _get_AAD_loop2\num_initial_blocks\operation
13130 _get_AAD_loop2_done\num_initial_blocks\operation:
13131 PSHUFB_XMM %xmm14, %xmm\i # byte-reflect the AAD data
13132@@ -1280,7 +1281,7 @@ _esb_loop_\@:
13133 *
13134 *****************************************************************************/
13135 ENTRY(aesni_gcm_dec)
13136- push %r12
13137+ push %r15
13138 push %r13
13139 push %r14
13140 mov %rsp, %r14
13141@@ -1290,8 +1291,8 @@ ENTRY(aesni_gcm_dec)
13142 */
13143 sub $VARIABLE_OFFSET, %rsp
13144 and $~63, %rsp # align rsp to 64 bytes
13145- mov %arg6, %r12
13146- movdqu (%r12), %xmm13 # %xmm13 = HashKey
13147+ mov %arg6, %r15
13148+ movdqu (%r15), %xmm13 # %xmm13 = HashKey
13149 movdqa SHUF_MASK(%rip), %xmm2
13150 PSHUFB_XMM %xmm2, %xmm13
13151
13152@@ -1319,10 +1320,10 @@ ENTRY(aesni_gcm_dec)
13153 movdqa %xmm13, HashKey(%rsp) # store HashKey<<1 (mod poly)
13154 mov %arg4, %r13 # save the number of bytes of plaintext/ciphertext
13155 and $-16, %r13 # %r13 = %r13 - (%r13 mod 16)
13156- mov %r13, %r12
13157- and $(3<<4), %r12
13158+ mov %r13, %r15
13159+ and $(3<<4), %r15
13160 jz _initial_num_blocks_is_0_decrypt
13161- cmp $(2<<4), %r12
13162+ cmp $(2<<4), %r15
13163 jb _initial_num_blocks_is_1_decrypt
13164 je _initial_num_blocks_is_2_decrypt
13165 _initial_num_blocks_is_3_decrypt:
13166@@ -1372,16 +1373,16 @@ _zero_cipher_left_decrypt:
13167 sub $16, %r11
13168 add %r13, %r11
13169 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte block
13170- lea SHIFT_MASK+16(%rip), %r12
13171- sub %r13, %r12
13172+ lea SHIFT_MASK+16(%rip), %r15
13173+ sub %r13, %r15
13174 # adjust the shuffle mask pointer to be able to shift 16-%r13 bytes
13175 # (%r13 is the number of bytes in plaintext mod 16)
13176- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13177+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13178 PSHUFB_XMM %xmm2, %xmm1 # right shift 16-%r13 butes
13179
13180 movdqa %xmm1, %xmm2
13181 pxor %xmm1, %xmm0 # Ciphertext XOR E(K, Yn)
13182- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13183+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13184 # get the appropriate mask to mask out top 16-%r13 bytes of %xmm0
13185 pand %xmm1, %xmm0 # mask out top 16-%r13 bytes of %xmm0
13186 pand %xmm1, %xmm2
13187@@ -1410,9 +1411,9 @@ _less_than_8_bytes_left_decrypt:
13188 sub $1, %r13
13189 jne _less_than_8_bytes_left_decrypt
13190 _multiple_of_16_bytes_decrypt:
13191- mov arg8, %r12 # %r13 = aadLen (number of bytes)
13192- shl $3, %r12 # convert into number of bits
13193- movd %r12d, %xmm15 # len(A) in %xmm15
13194+ mov arg8, %r15 # %r13 = aadLen (number of bytes)
13195+ shl $3, %r15 # convert into number of bits
13196+ movd %r15d, %xmm15 # len(A) in %xmm15
13197 shl $3, %arg4 # len(C) in bits (*128)
13198 MOVQ_R64_XMM %arg4, %xmm1
13199 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13200@@ -1451,7 +1452,8 @@ _return_T_done_decrypt:
13201 mov %r14, %rsp
13202 pop %r14
13203 pop %r13
13204- pop %r12
13205+ pop %r15
13206+ pax_force_retaddr
13207 ret
13208 ENDPROC(aesni_gcm_dec)
13209
13210@@ -1540,7 +1542,7 @@ ENDPROC(aesni_gcm_dec)
13211 * poly = x^128 + x^127 + x^126 + x^121 + 1
13212 ***************************************************************************/
13213 ENTRY(aesni_gcm_enc)
13214- push %r12
13215+ push %r15
13216 push %r13
13217 push %r14
13218 mov %rsp, %r14
13219@@ -1550,8 +1552,8 @@ ENTRY(aesni_gcm_enc)
13220 #
13221 sub $VARIABLE_OFFSET, %rsp
13222 and $~63, %rsp
13223- mov %arg6, %r12
13224- movdqu (%r12), %xmm13
13225+ mov %arg6, %r15
13226+ movdqu (%r15), %xmm13
13227 movdqa SHUF_MASK(%rip), %xmm2
13228 PSHUFB_XMM %xmm2, %xmm13
13229
13230@@ -1575,13 +1577,13 @@ ENTRY(aesni_gcm_enc)
13231 movdqa %xmm13, HashKey(%rsp)
13232 mov %arg4, %r13 # %xmm13 holds HashKey<<1 (mod poly)
13233 and $-16, %r13
13234- mov %r13, %r12
13235+ mov %r13, %r15
13236
13237 # Encrypt first few blocks
13238
13239- and $(3<<4), %r12
13240+ and $(3<<4), %r15
13241 jz _initial_num_blocks_is_0_encrypt
13242- cmp $(2<<4), %r12
13243+ cmp $(2<<4), %r15
13244 jb _initial_num_blocks_is_1_encrypt
13245 je _initial_num_blocks_is_2_encrypt
13246 _initial_num_blocks_is_3_encrypt:
13247@@ -1634,14 +1636,14 @@ _zero_cipher_left_encrypt:
13248 sub $16, %r11
13249 add %r13, %r11
13250 movdqu (%arg3,%r11,1), %xmm1 # receive the last <16 byte blocks
13251- lea SHIFT_MASK+16(%rip), %r12
13252- sub %r13, %r12
13253+ lea SHIFT_MASK+16(%rip), %r15
13254+ sub %r13, %r15
13255 # adjust the shuffle mask pointer to be able to shift 16-r13 bytes
13256 # (%r13 is the number of bytes in plaintext mod 16)
13257- movdqu (%r12), %xmm2 # get the appropriate shuffle mask
13258+ movdqu (%r15), %xmm2 # get the appropriate shuffle mask
13259 PSHUFB_XMM %xmm2, %xmm1 # shift right 16-r13 byte
13260 pxor %xmm1, %xmm0 # Plaintext XOR Encrypt(K, Yn)
13261- movdqu ALL_F-SHIFT_MASK(%r12), %xmm1
13262+ movdqu ALL_F-SHIFT_MASK(%r15), %xmm1
13263 # get the appropriate mask to mask out top 16-r13 bytes of xmm0
13264 pand %xmm1, %xmm0 # mask out top 16-r13 bytes of xmm0
13265 movdqa SHUF_MASK(%rip), %xmm10
13266@@ -1674,9 +1676,9 @@ _less_than_8_bytes_left_encrypt:
13267 sub $1, %r13
13268 jne _less_than_8_bytes_left_encrypt
13269 _multiple_of_16_bytes_encrypt:
13270- mov arg8, %r12 # %r12 = addLen (number of bytes)
13271- shl $3, %r12
13272- movd %r12d, %xmm15 # len(A) in %xmm15
13273+ mov arg8, %r15 # %r15 = addLen (number of bytes)
13274+ shl $3, %r15
13275+ movd %r15d, %xmm15 # len(A) in %xmm15
13276 shl $3, %arg4 # len(C) in bits (*128)
13277 MOVQ_R64_XMM %arg4, %xmm1
13278 pslldq $8, %xmm15 # %xmm15 = len(A)||0x0000000000000000
13279@@ -1715,7 +1717,8 @@ _return_T_done_encrypt:
13280 mov %r14, %rsp
13281 pop %r14
13282 pop %r13
13283- pop %r12
13284+ pop %r15
13285+ pax_force_retaddr
13286 ret
13287 ENDPROC(aesni_gcm_enc)
13288
13289@@ -1733,6 +1736,7 @@ _key_expansion_256a:
13290 pxor %xmm1, %xmm0
13291 movaps %xmm0, (TKEYP)
13292 add $0x10, TKEYP
13293+ pax_force_retaddr
13294 ret
13295 ENDPROC(_key_expansion_128)
13296 ENDPROC(_key_expansion_256a)
13297@@ -1759,6 +1763,7 @@ _key_expansion_192a:
13298 shufps $0b01001110, %xmm2, %xmm1
13299 movaps %xmm1, 0x10(TKEYP)
13300 add $0x20, TKEYP
13301+ pax_force_retaddr
13302 ret
13303 ENDPROC(_key_expansion_192a)
13304
13305@@ -1779,6 +1784,7 @@ _key_expansion_192b:
13306
13307 movaps %xmm0, (TKEYP)
13308 add $0x10, TKEYP
13309+ pax_force_retaddr
13310 ret
13311 ENDPROC(_key_expansion_192b)
13312
13313@@ -1792,6 +1798,7 @@ _key_expansion_256b:
13314 pxor %xmm1, %xmm2
13315 movaps %xmm2, (TKEYP)
13316 add $0x10, TKEYP
13317+ pax_force_retaddr
13318 ret
13319 ENDPROC(_key_expansion_256b)
13320
13321@@ -1905,6 +1912,7 @@ ENTRY(aesni_set_key)
13322 #ifndef __x86_64__
13323 popl KEYP
13324 #endif
13325+ pax_force_retaddr
13326 ret
13327 ENDPROC(aesni_set_key)
13328
13329@@ -1927,6 +1935,7 @@ ENTRY(aesni_enc)
13330 popl KLEN
13331 popl KEYP
13332 #endif
13333+ pax_force_retaddr
13334 ret
13335 ENDPROC(aesni_enc)
13336
13337@@ -1985,6 +1994,7 @@ _aesni_enc1:
13338 AESENC KEY STATE
13339 movaps 0x70(TKEYP), KEY
13340 AESENCLAST KEY STATE
13341+ pax_force_retaddr
13342 ret
13343 ENDPROC(_aesni_enc1)
13344
13345@@ -2094,6 +2104,7 @@ _aesni_enc4:
13346 AESENCLAST KEY STATE2
13347 AESENCLAST KEY STATE3
13348 AESENCLAST KEY STATE4
13349+ pax_force_retaddr
13350 ret
13351 ENDPROC(_aesni_enc4)
13352
13353@@ -2117,6 +2128,7 @@ ENTRY(aesni_dec)
13354 popl KLEN
13355 popl KEYP
13356 #endif
13357+ pax_force_retaddr
13358 ret
13359 ENDPROC(aesni_dec)
13360
13361@@ -2175,6 +2187,7 @@ _aesni_dec1:
13362 AESDEC KEY STATE
13363 movaps 0x70(TKEYP), KEY
13364 AESDECLAST KEY STATE
13365+ pax_force_retaddr
13366 ret
13367 ENDPROC(_aesni_dec1)
13368
13369@@ -2284,6 +2297,7 @@ _aesni_dec4:
13370 AESDECLAST KEY STATE2
13371 AESDECLAST KEY STATE3
13372 AESDECLAST KEY STATE4
13373+ pax_force_retaddr
13374 ret
13375 ENDPROC(_aesni_dec4)
13376
13377@@ -2342,6 +2356,7 @@ ENTRY(aesni_ecb_enc)
13378 popl KEYP
13379 popl LEN
13380 #endif
13381+ pax_force_retaddr
13382 ret
13383 ENDPROC(aesni_ecb_enc)
13384
13385@@ -2401,6 +2416,7 @@ ENTRY(aesni_ecb_dec)
13386 popl KEYP
13387 popl LEN
13388 #endif
13389+ pax_force_retaddr
13390 ret
13391 ENDPROC(aesni_ecb_dec)
13392
13393@@ -2443,6 +2459,7 @@ ENTRY(aesni_cbc_enc)
13394 popl LEN
13395 popl IVP
13396 #endif
13397+ pax_force_retaddr
13398 ret
13399 ENDPROC(aesni_cbc_enc)
13400
13401@@ -2534,6 +2551,7 @@ ENTRY(aesni_cbc_dec)
13402 popl LEN
13403 popl IVP
13404 #endif
13405+ pax_force_retaddr
13406 ret
13407 ENDPROC(aesni_cbc_dec)
13408
13409@@ -2561,6 +2579,7 @@ _aesni_inc_init:
13410 mov $1, TCTR_LOW
13411 MOVQ_R64_XMM TCTR_LOW INC
13412 MOVQ_R64_XMM CTR TCTR_LOW
13413+ pax_force_retaddr
13414 ret
13415 ENDPROC(_aesni_inc_init)
13416
13417@@ -2590,6 +2609,7 @@ _aesni_inc:
13418 .Linc_low:
13419 movaps CTR, IV
13420 PSHUFB_XMM BSWAP_MASK IV
13421+ pax_force_retaddr
13422 ret
13423 ENDPROC(_aesni_inc)
13424
13425@@ -2651,6 +2671,7 @@ ENTRY(aesni_ctr_enc)
13426 .Lctr_enc_ret:
13427 movups IV, (IVP)
13428 .Lctr_enc_just_ret:
13429+ pax_force_retaddr
13430 ret
13431 ENDPROC(aesni_ctr_enc)
13432
13433@@ -2777,6 +2798,7 @@ ENTRY(aesni_xts_crypt8)
13434 pxor INC, STATE4
13435 movdqu STATE4, 0x70(OUTP)
13436
13437+ pax_force_retaddr
13438 ret
13439 ENDPROC(aesni_xts_crypt8)
13440
13441diff --git a/arch/x86/crypto/blowfish-x86_64-asm_64.S b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13442index 246c670..466e2d6 100644
13443--- a/arch/x86/crypto/blowfish-x86_64-asm_64.S
13444+++ b/arch/x86/crypto/blowfish-x86_64-asm_64.S
13445@@ -21,6 +21,7 @@
13446 */
13447
13448 #include <linux/linkage.h>
13449+#include <asm/alternative-asm.h>
13450
13451 .file "blowfish-x86_64-asm.S"
13452 .text
13453@@ -149,9 +150,11 @@ ENTRY(__blowfish_enc_blk)
13454 jnz .L__enc_xor;
13455
13456 write_block();
13457+ pax_force_retaddr
13458 ret;
13459 .L__enc_xor:
13460 xor_block();
13461+ pax_force_retaddr
13462 ret;
13463 ENDPROC(__blowfish_enc_blk)
13464
13465@@ -183,6 +186,7 @@ ENTRY(blowfish_dec_blk)
13466
13467 movq %r11, %rbp;
13468
13469+ pax_force_retaddr
13470 ret;
13471 ENDPROC(blowfish_dec_blk)
13472
13473@@ -334,6 +338,7 @@ ENTRY(__blowfish_enc_blk_4way)
13474
13475 popq %rbx;
13476 popq %rbp;
13477+ pax_force_retaddr
13478 ret;
13479
13480 .L__enc_xor4:
13481@@ -341,6 +346,7 @@ ENTRY(__blowfish_enc_blk_4way)
13482
13483 popq %rbx;
13484 popq %rbp;
13485+ pax_force_retaddr
13486 ret;
13487 ENDPROC(__blowfish_enc_blk_4way)
13488
13489@@ -375,5 +381,6 @@ ENTRY(blowfish_dec_blk_4way)
13490 popq %rbx;
13491 popq %rbp;
13492
13493+ pax_force_retaddr
13494 ret;
13495 ENDPROC(blowfish_dec_blk_4way)
13496diff --git a/arch/x86/crypto/camellia-aesni-avx-asm_64.S b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13497index ce71f92..1dce7ec 100644
13498--- a/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13499+++ b/arch/x86/crypto/camellia-aesni-avx-asm_64.S
13500@@ -16,6 +16,7 @@
13501 */
13502
13503 #include <linux/linkage.h>
13504+#include <asm/alternative-asm.h>
13505
13506 #define CAMELLIA_TABLE_BYTE_LEN 272
13507
13508@@ -191,6 +192,7 @@ roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13509 roundsm16(%xmm0, %xmm1, %xmm2, %xmm3, %xmm4, %xmm5, %xmm6, %xmm7,
13510 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14, %xmm15,
13511 %rcx, (%r9));
13512+ pax_force_retaddr
13513 ret;
13514 ENDPROC(roundsm16_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13515
13516@@ -199,6 +201,7 @@ roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13517 roundsm16(%xmm4, %xmm5, %xmm6, %xmm7, %xmm0, %xmm1, %xmm2, %xmm3,
13518 %xmm12, %xmm13, %xmm14, %xmm15, %xmm8, %xmm9, %xmm10, %xmm11,
13519 %rax, (%r9));
13520+ pax_force_retaddr
13521 ret;
13522 ENDPROC(roundsm16_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13523
13524@@ -780,6 +783,7 @@ __camellia_enc_blk16:
13525 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13526 %xmm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 16(%rax));
13527
13528+ pax_force_retaddr
13529 ret;
13530
13531 .align 8
13532@@ -865,6 +869,7 @@ __camellia_dec_blk16:
13533 %xmm8, %xmm9, %xmm10, %xmm11, %xmm12, %xmm13, %xmm14,
13534 %xmm15, (key_table)(CTX), (%rax), 1 * 16(%rax));
13535
13536+ pax_force_retaddr
13537 ret;
13538
13539 .align 8
13540@@ -904,6 +909,7 @@ ENTRY(camellia_ecb_enc_16way)
13541 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13542 %xmm8, %rsi);
13543
13544+ pax_force_retaddr
13545 ret;
13546 ENDPROC(camellia_ecb_enc_16way)
13547
13548@@ -932,6 +938,7 @@ ENTRY(camellia_ecb_dec_16way)
13549 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13550 %xmm8, %rsi);
13551
13552+ pax_force_retaddr
13553 ret;
13554 ENDPROC(camellia_ecb_dec_16way)
13555
13556@@ -981,6 +988,7 @@ ENTRY(camellia_cbc_dec_16way)
13557 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13558 %xmm8, %rsi);
13559
13560+ pax_force_retaddr
13561 ret;
13562 ENDPROC(camellia_cbc_dec_16way)
13563
13564@@ -1092,6 +1100,7 @@ ENTRY(camellia_ctr_16way)
13565 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13566 %xmm8, %rsi);
13567
13568+ pax_force_retaddr
13569 ret;
13570 ENDPROC(camellia_ctr_16way)
13571
13572@@ -1234,6 +1243,7 @@ camellia_xts_crypt_16way:
13573 %xmm15, %xmm14, %xmm13, %xmm12, %xmm11, %xmm10, %xmm9,
13574 %xmm8, %rsi);
13575
13576+ pax_force_retaddr
13577 ret;
13578 ENDPROC(camellia_xts_crypt_16way)
13579
13580diff --git a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13581index 0e0b886..5a3123c 100644
13582--- a/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13583+++ b/arch/x86/crypto/camellia-aesni-avx2-asm_64.S
13584@@ -11,6 +11,7 @@
13585 */
13586
13587 #include <linux/linkage.h>
13588+#include <asm/alternative-asm.h>
13589
13590 #define CAMELLIA_TABLE_BYTE_LEN 272
13591
13592@@ -230,6 +231,7 @@ roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd:
13593 roundsm32(%ymm0, %ymm1, %ymm2, %ymm3, %ymm4, %ymm5, %ymm6, %ymm7,
13594 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14, %ymm15,
13595 %rcx, (%r9));
13596+ pax_force_retaddr
13597 ret;
13598 ENDPROC(roundsm32_x0_x1_x2_x3_x4_x5_x6_x7_y0_y1_y2_y3_y4_y5_y6_y7_cd)
13599
13600@@ -238,6 +240,7 @@ roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab:
13601 roundsm32(%ymm4, %ymm5, %ymm6, %ymm7, %ymm0, %ymm1, %ymm2, %ymm3,
13602 %ymm12, %ymm13, %ymm14, %ymm15, %ymm8, %ymm9, %ymm10, %ymm11,
13603 %rax, (%r9));
13604+ pax_force_retaddr
13605 ret;
13606 ENDPROC(roundsm32_x4_x5_x6_x7_x0_x1_x2_x3_y4_y5_y6_y7_y0_y1_y2_y3_ab)
13607
13608@@ -820,6 +823,7 @@ __camellia_enc_blk32:
13609 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13610 %ymm15, (key_table)(CTX, %r8, 8), (%rax), 1 * 32(%rax));
13611
13612+ pax_force_retaddr
13613 ret;
13614
13615 .align 8
13616@@ -905,6 +909,7 @@ __camellia_dec_blk32:
13617 %ymm8, %ymm9, %ymm10, %ymm11, %ymm12, %ymm13, %ymm14,
13618 %ymm15, (key_table)(CTX), (%rax), 1 * 32(%rax));
13619
13620+ pax_force_retaddr
13621 ret;
13622
13623 .align 8
13624@@ -948,6 +953,7 @@ ENTRY(camellia_ecb_enc_32way)
13625
13626 vzeroupper;
13627
13628+ pax_force_retaddr
13629 ret;
13630 ENDPROC(camellia_ecb_enc_32way)
13631
13632@@ -980,6 +986,7 @@ ENTRY(camellia_ecb_dec_32way)
13633
13634 vzeroupper;
13635
13636+ pax_force_retaddr
13637 ret;
13638 ENDPROC(camellia_ecb_dec_32way)
13639
13640@@ -1046,6 +1053,7 @@ ENTRY(camellia_cbc_dec_32way)
13641
13642 vzeroupper;
13643
13644+ pax_force_retaddr
13645 ret;
13646 ENDPROC(camellia_cbc_dec_32way)
13647
13648@@ -1184,6 +1192,7 @@ ENTRY(camellia_ctr_32way)
13649
13650 vzeroupper;
13651
13652+ pax_force_retaddr
13653 ret;
13654 ENDPROC(camellia_ctr_32way)
13655
13656@@ -1349,6 +1358,7 @@ camellia_xts_crypt_32way:
13657
13658 vzeroupper;
13659
13660+ pax_force_retaddr
13661 ret;
13662 ENDPROC(camellia_xts_crypt_32way)
13663
13664diff --git a/arch/x86/crypto/camellia-x86_64-asm_64.S b/arch/x86/crypto/camellia-x86_64-asm_64.S
13665index 310319c..db3d7b5 100644
13666--- a/arch/x86/crypto/camellia-x86_64-asm_64.S
13667+++ b/arch/x86/crypto/camellia-x86_64-asm_64.S
13668@@ -21,6 +21,7 @@
13669 */
13670
13671 #include <linux/linkage.h>
13672+#include <asm/alternative-asm.h>
13673
13674 .file "camellia-x86_64-asm_64.S"
13675 .text
13676@@ -228,12 +229,14 @@ ENTRY(__camellia_enc_blk)
13677 enc_outunpack(mov, RT1);
13678
13679 movq RRBP, %rbp;
13680+ pax_force_retaddr
13681 ret;
13682
13683 .L__enc_xor:
13684 enc_outunpack(xor, RT1);
13685
13686 movq RRBP, %rbp;
13687+ pax_force_retaddr
13688 ret;
13689 ENDPROC(__camellia_enc_blk)
13690
13691@@ -272,6 +275,7 @@ ENTRY(camellia_dec_blk)
13692 dec_outunpack();
13693
13694 movq RRBP, %rbp;
13695+ pax_force_retaddr
13696 ret;
13697 ENDPROC(camellia_dec_blk)
13698
13699@@ -463,6 +467,7 @@ ENTRY(__camellia_enc_blk_2way)
13700
13701 movq RRBP, %rbp;
13702 popq %rbx;
13703+ pax_force_retaddr
13704 ret;
13705
13706 .L__enc2_xor:
13707@@ -470,6 +475,7 @@ ENTRY(__camellia_enc_blk_2way)
13708
13709 movq RRBP, %rbp;
13710 popq %rbx;
13711+ pax_force_retaddr
13712 ret;
13713 ENDPROC(__camellia_enc_blk_2way)
13714
13715@@ -510,5 +516,6 @@ ENTRY(camellia_dec_blk_2way)
13716
13717 movq RRBP, %rbp;
13718 movq RXOR, %rbx;
13719+ pax_force_retaddr
13720 ret;
13721 ENDPROC(camellia_dec_blk_2way)
13722diff --git a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13723index c35fd5d..2d8c7db 100644
13724--- a/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13725+++ b/arch/x86/crypto/cast5-avx-x86_64-asm_64.S
13726@@ -24,6 +24,7 @@
13727 */
13728
13729 #include <linux/linkage.h>
13730+#include <asm/alternative-asm.h>
13731
13732 .file "cast5-avx-x86_64-asm_64.S"
13733
13734@@ -281,6 +282,7 @@ __cast5_enc_blk16:
13735 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13736 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13737
13738+ pax_force_retaddr
13739 ret;
13740 ENDPROC(__cast5_enc_blk16)
13741
13742@@ -352,6 +354,7 @@ __cast5_dec_blk16:
13743 outunpack_blocks(RR3, RL3, RTMP, RX, RKM);
13744 outunpack_blocks(RR4, RL4, RTMP, RX, RKM);
13745
13746+ pax_force_retaddr
13747 ret;
13748
13749 .L__skip_dec:
13750@@ -388,6 +391,7 @@ ENTRY(cast5_ecb_enc_16way)
13751 vmovdqu RR4, (6*4*4)(%r11);
13752 vmovdqu RL4, (7*4*4)(%r11);
13753
13754+ pax_force_retaddr
13755 ret;
13756 ENDPROC(cast5_ecb_enc_16way)
13757
13758@@ -420,6 +424,7 @@ ENTRY(cast5_ecb_dec_16way)
13759 vmovdqu RR4, (6*4*4)(%r11);
13760 vmovdqu RL4, (7*4*4)(%r11);
13761
13762+ pax_force_retaddr
13763 ret;
13764 ENDPROC(cast5_ecb_dec_16way)
13765
13766@@ -430,10 +435,10 @@ ENTRY(cast5_cbc_dec_16way)
13767 * %rdx: src
13768 */
13769
13770- pushq %r12;
13771+ pushq %r14;
13772
13773 movq %rsi, %r11;
13774- movq %rdx, %r12;
13775+ movq %rdx, %r14;
13776
13777 vmovdqu (0*16)(%rdx), RL1;
13778 vmovdqu (1*16)(%rdx), RR1;
13779@@ -447,16 +452,16 @@ ENTRY(cast5_cbc_dec_16way)
13780 call __cast5_dec_blk16;
13781
13782 /* xor with src */
13783- vmovq (%r12), RX;
13784+ vmovq (%r14), RX;
13785 vpshufd $0x4f, RX, RX;
13786 vpxor RX, RR1, RR1;
13787- vpxor 0*16+8(%r12), RL1, RL1;
13788- vpxor 1*16+8(%r12), RR2, RR2;
13789- vpxor 2*16+8(%r12), RL2, RL2;
13790- vpxor 3*16+8(%r12), RR3, RR3;
13791- vpxor 4*16+8(%r12), RL3, RL3;
13792- vpxor 5*16+8(%r12), RR4, RR4;
13793- vpxor 6*16+8(%r12), RL4, RL4;
13794+ vpxor 0*16+8(%r14), RL1, RL1;
13795+ vpxor 1*16+8(%r14), RR2, RR2;
13796+ vpxor 2*16+8(%r14), RL2, RL2;
13797+ vpxor 3*16+8(%r14), RR3, RR3;
13798+ vpxor 4*16+8(%r14), RL3, RL3;
13799+ vpxor 5*16+8(%r14), RR4, RR4;
13800+ vpxor 6*16+8(%r14), RL4, RL4;
13801
13802 vmovdqu RR1, (0*16)(%r11);
13803 vmovdqu RL1, (1*16)(%r11);
13804@@ -467,8 +472,9 @@ ENTRY(cast5_cbc_dec_16way)
13805 vmovdqu RR4, (6*16)(%r11);
13806 vmovdqu RL4, (7*16)(%r11);
13807
13808- popq %r12;
13809+ popq %r14;
13810
13811+ pax_force_retaddr
13812 ret;
13813 ENDPROC(cast5_cbc_dec_16way)
13814
13815@@ -480,10 +486,10 @@ ENTRY(cast5_ctr_16way)
13816 * %rcx: iv (big endian, 64bit)
13817 */
13818
13819- pushq %r12;
13820+ pushq %r14;
13821
13822 movq %rsi, %r11;
13823- movq %rdx, %r12;
13824+ movq %rdx, %r14;
13825
13826 vpcmpeqd RTMP, RTMP, RTMP;
13827 vpsrldq $8, RTMP, RTMP; /* low: -1, high: 0 */
13828@@ -523,14 +529,14 @@ ENTRY(cast5_ctr_16way)
13829 call __cast5_enc_blk16;
13830
13831 /* dst = src ^ iv */
13832- vpxor (0*16)(%r12), RR1, RR1;
13833- vpxor (1*16)(%r12), RL1, RL1;
13834- vpxor (2*16)(%r12), RR2, RR2;
13835- vpxor (3*16)(%r12), RL2, RL2;
13836- vpxor (4*16)(%r12), RR3, RR3;
13837- vpxor (5*16)(%r12), RL3, RL3;
13838- vpxor (6*16)(%r12), RR4, RR4;
13839- vpxor (7*16)(%r12), RL4, RL4;
13840+ vpxor (0*16)(%r14), RR1, RR1;
13841+ vpxor (1*16)(%r14), RL1, RL1;
13842+ vpxor (2*16)(%r14), RR2, RR2;
13843+ vpxor (3*16)(%r14), RL2, RL2;
13844+ vpxor (4*16)(%r14), RR3, RR3;
13845+ vpxor (5*16)(%r14), RL3, RL3;
13846+ vpxor (6*16)(%r14), RR4, RR4;
13847+ vpxor (7*16)(%r14), RL4, RL4;
13848 vmovdqu RR1, (0*16)(%r11);
13849 vmovdqu RL1, (1*16)(%r11);
13850 vmovdqu RR2, (2*16)(%r11);
13851@@ -540,7 +546,8 @@ ENTRY(cast5_ctr_16way)
13852 vmovdqu RR4, (6*16)(%r11);
13853 vmovdqu RL4, (7*16)(%r11);
13854
13855- popq %r12;
13856+ popq %r14;
13857
13858+ pax_force_retaddr
13859 ret;
13860 ENDPROC(cast5_ctr_16way)
13861diff --git a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13862index e3531f8..e123f35 100644
13863--- a/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13864+++ b/arch/x86/crypto/cast6-avx-x86_64-asm_64.S
13865@@ -24,6 +24,7 @@
13866 */
13867
13868 #include <linux/linkage.h>
13869+#include <asm/alternative-asm.h>
13870 #include "glue_helper-asm-avx.S"
13871
13872 .file "cast6-avx-x86_64-asm_64.S"
13873@@ -295,6 +296,7 @@ __cast6_enc_blk8:
13874 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13875 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13876
13877+ pax_force_retaddr
13878 ret;
13879 ENDPROC(__cast6_enc_blk8)
13880
13881@@ -340,6 +342,7 @@ __cast6_dec_blk8:
13882 outunpack_blocks(RA1, RB1, RC1, RD1, RTMP, RX, RKRF, RKM);
13883 outunpack_blocks(RA2, RB2, RC2, RD2, RTMP, RX, RKRF, RKM);
13884
13885+ pax_force_retaddr
13886 ret;
13887 ENDPROC(__cast6_dec_blk8)
13888
13889@@ -358,6 +361,7 @@ ENTRY(cast6_ecb_enc_8way)
13890
13891 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13892
13893+ pax_force_retaddr
13894 ret;
13895 ENDPROC(cast6_ecb_enc_8way)
13896
13897@@ -376,6 +380,7 @@ ENTRY(cast6_ecb_dec_8way)
13898
13899 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13900
13901+ pax_force_retaddr
13902 ret;
13903 ENDPROC(cast6_ecb_dec_8way)
13904
13905@@ -386,19 +391,20 @@ ENTRY(cast6_cbc_dec_8way)
13906 * %rdx: src
13907 */
13908
13909- pushq %r12;
13910+ pushq %r14;
13911
13912 movq %rsi, %r11;
13913- movq %rdx, %r12;
13914+ movq %rdx, %r14;
13915
13916 load_8way(%rdx, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13917
13918 call __cast6_dec_blk8;
13919
13920- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13921+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13922
13923- popq %r12;
13924+ popq %r14;
13925
13926+ pax_force_retaddr
13927 ret;
13928 ENDPROC(cast6_cbc_dec_8way)
13929
13930@@ -410,20 +416,21 @@ ENTRY(cast6_ctr_8way)
13931 * %rcx: iv (little endian, 128bit)
13932 */
13933
13934- pushq %r12;
13935+ pushq %r14;
13936
13937 movq %rsi, %r11;
13938- movq %rdx, %r12;
13939+ movq %rdx, %r14;
13940
13941 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
13942 RD2, RX, RKR, RKM);
13943
13944 call __cast6_enc_blk8;
13945
13946- store_ctr_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13947+ store_ctr_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13948
13949- popq %r12;
13950+ popq %r14;
13951
13952+ pax_force_retaddr
13953 ret;
13954 ENDPROC(cast6_ctr_8way)
13955
13956@@ -446,6 +453,7 @@ ENTRY(cast6_xts_enc_8way)
13957 /* dst <= regs xor IVs(in dst) */
13958 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13959
13960+ pax_force_retaddr
13961 ret;
13962 ENDPROC(cast6_xts_enc_8way)
13963
13964@@ -468,5 +476,6 @@ ENTRY(cast6_xts_dec_8way)
13965 /* dst <= regs xor IVs(in dst) */
13966 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
13967
13968+ pax_force_retaddr
13969 ret;
13970 ENDPROC(cast6_xts_dec_8way)
13971diff --git a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13972index 26d49eb..c0a8c84 100644
13973--- a/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13974+++ b/arch/x86/crypto/crc32c-pcl-intel-asm_64.S
13975@@ -45,6 +45,7 @@
13976
13977 #include <asm/inst.h>
13978 #include <linux/linkage.h>
13979+#include <asm/alternative-asm.h>
13980
13981 ## ISCSI CRC 32 Implementation with crc32 and pclmulqdq Instruction
13982
13983@@ -309,6 +310,7 @@ do_return:
13984 popq %rsi
13985 popq %rdi
13986 popq %rbx
13987+ pax_force_retaddr
13988 ret
13989
13990 ################################################################
13991diff --git a/arch/x86/crypto/ghash-clmulni-intel_asm.S b/arch/x86/crypto/ghash-clmulni-intel_asm.S
13992index 5d1e007..098cb4f 100644
13993--- a/arch/x86/crypto/ghash-clmulni-intel_asm.S
13994+++ b/arch/x86/crypto/ghash-clmulni-intel_asm.S
13995@@ -18,6 +18,7 @@
13996
13997 #include <linux/linkage.h>
13998 #include <asm/inst.h>
13999+#include <asm/alternative-asm.h>
14000
14001 .data
14002
14003@@ -89,6 +90,7 @@ __clmul_gf128mul_ble:
14004 psrlq $1, T2
14005 pxor T2, T1
14006 pxor T1, DATA
14007+ pax_force_retaddr
14008 ret
14009 ENDPROC(__clmul_gf128mul_ble)
14010
14011@@ -101,6 +103,7 @@ ENTRY(clmul_ghash_mul)
14012 call __clmul_gf128mul_ble
14013 PSHUFB_XMM BSWAP DATA
14014 movups DATA, (%rdi)
14015+ pax_force_retaddr
14016 ret
14017 ENDPROC(clmul_ghash_mul)
14018
14019@@ -128,5 +131,6 @@ ENTRY(clmul_ghash_update)
14020 PSHUFB_XMM BSWAP DATA
14021 movups DATA, (%rdi)
14022 .Lupdate_just_ret:
14023+ pax_force_retaddr
14024 ret
14025 ENDPROC(clmul_ghash_update)
14026diff --git a/arch/x86/crypto/salsa20-x86_64-asm_64.S b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14027index 9279e0b..c4b3d2c 100644
14028--- a/arch/x86/crypto/salsa20-x86_64-asm_64.S
14029+++ b/arch/x86/crypto/salsa20-x86_64-asm_64.S
14030@@ -1,4 +1,5 @@
14031 #include <linux/linkage.h>
14032+#include <asm/alternative-asm.h>
14033
14034 # enter salsa20_encrypt_bytes
14035 ENTRY(salsa20_encrypt_bytes)
14036@@ -789,6 +790,7 @@ ENTRY(salsa20_encrypt_bytes)
14037 add %r11,%rsp
14038 mov %rdi,%rax
14039 mov %rsi,%rdx
14040+ pax_force_retaddr
14041 ret
14042 # bytesatleast65:
14043 ._bytesatleast65:
14044@@ -889,6 +891,7 @@ ENTRY(salsa20_keysetup)
14045 add %r11,%rsp
14046 mov %rdi,%rax
14047 mov %rsi,%rdx
14048+ pax_force_retaddr
14049 ret
14050 ENDPROC(salsa20_keysetup)
14051
14052@@ -914,5 +917,6 @@ ENTRY(salsa20_ivsetup)
14053 add %r11,%rsp
14054 mov %rdi,%rax
14055 mov %rsi,%rdx
14056+ pax_force_retaddr
14057 ret
14058 ENDPROC(salsa20_ivsetup)
14059diff --git a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14060index 2f202f4..d9164d6 100644
14061--- a/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14062+++ b/arch/x86/crypto/serpent-avx-x86_64-asm_64.S
14063@@ -24,6 +24,7 @@
14064 */
14065
14066 #include <linux/linkage.h>
14067+#include <asm/alternative-asm.h>
14068 #include "glue_helper-asm-avx.S"
14069
14070 .file "serpent-avx-x86_64-asm_64.S"
14071@@ -618,6 +619,7 @@ __serpent_enc_blk8_avx:
14072 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14073 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14074
14075+ pax_force_retaddr
14076 ret;
14077 ENDPROC(__serpent_enc_blk8_avx)
14078
14079@@ -672,6 +674,7 @@ __serpent_dec_blk8_avx:
14080 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14081 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14082
14083+ pax_force_retaddr
14084 ret;
14085 ENDPROC(__serpent_dec_blk8_avx)
14086
14087@@ -688,6 +691,7 @@ ENTRY(serpent_ecb_enc_8way_avx)
14088
14089 store_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14090
14091+ pax_force_retaddr
14092 ret;
14093 ENDPROC(serpent_ecb_enc_8way_avx)
14094
14095@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_8way_avx)
14096
14097 store_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14098
14099+ pax_force_retaddr
14100 ret;
14101 ENDPROC(serpent_ecb_dec_8way_avx)
14102
14103@@ -720,6 +725,7 @@ ENTRY(serpent_cbc_dec_8way_avx)
14104
14105 store_cbc_8way(%rdx, %rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14106
14107+ pax_force_retaddr
14108 ret;
14109 ENDPROC(serpent_cbc_dec_8way_avx)
14110
14111@@ -738,6 +744,7 @@ ENTRY(serpent_ctr_8way_avx)
14112
14113 store_ctr_8way(%rdx, %rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14114
14115+ pax_force_retaddr
14116 ret;
14117 ENDPROC(serpent_ctr_8way_avx)
14118
14119@@ -758,6 +765,7 @@ ENTRY(serpent_xts_enc_8way_avx)
14120 /* dst <= regs xor IVs(in dst) */
14121 store_xts_8way(%rsi, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14122
14123+ pax_force_retaddr
14124 ret;
14125 ENDPROC(serpent_xts_enc_8way_avx)
14126
14127@@ -778,5 +786,6 @@ ENTRY(serpent_xts_dec_8way_avx)
14128 /* dst <= regs xor IVs(in dst) */
14129 store_xts_8way(%rsi, RC1, RD1, RB1, RE1, RC2, RD2, RB2, RE2);
14130
14131+ pax_force_retaddr
14132 ret;
14133 ENDPROC(serpent_xts_dec_8way_avx)
14134diff --git a/arch/x86/crypto/serpent-avx2-asm_64.S b/arch/x86/crypto/serpent-avx2-asm_64.S
14135index b222085..abd483c 100644
14136--- a/arch/x86/crypto/serpent-avx2-asm_64.S
14137+++ b/arch/x86/crypto/serpent-avx2-asm_64.S
14138@@ -15,6 +15,7 @@
14139 */
14140
14141 #include <linux/linkage.h>
14142+#include <asm/alternative-asm.h>
14143 #include "glue_helper-asm-avx2.S"
14144
14145 .file "serpent-avx2-asm_64.S"
14146@@ -610,6 +611,7 @@ __serpent_enc_blk16:
14147 write_blocks(RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14148 write_blocks(RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14149
14150+ pax_force_retaddr
14151 ret;
14152 ENDPROC(__serpent_enc_blk16)
14153
14154@@ -664,6 +666,7 @@ __serpent_dec_blk16:
14155 write_blocks(RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14156 write_blocks(RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14157
14158+ pax_force_retaddr
14159 ret;
14160 ENDPROC(__serpent_dec_blk16)
14161
14162@@ -684,6 +687,7 @@ ENTRY(serpent_ecb_enc_16way)
14163
14164 vzeroupper;
14165
14166+ pax_force_retaddr
14167 ret;
14168 ENDPROC(serpent_ecb_enc_16way)
14169
14170@@ -704,6 +708,7 @@ ENTRY(serpent_ecb_dec_16way)
14171
14172 vzeroupper;
14173
14174+ pax_force_retaddr
14175 ret;
14176 ENDPROC(serpent_ecb_dec_16way)
14177
14178@@ -725,6 +730,7 @@ ENTRY(serpent_cbc_dec_16way)
14179
14180 vzeroupper;
14181
14182+ pax_force_retaddr
14183 ret;
14184 ENDPROC(serpent_cbc_dec_16way)
14185
14186@@ -748,6 +754,7 @@ ENTRY(serpent_ctr_16way)
14187
14188 vzeroupper;
14189
14190+ pax_force_retaddr
14191 ret;
14192 ENDPROC(serpent_ctr_16way)
14193
14194@@ -772,6 +779,7 @@ ENTRY(serpent_xts_enc_16way)
14195
14196 vzeroupper;
14197
14198+ pax_force_retaddr
14199 ret;
14200 ENDPROC(serpent_xts_enc_16way)
14201
14202@@ -796,5 +804,6 @@ ENTRY(serpent_xts_dec_16way)
14203
14204 vzeroupper;
14205
14206+ pax_force_retaddr
14207 ret;
14208 ENDPROC(serpent_xts_dec_16way)
14209diff --git a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14210index acc066c..1559cc4 100644
14211--- a/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14212+++ b/arch/x86/crypto/serpent-sse2-x86_64-asm_64.S
14213@@ -25,6 +25,7 @@
14214 */
14215
14216 #include <linux/linkage.h>
14217+#include <asm/alternative-asm.h>
14218
14219 .file "serpent-sse2-x86_64-asm_64.S"
14220 .text
14221@@ -690,12 +691,14 @@ ENTRY(__serpent_enc_blk_8way)
14222 write_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14223 write_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14224
14225+ pax_force_retaddr
14226 ret;
14227
14228 .L__enc_xor8:
14229 xor_blocks(%rsi, RA1, RB1, RC1, RD1, RK0, RK1, RK2);
14230 xor_blocks(%rax, RA2, RB2, RC2, RD2, RK0, RK1, RK2);
14231
14232+ pax_force_retaddr
14233 ret;
14234 ENDPROC(__serpent_enc_blk_8way)
14235
14236@@ -750,5 +753,6 @@ ENTRY(serpent_dec_blk_8way)
14237 write_blocks(%rsi, RC1, RD1, RB1, RE1, RK0, RK1, RK2);
14238 write_blocks(%rax, RC2, RD2, RB2, RE2, RK0, RK1, RK2);
14239
14240+ pax_force_retaddr
14241 ret;
14242 ENDPROC(serpent_dec_blk_8way)
14243diff --git a/arch/x86/crypto/sha1_ssse3_asm.S b/arch/x86/crypto/sha1_ssse3_asm.S
14244index a410950..9dfe7ad 100644
14245--- a/arch/x86/crypto/sha1_ssse3_asm.S
14246+++ b/arch/x86/crypto/sha1_ssse3_asm.S
14247@@ -29,6 +29,7 @@
14248 */
14249
14250 #include <linux/linkage.h>
14251+#include <asm/alternative-asm.h>
14252
14253 #define CTX %rdi // arg1
14254 #define BUF %rsi // arg2
14255@@ -75,9 +76,9 @@
14256
14257 push %rbx
14258 push %rbp
14259- push %r12
14260+ push %r14
14261
14262- mov %rsp, %r12
14263+ mov %rsp, %r14
14264 sub $64, %rsp # allocate workspace
14265 and $~15, %rsp # align stack
14266
14267@@ -99,11 +100,12 @@
14268 xor %rax, %rax
14269 rep stosq
14270
14271- mov %r12, %rsp # deallocate workspace
14272+ mov %r14, %rsp # deallocate workspace
14273
14274- pop %r12
14275+ pop %r14
14276 pop %rbp
14277 pop %rbx
14278+ pax_force_retaddr
14279 ret
14280
14281 ENDPROC(\name)
14282diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S
14283index 642f156..51a513c 100644
14284--- a/arch/x86/crypto/sha256-avx-asm.S
14285+++ b/arch/x86/crypto/sha256-avx-asm.S
14286@@ -49,6 +49,7 @@
14287
14288 #ifdef CONFIG_AS_AVX
14289 #include <linux/linkage.h>
14290+#include <asm/alternative-asm.h>
14291
14292 ## assume buffers not aligned
14293 #define VMOVDQ vmovdqu
14294@@ -460,6 +461,7 @@ done_hash:
14295 popq %r13
14296 popq %rbp
14297 popq %rbx
14298+ pax_force_retaddr
14299 ret
14300 ENDPROC(sha256_transform_avx)
14301
14302diff --git a/arch/x86/crypto/sha256-avx2-asm.S b/arch/x86/crypto/sha256-avx2-asm.S
14303index 9e86944..3795e6a 100644
14304--- a/arch/x86/crypto/sha256-avx2-asm.S
14305+++ b/arch/x86/crypto/sha256-avx2-asm.S
14306@@ -50,6 +50,7 @@
14307
14308 #ifdef CONFIG_AS_AVX2
14309 #include <linux/linkage.h>
14310+#include <asm/alternative-asm.h>
14311
14312 ## assume buffers not aligned
14313 #define VMOVDQ vmovdqu
14314@@ -720,6 +721,7 @@ done_hash:
14315 popq %r12
14316 popq %rbp
14317 popq %rbx
14318+ pax_force_retaddr
14319 ret
14320 ENDPROC(sha256_transform_rorx)
14321
14322diff --git a/arch/x86/crypto/sha256-ssse3-asm.S b/arch/x86/crypto/sha256-ssse3-asm.S
14323index f833b74..8c62a9e 100644
14324--- a/arch/x86/crypto/sha256-ssse3-asm.S
14325+++ b/arch/x86/crypto/sha256-ssse3-asm.S
14326@@ -47,6 +47,7 @@
14327 ########################################################################
14328
14329 #include <linux/linkage.h>
14330+#include <asm/alternative-asm.h>
14331
14332 ## assume buffers not aligned
14333 #define MOVDQ movdqu
14334@@ -471,6 +472,7 @@ done_hash:
14335 popq %rbp
14336 popq %rbx
14337
14338+ pax_force_retaddr
14339 ret
14340 ENDPROC(sha256_transform_ssse3)
14341
14342diff --git a/arch/x86/crypto/sha512-avx-asm.S b/arch/x86/crypto/sha512-avx-asm.S
14343index 974dde9..a823ff9 100644
14344--- a/arch/x86/crypto/sha512-avx-asm.S
14345+++ b/arch/x86/crypto/sha512-avx-asm.S
14346@@ -49,6 +49,7 @@
14347
14348 #ifdef CONFIG_AS_AVX
14349 #include <linux/linkage.h>
14350+#include <asm/alternative-asm.h>
14351
14352 .text
14353
14354@@ -364,6 +365,7 @@ updateblock:
14355 mov frame_RSPSAVE(%rsp), %rsp
14356
14357 nowork:
14358+ pax_force_retaddr
14359 ret
14360 ENDPROC(sha512_transform_avx)
14361
14362diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S
14363index 568b961..ed20c37 100644
14364--- a/arch/x86/crypto/sha512-avx2-asm.S
14365+++ b/arch/x86/crypto/sha512-avx2-asm.S
14366@@ -51,6 +51,7 @@
14367
14368 #ifdef CONFIG_AS_AVX2
14369 #include <linux/linkage.h>
14370+#include <asm/alternative-asm.h>
14371
14372 .text
14373
14374@@ -678,6 +679,7 @@ done_hash:
14375
14376 # Restore Stack Pointer
14377 mov frame_RSPSAVE(%rsp), %rsp
14378+ pax_force_retaddr
14379 ret
14380 ENDPROC(sha512_transform_rorx)
14381
14382diff --git a/arch/x86/crypto/sha512-ssse3-asm.S b/arch/x86/crypto/sha512-ssse3-asm.S
14383index fb56855..6edd768 100644
14384--- a/arch/x86/crypto/sha512-ssse3-asm.S
14385+++ b/arch/x86/crypto/sha512-ssse3-asm.S
14386@@ -48,6 +48,7 @@
14387 ########################################################################
14388
14389 #include <linux/linkage.h>
14390+#include <asm/alternative-asm.h>
14391
14392 .text
14393
14394@@ -363,6 +364,7 @@ updateblock:
14395 mov frame_RSPSAVE(%rsp), %rsp
14396
14397 nowork:
14398+ pax_force_retaddr
14399 ret
14400 ENDPROC(sha512_transform_ssse3)
14401
14402diff --git a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14403index 0505813..b067311 100644
14404--- a/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14405+++ b/arch/x86/crypto/twofish-avx-x86_64-asm_64.S
14406@@ -24,6 +24,7 @@
14407 */
14408
14409 #include <linux/linkage.h>
14410+#include <asm/alternative-asm.h>
14411 #include "glue_helper-asm-avx.S"
14412
14413 .file "twofish-avx-x86_64-asm_64.S"
14414@@ -284,6 +285,7 @@ __twofish_enc_blk8:
14415 outunpack_blocks(RC1, RD1, RA1, RB1, RK1, RX0, RY0, RK2);
14416 outunpack_blocks(RC2, RD2, RA2, RB2, RK1, RX0, RY0, RK2);
14417
14418+ pax_force_retaddr
14419 ret;
14420 ENDPROC(__twofish_enc_blk8)
14421
14422@@ -324,6 +326,7 @@ __twofish_dec_blk8:
14423 outunpack_blocks(RA1, RB1, RC1, RD1, RK1, RX0, RY0, RK2);
14424 outunpack_blocks(RA2, RB2, RC2, RD2, RK1, RX0, RY0, RK2);
14425
14426+ pax_force_retaddr
14427 ret;
14428 ENDPROC(__twofish_dec_blk8)
14429
14430@@ -342,6 +345,7 @@ ENTRY(twofish_ecb_enc_8way)
14431
14432 store_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14433
14434+ pax_force_retaddr
14435 ret;
14436 ENDPROC(twofish_ecb_enc_8way)
14437
14438@@ -360,6 +364,7 @@ ENTRY(twofish_ecb_dec_8way)
14439
14440 store_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14441
14442+ pax_force_retaddr
14443 ret;
14444 ENDPROC(twofish_ecb_dec_8way)
14445
14446@@ -370,19 +375,20 @@ ENTRY(twofish_cbc_dec_8way)
14447 * %rdx: src
14448 */
14449
14450- pushq %r12;
14451+ pushq %r14;
14452
14453 movq %rsi, %r11;
14454- movq %rdx, %r12;
14455+ movq %rdx, %r14;
14456
14457 load_8way(%rdx, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14458
14459 call __twofish_dec_blk8;
14460
14461- store_cbc_8way(%r12, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14462+ store_cbc_8way(%r14, %r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14463
14464- popq %r12;
14465+ popq %r14;
14466
14467+ pax_force_retaddr
14468 ret;
14469 ENDPROC(twofish_cbc_dec_8way)
14470
14471@@ -394,20 +400,21 @@ ENTRY(twofish_ctr_8way)
14472 * %rcx: iv (little endian, 128bit)
14473 */
14474
14475- pushq %r12;
14476+ pushq %r14;
14477
14478 movq %rsi, %r11;
14479- movq %rdx, %r12;
14480+ movq %rdx, %r14;
14481
14482 load_ctr_8way(%rcx, .Lbswap128_mask, RA1, RB1, RC1, RD1, RA2, RB2, RC2,
14483 RD2, RX0, RX1, RY0);
14484
14485 call __twofish_enc_blk8;
14486
14487- store_ctr_8way(%r12, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14488+ store_ctr_8way(%r14, %r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14489
14490- popq %r12;
14491+ popq %r14;
14492
14493+ pax_force_retaddr
14494 ret;
14495 ENDPROC(twofish_ctr_8way)
14496
14497@@ -430,6 +437,7 @@ ENTRY(twofish_xts_enc_8way)
14498 /* dst <= regs xor IVs(in dst) */
14499 store_xts_8way(%r11, RC1, RD1, RA1, RB1, RC2, RD2, RA2, RB2);
14500
14501+ pax_force_retaddr
14502 ret;
14503 ENDPROC(twofish_xts_enc_8way)
14504
14505@@ -452,5 +460,6 @@ ENTRY(twofish_xts_dec_8way)
14506 /* dst <= regs xor IVs(in dst) */
14507 store_xts_8way(%r11, RA1, RB1, RC1, RD1, RA2, RB2, RC2, RD2);
14508
14509+ pax_force_retaddr
14510 ret;
14511 ENDPROC(twofish_xts_dec_8way)
14512diff --git a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14513index 1c3b7ce..02f578d 100644
14514--- a/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14515+++ b/arch/x86/crypto/twofish-x86_64-asm_64-3way.S
14516@@ -21,6 +21,7 @@
14517 */
14518
14519 #include <linux/linkage.h>
14520+#include <asm/alternative-asm.h>
14521
14522 .file "twofish-x86_64-asm-3way.S"
14523 .text
14524@@ -258,6 +259,7 @@ ENTRY(__twofish_enc_blk_3way)
14525 popq %r13;
14526 popq %r14;
14527 popq %r15;
14528+ pax_force_retaddr
14529 ret;
14530
14531 .L__enc_xor3:
14532@@ -269,6 +271,7 @@ ENTRY(__twofish_enc_blk_3way)
14533 popq %r13;
14534 popq %r14;
14535 popq %r15;
14536+ pax_force_retaddr
14537 ret;
14538 ENDPROC(__twofish_enc_blk_3way)
14539
14540@@ -308,5 +311,6 @@ ENTRY(twofish_dec_blk_3way)
14541 popq %r13;
14542 popq %r14;
14543 popq %r15;
14544+ pax_force_retaddr
14545 ret;
14546 ENDPROC(twofish_dec_blk_3way)
14547diff --git a/arch/x86/crypto/twofish-x86_64-asm_64.S b/arch/x86/crypto/twofish-x86_64-asm_64.S
14548index a039d21..524b8b2 100644
14549--- a/arch/x86/crypto/twofish-x86_64-asm_64.S
14550+++ b/arch/x86/crypto/twofish-x86_64-asm_64.S
14551@@ -22,6 +22,7 @@
14552
14553 #include <linux/linkage.h>
14554 #include <asm/asm-offsets.h>
14555+#include <asm/alternative-asm.h>
14556
14557 #define a_offset 0
14558 #define b_offset 4
14559@@ -265,6 +266,7 @@ ENTRY(twofish_enc_blk)
14560
14561 popq R1
14562 movq $1,%rax
14563+ pax_force_retaddr
14564 ret
14565 ENDPROC(twofish_enc_blk)
14566
14567@@ -317,5 +319,6 @@ ENTRY(twofish_dec_blk)
14568
14569 popq R1
14570 movq $1,%rax
14571+ pax_force_retaddr
14572 ret
14573 ENDPROC(twofish_dec_blk)
14574diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c
14575index ae6aad1..719d6d9 100644
14576--- a/arch/x86/ia32/ia32_aout.c
14577+++ b/arch/x86/ia32/ia32_aout.c
14578@@ -153,6 +153,8 @@ static int aout_core_dump(struct coredump_params *cprm)
14579 unsigned long dump_start, dump_size;
14580 struct user32 dump;
14581
14582+ memset(&dump, 0, sizeof(dump));
14583+
14584 fs = get_fs();
14585 set_fs(KERNEL_DS);
14586 has_dumped = 1;
14587diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
14588index d0165c9..0d5639b 100644
14589--- a/arch/x86/ia32/ia32_signal.c
14590+++ b/arch/x86/ia32/ia32_signal.c
14591@@ -218,7 +218,7 @@ asmlinkage long sys32_sigreturn(void)
14592 if (__get_user(set.sig[0], &frame->sc.oldmask)
14593 || (_COMPAT_NSIG_WORDS > 1
14594 && __copy_from_user((((char *) &set.sig) + 4),
14595- &frame->extramask,
14596+ frame->extramask,
14597 sizeof(frame->extramask))))
14598 goto badframe;
14599
14600@@ -338,7 +338,7 @@ static void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
14601 sp -= frame_size;
14602 /* Align the stack pointer according to the i386 ABI,
14603 * i.e. so that on function entry ((sp + 4) & 15) == 0. */
14604- sp = ((sp + 4) & -16ul) - 4;
14605+ sp = ((sp - 12) & -16ul) - 4;
14606 return (void __user *) sp;
14607 }
14608
14609@@ -383,10 +383,10 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14610 } else {
14611 /* Return stub is in 32bit vsyscall page */
14612 if (current->mm->context.vdso)
14613- restorer = current->mm->context.vdso +
14614- selected_vdso32->sym___kernel_sigreturn;
14615+ restorer = (void __force_user *)(current->mm->context.vdso +
14616+ selected_vdso32->sym___kernel_sigreturn);
14617 else
14618- restorer = &frame->retcode;
14619+ restorer = frame->retcode;
14620 }
14621
14622 put_user_try {
14623@@ -396,7 +396,7 @@ int ia32_setup_frame(int sig, struct ksignal *ksig,
14624 * These are actually not used anymore, but left because some
14625 * gdb versions depend on them as a marker.
14626 */
14627- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14628+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14629 } put_user_catch(err);
14630
14631 if (err)
14632@@ -438,7 +438,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14633 0xb8,
14634 __NR_ia32_rt_sigreturn,
14635 0x80cd,
14636- 0,
14637+ 0
14638 };
14639
14640 frame = get_sigframe(ksig, regs, sizeof(*frame), &fpstate);
14641@@ -461,16 +461,19 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
14642
14643 if (ksig->ka.sa.sa_flags & SA_RESTORER)
14644 restorer = ksig->ka.sa.sa_restorer;
14645+ else if (current->mm->context.vdso)
14646+ /* Return stub is in 32bit vsyscall page */
14647+ restorer = (void __force_user *)(current->mm->context.vdso +
14648+ selected_vdso32->sym___kernel_rt_sigreturn);
14649 else
14650- restorer = current->mm->context.vdso +
14651- selected_vdso32->sym___kernel_rt_sigreturn;
14652+ restorer = frame->retcode;
14653 put_user_ex(ptr_to_compat(restorer), &frame->pretcode);
14654
14655 /*
14656 * Not actually used anymore, but left because some gdb
14657 * versions need it.
14658 */
14659- put_user_ex(*((u64 *)&code), (u64 __user *)frame->retcode);
14660+ put_user_ex(*((const u64 *)&code), (u64 __user *)frame->retcode);
14661 } put_user_catch(err);
14662
14663 err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
14664diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
14665index 156ebca..9591cf0 100644
14666--- a/arch/x86/ia32/ia32entry.S
14667+++ b/arch/x86/ia32/ia32entry.S
14668@@ -15,8 +15,10 @@
14669 #include <asm/irqflags.h>
14670 #include <asm/asm.h>
14671 #include <asm/smap.h>
14672+#include <asm/pgtable.h>
14673 #include <linux/linkage.h>
14674 #include <linux/err.h>
14675+#include <asm/alternative-asm.h>
14676
14677 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
14678 #include <linux/elf-em.h>
14679@@ -62,12 +64,12 @@
14680 */
14681 .macro LOAD_ARGS32 offset, _r9=0
14682 .if \_r9
14683- movl \offset+16(%rsp),%r9d
14684+ movl \offset+R9(%rsp),%r9d
14685 .endif
14686- movl \offset+40(%rsp),%ecx
14687- movl \offset+48(%rsp),%edx
14688- movl \offset+56(%rsp),%esi
14689- movl \offset+64(%rsp),%edi
14690+ movl \offset+RCX(%rsp),%ecx
14691+ movl \offset+RDX(%rsp),%edx
14692+ movl \offset+RSI(%rsp),%esi
14693+ movl \offset+RDI(%rsp),%edi
14694 movl %eax,%eax /* zero extension */
14695 .endm
14696
14697@@ -96,6 +98,32 @@ ENTRY(native_irq_enable_sysexit)
14698 ENDPROC(native_irq_enable_sysexit)
14699 #endif
14700
14701+ .macro pax_enter_kernel_user
14702+ pax_set_fptr_mask
14703+#ifdef CONFIG_PAX_MEMORY_UDEREF
14704+ call pax_enter_kernel_user
14705+#endif
14706+ .endm
14707+
14708+ .macro pax_exit_kernel_user
14709+#ifdef CONFIG_PAX_MEMORY_UDEREF
14710+ call pax_exit_kernel_user
14711+#endif
14712+#ifdef CONFIG_PAX_RANDKSTACK
14713+ pushq %rax
14714+ pushq %r11
14715+ call pax_randomize_kstack
14716+ popq %r11
14717+ popq %rax
14718+#endif
14719+ .endm
14720+
14721+ .macro pax_erase_kstack
14722+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
14723+ call pax_erase_kstack
14724+#endif
14725+ .endm
14726+
14727 /*
14728 * 32bit SYSENTER instruction entry.
14729 *
14730@@ -122,12 +150,6 @@ ENTRY(ia32_sysenter_target)
14731 CFI_REGISTER rsp,rbp
14732 SWAPGS_UNSAFE_STACK
14733 movq PER_CPU_VAR(kernel_stack), %rsp
14734- addq $(KERNEL_STACK_OFFSET),%rsp
14735- /*
14736- * No need to follow this irqs on/off section: the syscall
14737- * disabled irqs, here we enable it straight after entry:
14738- */
14739- ENABLE_INTERRUPTS(CLBR_NONE)
14740 movl %ebp,%ebp /* zero extension */
14741 pushq_cfi $__USER32_DS
14742 /*CFI_REL_OFFSET ss,0*/
14743@@ -135,23 +157,46 @@ ENTRY(ia32_sysenter_target)
14744 CFI_REL_OFFSET rsp,0
14745 pushfq_cfi
14746 /*CFI_REL_OFFSET rflags,0*/
14747- movl TI_sysenter_return+THREAD_INFO(%rsp,3*8-KERNEL_STACK_OFFSET),%r10d
14748- CFI_REGISTER rip,r10
14749+ orl $X86_EFLAGS_IF,(%rsp)
14750+ GET_THREAD_INFO(%r11)
14751+ movl TI_sysenter_return(%r11), %r11d
14752+ CFI_REGISTER rip,r11
14753 pushq_cfi $__USER32_CS
14754 /*CFI_REL_OFFSET cs,0*/
14755 movl %eax, %eax
14756- pushq_cfi %r10
14757+ pushq_cfi %r11
14758 CFI_REL_OFFSET rip,0
14759 pushq_cfi %rax
14760 cld
14761 SAVE_ARGS 0,1,0
14762+ pax_enter_kernel_user
14763+
14764+#ifdef CONFIG_PAX_RANDKSTACK
14765+ pax_erase_kstack
14766+#endif
14767+
14768+ /*
14769+ * No need to follow this irqs on/off section: the syscall
14770+ * disabled irqs, here we enable it straight after entry:
14771+ */
14772+ ENABLE_INTERRUPTS(CLBR_NONE)
14773 /* no need to do an access_ok check here because rbp has been
14774 32bit zero extended */
14775+
14776+#ifdef CONFIG_PAX_MEMORY_UDEREF
14777+ addq pax_user_shadow_base,%rbp
14778+ ASM_PAX_OPEN_USERLAND
14779+#endif
14780+
14781 ASM_STAC
14782 1: movl (%rbp),%ebp
14783 _ASM_EXTABLE(1b,ia32_badarg)
14784 ASM_CLAC
14785
14786+#ifdef CONFIG_PAX_MEMORY_UDEREF
14787+ ASM_PAX_CLOSE_USERLAND
14788+#endif
14789+
14790 /*
14791 * Sysenter doesn't filter flags, so we need to clear NT
14792 * ourselves. To save a few cycles, we can check whether
14793@@ -161,8 +206,9 @@ ENTRY(ia32_sysenter_target)
14794 jnz sysenter_fix_flags
14795 sysenter_flags_fixed:
14796
14797- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14798- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14799+ GET_THREAD_INFO(%r11)
14800+ orl $TS_COMPAT,TI_status(%r11)
14801+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14802 CFI_REMEMBER_STATE
14803 jnz sysenter_tracesys
14804 cmpq $(IA32_NR_syscalls-1),%rax
14805@@ -172,14 +218,17 @@ sysenter_do_call:
14806 sysenter_dispatch:
14807 call *ia32_sys_call_table(,%rax,8)
14808 movq %rax,RAX-ARGOFFSET(%rsp)
14809+ GET_THREAD_INFO(%r11)
14810 DISABLE_INTERRUPTS(CLBR_NONE)
14811 TRACE_IRQS_OFF
14812- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14813+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14814 jnz sysexit_audit
14815 sysexit_from_sys_call:
14816- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14817+ pax_exit_kernel_user
14818+ pax_erase_kstack
14819+ andl $~TS_COMPAT,TI_status(%r11)
14820 /* clear IF, that popfq doesn't enable interrupts early */
14821- andl $~0x200,EFLAGS-ARGOFFSET(%rsp)
14822+ andl $~X86_EFLAGS_IF,EFLAGS-ARGOFFSET(%rsp)
14823 movl RIP-ARGOFFSET(%rsp),%edx /* User %eip */
14824 CFI_REGISTER rip,rdx
14825 RESTORE_ARGS 0,24,0,0,0,0
14826@@ -205,6 +254,9 @@ sysexit_from_sys_call:
14827 movl %ebx,%esi /* 2nd arg: 1st syscall arg */
14828 movl %eax,%edi /* 1st arg: syscall number */
14829 call __audit_syscall_entry
14830+
14831+ pax_erase_kstack
14832+
14833 movl RAX-ARGOFFSET(%rsp),%eax /* reload syscall number */
14834 cmpq $(IA32_NR_syscalls-1),%rax
14835 ja ia32_badsys
14836@@ -216,7 +268,7 @@ sysexit_from_sys_call:
14837 .endm
14838
14839 .macro auditsys_exit exit
14840- testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14841+ testl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14842 jnz ia32_ret_from_sys_call
14843 TRACE_IRQS_ON
14844 ENABLE_INTERRUPTS(CLBR_NONE)
14845@@ -227,11 +279,12 @@ sysexit_from_sys_call:
14846 1: setbe %al /* 1 if error, 0 if not */
14847 movzbl %al,%edi /* zero-extend that into %edi */
14848 call __audit_syscall_exit
14849+ GET_THREAD_INFO(%r11)
14850 movq RAX-ARGOFFSET(%rsp),%rax /* reload syscall return value */
14851 movl $(_TIF_ALLWORK_MASK & ~_TIF_SYSCALL_AUDIT),%edi
14852 DISABLE_INTERRUPTS(CLBR_NONE)
14853 TRACE_IRQS_OFF
14854- testl %edi,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14855+ testl %edi,TI_flags(%r11)
14856 jz \exit
14857 CLEAR_RREGS -ARGOFFSET
14858 jmp int_with_check
14859@@ -253,7 +306,7 @@ sysenter_fix_flags:
14860
14861 sysenter_tracesys:
14862 #ifdef CONFIG_AUDITSYSCALL
14863- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14864+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14865 jz sysenter_auditsys
14866 #endif
14867 SAVE_REST
14868@@ -265,6 +318,9 @@ sysenter_tracesys:
14869 RESTORE_REST
14870 cmpq $(IA32_NR_syscalls-1),%rax
14871 ja int_ret_from_sys_call /* sysenter_tracesys has set RAX(%rsp) */
14872+
14873+ pax_erase_kstack
14874+
14875 jmp sysenter_do_call
14876 CFI_ENDPROC
14877 ENDPROC(ia32_sysenter_target)
14878@@ -292,19 +348,25 @@ ENDPROC(ia32_sysenter_target)
14879 ENTRY(ia32_cstar_target)
14880 CFI_STARTPROC32 simple
14881 CFI_SIGNAL_FRAME
14882- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
14883+ CFI_DEF_CFA rsp,0
14884 CFI_REGISTER rip,rcx
14885 /*CFI_REGISTER rflags,r11*/
14886 SWAPGS_UNSAFE_STACK
14887 movl %esp,%r8d
14888 CFI_REGISTER rsp,r8
14889 movq PER_CPU_VAR(kernel_stack),%rsp
14890+ SAVE_ARGS 8*6,0,0
14891+ pax_enter_kernel_user
14892+
14893+#ifdef CONFIG_PAX_RANDKSTACK
14894+ pax_erase_kstack
14895+#endif
14896+
14897 /*
14898 * No need to follow this irqs on/off section: the syscall
14899 * disabled irqs and here we enable it straight after entry:
14900 */
14901 ENABLE_INTERRUPTS(CLBR_NONE)
14902- SAVE_ARGS 8,0,0
14903 movl %eax,%eax /* zero extension */
14904 movq %rax,ORIG_RAX-ARGOFFSET(%rsp)
14905 movq %rcx,RIP-ARGOFFSET(%rsp)
14906@@ -320,12 +382,25 @@ ENTRY(ia32_cstar_target)
14907 /* no need to do an access_ok check here because r8 has been
14908 32bit zero extended */
14909 /* hardware stack frame is complete now */
14910+
14911+#ifdef CONFIG_PAX_MEMORY_UDEREF
14912+ ASM_PAX_OPEN_USERLAND
14913+ movq pax_user_shadow_base,%r8
14914+ addq RSP-ARGOFFSET(%rsp),%r8
14915+#endif
14916+
14917 ASM_STAC
14918 1: movl (%r8),%r9d
14919 _ASM_EXTABLE(1b,ia32_badarg)
14920 ASM_CLAC
14921- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14922- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14923+
14924+#ifdef CONFIG_PAX_MEMORY_UDEREF
14925+ ASM_PAX_CLOSE_USERLAND
14926+#endif
14927+
14928+ GET_THREAD_INFO(%r11)
14929+ orl $TS_COMPAT,TI_status(%r11)
14930+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
14931 CFI_REMEMBER_STATE
14932 jnz cstar_tracesys
14933 cmpq $IA32_NR_syscalls-1,%rax
14934@@ -335,13 +410,16 @@ cstar_do_call:
14935 cstar_dispatch:
14936 call *ia32_sys_call_table(,%rax,8)
14937 movq %rax,RAX-ARGOFFSET(%rsp)
14938+ GET_THREAD_INFO(%r11)
14939 DISABLE_INTERRUPTS(CLBR_NONE)
14940 TRACE_IRQS_OFF
14941- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14942+ testl $_TIF_ALLWORK_MASK,TI_flags(%r11)
14943 jnz sysretl_audit
14944 sysretl_from_sys_call:
14945- andl $~TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14946- RESTORE_ARGS 0,-ARG_SKIP,0,0,0
14947+ pax_exit_kernel_user
14948+ pax_erase_kstack
14949+ andl $~TS_COMPAT,TI_status(%r11)
14950+ RESTORE_ARGS 0,-ORIG_RAX,0,0,0
14951 movl RIP-ARGOFFSET(%rsp),%ecx
14952 CFI_REGISTER rip,rcx
14953 movl EFLAGS-ARGOFFSET(%rsp),%r11d
14954@@ -368,7 +446,7 @@ sysretl_audit:
14955
14956 cstar_tracesys:
14957 #ifdef CONFIG_AUDITSYSCALL
14958- testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14959+ testl $(_TIF_WORK_SYSCALL_ENTRY & ~_TIF_SYSCALL_AUDIT),TI_flags(%r11)
14960 jz cstar_auditsys
14961 #endif
14962 xchgl %r9d,%ebp
14963@@ -382,11 +460,19 @@ cstar_tracesys:
14964 xchgl %ebp,%r9d
14965 cmpq $(IA32_NR_syscalls-1),%rax
14966 ja int_ret_from_sys_call /* cstar_tracesys has set RAX(%rsp) */
14967+
14968+ pax_erase_kstack
14969+
14970 jmp cstar_do_call
14971 END(ia32_cstar_target)
14972
14973 ia32_badarg:
14974 ASM_CLAC
14975+
14976+#ifdef CONFIG_PAX_MEMORY_UDEREF
14977+ ASM_PAX_CLOSE_USERLAND
14978+#endif
14979+
14980 movq $-EFAULT,%rax
14981 jmp ia32_sysret
14982 CFI_ENDPROC
14983@@ -423,19 +509,26 @@ ENTRY(ia32_syscall)
14984 CFI_REL_OFFSET rip,RIP-RIP
14985 PARAVIRT_ADJUST_EXCEPTION_FRAME
14986 SWAPGS
14987- /*
14988- * No need to follow this irqs on/off section: the syscall
14989- * disabled irqs and here we enable it straight after entry:
14990- */
14991- ENABLE_INTERRUPTS(CLBR_NONE)
14992 movl %eax,%eax
14993 pushq_cfi %rax
14994 cld
14995 /* note the registers are not zero extended to the sf.
14996 this could be a problem. */
14997 SAVE_ARGS 0,1,0
14998- orl $TS_COMPAT,TI_status+THREAD_INFO(%rsp,RIP-ARGOFFSET)
14999- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
15000+ pax_enter_kernel_user
15001+
15002+#ifdef CONFIG_PAX_RANDKSTACK
15003+ pax_erase_kstack
15004+#endif
15005+
15006+ /*
15007+ * No need to follow this irqs on/off section: the syscall
15008+ * disabled irqs and here we enable it straight after entry:
15009+ */
15010+ ENABLE_INTERRUPTS(CLBR_NONE)
15011+ GET_THREAD_INFO(%r11)
15012+ orl $TS_COMPAT,TI_status(%r11)
15013+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%r11)
15014 jnz ia32_tracesys
15015 cmpq $(IA32_NR_syscalls-1),%rax
15016 ja ia32_badsys
15017@@ -458,6 +551,9 @@ ia32_tracesys:
15018 RESTORE_REST
15019 cmpq $(IA32_NR_syscalls-1),%rax
15020 ja int_ret_from_sys_call /* ia32_tracesys has set RAX(%rsp) */
15021+
15022+ pax_erase_kstack
15023+
15024 jmp ia32_do_call
15025 END(ia32_syscall)
15026
15027diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c
15028index 8e0ceec..af13504 100644
15029--- a/arch/x86/ia32/sys_ia32.c
15030+++ b/arch/x86/ia32/sys_ia32.c
15031@@ -69,8 +69,8 @@ asmlinkage long sys32_ftruncate64(unsigned int fd, unsigned long offset_low,
15032 */
15033 static int cp_stat64(struct stat64 __user *ubuf, struct kstat *stat)
15034 {
15035- typeof(ubuf->st_uid) uid = 0;
15036- typeof(ubuf->st_gid) gid = 0;
15037+ typeof(((struct stat64 *)0)->st_uid) uid = 0;
15038+ typeof(((struct stat64 *)0)->st_gid) gid = 0;
15039 SET_UID(uid, from_kuid_munged(current_user_ns(), stat->uid));
15040 SET_GID(gid, from_kgid_munged(current_user_ns(), stat->gid));
15041 if (!access_ok(VERIFY_WRITE, ubuf, sizeof(struct stat64)) ||
15042diff --git a/arch/x86/include/asm/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
15043index 372231c..51b537d 100644
15044--- a/arch/x86/include/asm/alternative-asm.h
15045+++ b/arch/x86/include/asm/alternative-asm.h
15046@@ -18,6 +18,45 @@
15047 .endm
15048 #endif
15049
15050+#ifdef KERNEXEC_PLUGIN
15051+ .macro pax_force_retaddr_bts rip=0
15052+ btsq $63,\rip(%rsp)
15053+ .endm
15054+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
15055+ .macro pax_force_retaddr rip=0, reload=0
15056+ btsq $63,\rip(%rsp)
15057+ .endm
15058+ .macro pax_force_fptr ptr
15059+ btsq $63,\ptr
15060+ .endm
15061+ .macro pax_set_fptr_mask
15062+ .endm
15063+#endif
15064+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
15065+ .macro pax_force_retaddr rip=0, reload=0
15066+ .if \reload
15067+ pax_set_fptr_mask
15068+ .endif
15069+ orq %r12,\rip(%rsp)
15070+ .endm
15071+ .macro pax_force_fptr ptr
15072+ orq %r12,\ptr
15073+ .endm
15074+ .macro pax_set_fptr_mask
15075+ movabs $0x8000000000000000,%r12
15076+ .endm
15077+#endif
15078+#else
15079+ .macro pax_force_retaddr rip=0, reload=0
15080+ .endm
15081+ .macro pax_force_fptr ptr
15082+ .endm
15083+ .macro pax_force_retaddr_bts rip=0
15084+ .endm
15085+ .macro pax_set_fptr_mask
15086+ .endm
15087+#endif
15088+
15089 .macro altinstruction_entry orig alt feature orig_len alt_len
15090 .long \orig - .
15091 .long \alt - .
15092diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
15093index 473bdbe..b1e3377 100644
15094--- a/arch/x86/include/asm/alternative.h
15095+++ b/arch/x86/include/asm/alternative.h
15096@@ -106,7 +106,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15097 ".pushsection .discard,\"aw\",@progbits\n" \
15098 DISCARD_ENTRY(1) \
15099 ".popsection\n" \
15100- ".pushsection .altinstr_replacement, \"ax\"\n" \
15101+ ".pushsection .altinstr_replacement, \"a\"\n" \
15102 ALTINSTR_REPLACEMENT(newinstr, feature, 1) \
15103 ".popsection"
15104
15105@@ -120,7 +120,7 @@ static inline int alternatives_text_reserved(void *start, void *end)
15106 DISCARD_ENTRY(1) \
15107 DISCARD_ENTRY(2) \
15108 ".popsection\n" \
15109- ".pushsection .altinstr_replacement, \"ax\"\n" \
15110+ ".pushsection .altinstr_replacement, \"a\"\n" \
15111 ALTINSTR_REPLACEMENT(newinstr1, feature1, 1) \
15112 ALTINSTR_REPLACEMENT(newinstr2, feature2, 2) \
15113 ".popsection"
15114diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
15115index efc3b22..85c4f3a 100644
15116--- a/arch/x86/include/asm/apic.h
15117+++ b/arch/x86/include/asm/apic.h
15118@@ -45,7 +45,7 @@ static inline void generic_apic_probe(void)
15119
15120 #ifdef CONFIG_X86_LOCAL_APIC
15121
15122-extern unsigned int apic_verbosity;
15123+extern int apic_verbosity;
15124 extern int local_apic_timer_c2_ok;
15125
15126 extern int disable_apic;
15127diff --git a/arch/x86/include/asm/apm.h b/arch/x86/include/asm/apm.h
15128index 20370c6..a2eb9b0 100644
15129--- a/arch/x86/include/asm/apm.h
15130+++ b/arch/x86/include/asm/apm.h
15131@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 func, u32 ebx_in, u32 ecx_in,
15132 __asm__ __volatile__(APM_DO_ZERO_SEGS
15133 "pushl %%edi\n\t"
15134 "pushl %%ebp\n\t"
15135- "lcall *%%cs:apm_bios_entry\n\t"
15136+ "lcall *%%ss:apm_bios_entry\n\t"
15137 "setc %%al\n\t"
15138 "popl %%ebp\n\t"
15139 "popl %%edi\n\t"
15140@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_asm(u32 func, u32 ebx_in,
15141 __asm__ __volatile__(APM_DO_ZERO_SEGS
15142 "pushl %%edi\n\t"
15143 "pushl %%ebp\n\t"
15144- "lcall *%%cs:apm_bios_entry\n\t"
15145+ "lcall *%%ss:apm_bios_entry\n\t"
15146 "setc %%bl\n\t"
15147 "popl %%ebp\n\t"
15148 "popl %%edi\n\t"
15149diff --git a/arch/x86/include/asm/atomic.h b/arch/x86/include/asm/atomic.h
15150index 5e5cd12..51cdc93 100644
15151--- a/arch/x86/include/asm/atomic.h
15152+++ b/arch/x86/include/asm/atomic.h
15153@@ -28,6 +28,17 @@ static inline int atomic_read(const atomic_t *v)
15154 }
15155
15156 /**
15157+ * atomic_read_unchecked - read atomic variable
15158+ * @v: pointer of type atomic_unchecked_t
15159+ *
15160+ * Atomically reads the value of @v.
15161+ */
15162+static inline int __intentional_overflow(-1) atomic_read_unchecked(const atomic_unchecked_t *v)
15163+{
15164+ return ACCESS_ONCE((v)->counter);
15165+}
15166+
15167+/**
15168 * atomic_set - set atomic variable
15169 * @v: pointer of type atomic_t
15170 * @i: required value
15171@@ -40,6 +51,18 @@ static inline void atomic_set(atomic_t *v, int i)
15172 }
15173
15174 /**
15175+ * atomic_set_unchecked - set atomic variable
15176+ * @v: pointer of type atomic_unchecked_t
15177+ * @i: required value
15178+ *
15179+ * Atomically sets the value of @v to @i.
15180+ */
15181+static inline void atomic_set_unchecked(atomic_unchecked_t *v, int i)
15182+{
15183+ v->counter = i;
15184+}
15185+
15186+/**
15187 * atomic_add - add integer to atomic variable
15188 * @i: integer value to add
15189 * @v: pointer of type atomic_t
15190@@ -48,7 +71,29 @@ static inline void atomic_set(atomic_t *v, int i)
15191 */
15192 static inline void atomic_add(int i, atomic_t *v)
15193 {
15194- asm volatile(LOCK_PREFIX "addl %1,%0"
15195+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15196+
15197+#ifdef CONFIG_PAX_REFCOUNT
15198+ "jno 0f\n"
15199+ LOCK_PREFIX "subl %1,%0\n"
15200+ "int $4\n0:\n"
15201+ _ASM_EXTABLE(0b, 0b)
15202+#endif
15203+
15204+ : "+m" (v->counter)
15205+ : "ir" (i));
15206+}
15207+
15208+/**
15209+ * atomic_add_unchecked - add integer to atomic variable
15210+ * @i: integer value to add
15211+ * @v: pointer of type atomic_unchecked_t
15212+ *
15213+ * Atomically adds @i to @v.
15214+ */
15215+static inline void atomic_add_unchecked(int i, atomic_unchecked_t *v)
15216+{
15217+ asm volatile(LOCK_PREFIX "addl %1,%0\n"
15218 : "+m" (v->counter)
15219 : "ir" (i));
15220 }
15221@@ -62,7 +107,29 @@ static inline void atomic_add(int i, atomic_t *v)
15222 */
15223 static inline void atomic_sub(int i, atomic_t *v)
15224 {
15225- asm volatile(LOCK_PREFIX "subl %1,%0"
15226+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15227+
15228+#ifdef CONFIG_PAX_REFCOUNT
15229+ "jno 0f\n"
15230+ LOCK_PREFIX "addl %1,%0\n"
15231+ "int $4\n0:\n"
15232+ _ASM_EXTABLE(0b, 0b)
15233+#endif
15234+
15235+ : "+m" (v->counter)
15236+ : "ir" (i));
15237+}
15238+
15239+/**
15240+ * atomic_sub_unchecked - subtract integer from atomic variable
15241+ * @i: integer value to subtract
15242+ * @v: pointer of type atomic_unchecked_t
15243+ *
15244+ * Atomically subtracts @i from @v.
15245+ */
15246+static inline void atomic_sub_unchecked(int i, atomic_unchecked_t *v)
15247+{
15248+ asm volatile(LOCK_PREFIX "subl %1,%0\n"
15249 : "+m" (v->counter)
15250 : "ir" (i));
15251 }
15252@@ -78,7 +145,7 @@ static inline void atomic_sub(int i, atomic_t *v)
15253 */
15254 static inline int atomic_sub_and_test(int i, atomic_t *v)
15255 {
15256- GEN_BINARY_RMWcc(LOCK_PREFIX "subl", v->counter, "er", i, "%0", "e");
15257+ GEN_BINARY_RMWcc(LOCK_PREFIX "subl", LOCK_PREFIX "addl", v->counter, "er", i, "%0", "e");
15258 }
15259
15260 /**
15261@@ -89,7 +156,27 @@ static inline int atomic_sub_and_test(int i, atomic_t *v)
15262 */
15263 static inline void atomic_inc(atomic_t *v)
15264 {
15265- asm volatile(LOCK_PREFIX "incl %0"
15266+ asm volatile(LOCK_PREFIX "incl %0\n"
15267+
15268+#ifdef CONFIG_PAX_REFCOUNT
15269+ "jno 0f\n"
15270+ LOCK_PREFIX "decl %0\n"
15271+ "int $4\n0:\n"
15272+ _ASM_EXTABLE(0b, 0b)
15273+#endif
15274+
15275+ : "+m" (v->counter));
15276+}
15277+
15278+/**
15279+ * atomic_inc_unchecked - increment atomic variable
15280+ * @v: pointer of type atomic_unchecked_t
15281+ *
15282+ * Atomically increments @v by 1.
15283+ */
15284+static inline void atomic_inc_unchecked(atomic_unchecked_t *v)
15285+{
15286+ asm volatile(LOCK_PREFIX "incl %0\n"
15287 : "+m" (v->counter));
15288 }
15289
15290@@ -101,7 +188,27 @@ static inline void atomic_inc(atomic_t *v)
15291 */
15292 static inline void atomic_dec(atomic_t *v)
15293 {
15294- asm volatile(LOCK_PREFIX "decl %0"
15295+ asm volatile(LOCK_PREFIX "decl %0\n"
15296+
15297+#ifdef CONFIG_PAX_REFCOUNT
15298+ "jno 0f\n"
15299+ LOCK_PREFIX "incl %0\n"
15300+ "int $4\n0:\n"
15301+ _ASM_EXTABLE(0b, 0b)
15302+#endif
15303+
15304+ : "+m" (v->counter));
15305+}
15306+
15307+/**
15308+ * atomic_dec_unchecked - decrement atomic variable
15309+ * @v: pointer of type atomic_unchecked_t
15310+ *
15311+ * Atomically decrements @v by 1.
15312+ */
15313+static inline void atomic_dec_unchecked(atomic_unchecked_t *v)
15314+{
15315+ asm volatile(LOCK_PREFIX "decl %0\n"
15316 : "+m" (v->counter));
15317 }
15318
15319@@ -115,7 +222,7 @@ static inline void atomic_dec(atomic_t *v)
15320 */
15321 static inline int atomic_dec_and_test(atomic_t *v)
15322 {
15323- GEN_UNARY_RMWcc(LOCK_PREFIX "decl", v->counter, "%0", "e");
15324+ GEN_UNARY_RMWcc(LOCK_PREFIX "decl", LOCK_PREFIX "incl", v->counter, "%0", "e");
15325 }
15326
15327 /**
15328@@ -128,7 +235,20 @@ static inline int atomic_dec_and_test(atomic_t *v)
15329 */
15330 static inline int atomic_inc_and_test(atomic_t *v)
15331 {
15332- GEN_UNARY_RMWcc(LOCK_PREFIX "incl", v->counter, "%0", "e");
15333+ GEN_UNARY_RMWcc(LOCK_PREFIX "incl", LOCK_PREFIX "decl", v->counter, "%0", "e");
15334+}
15335+
15336+/**
15337+ * atomic_inc_and_test_unchecked - increment and test
15338+ * @v: pointer of type atomic_unchecked_t
15339+ *
15340+ * Atomically increments @v by 1
15341+ * and returns true if the result is zero, or false for all
15342+ * other cases.
15343+ */
15344+static inline int atomic_inc_and_test_unchecked(atomic_unchecked_t *v)
15345+{
15346+ GEN_UNARY_RMWcc_unchecked(LOCK_PREFIX "incl", v->counter, "%0", "e");
15347 }
15348
15349 /**
15350@@ -142,7 +262,7 @@ static inline int atomic_inc_and_test(atomic_t *v)
15351 */
15352 static inline int atomic_add_negative(int i, atomic_t *v)
15353 {
15354- GEN_BINARY_RMWcc(LOCK_PREFIX "addl", v->counter, "er", i, "%0", "s");
15355+ GEN_BINARY_RMWcc(LOCK_PREFIX "addl", LOCK_PREFIX "subl", v->counter, "er", i, "%0", "s");
15356 }
15357
15358 /**
15359@@ -152,7 +272,19 @@ static inline int atomic_add_negative(int i, atomic_t *v)
15360 *
15361 * Atomically adds @i to @v and returns @i + @v
15362 */
15363-static inline int atomic_add_return(int i, atomic_t *v)
15364+static inline int __intentional_overflow(-1) atomic_add_return(int i, atomic_t *v)
15365+{
15366+ return i + xadd_check_overflow(&v->counter, i);
15367+}
15368+
15369+/**
15370+ * atomic_add_return_unchecked - add integer and return
15371+ * @i: integer value to add
15372+ * @v: pointer of type atomic_unchecked_t
15373+ *
15374+ * Atomically adds @i to @v and returns @i + @v
15375+ */
15376+static inline int atomic_add_return_unchecked(int i, atomic_unchecked_t *v)
15377 {
15378 return i + xadd(&v->counter, i);
15379 }
15380@@ -164,15 +296,24 @@ static inline int atomic_add_return(int i, atomic_t *v)
15381 *
15382 * Atomically subtracts @i from @v and returns @v - @i
15383 */
15384-static inline int atomic_sub_return(int i, atomic_t *v)
15385+static inline int __intentional_overflow(-1) atomic_sub_return(int i, atomic_t *v)
15386 {
15387 return atomic_add_return(-i, v);
15388 }
15389
15390 #define atomic_inc_return(v) (atomic_add_return(1, v))
15391+static inline int atomic_inc_return_unchecked(atomic_unchecked_t *v)
15392+{
15393+ return atomic_add_return_unchecked(1, v);
15394+}
15395 #define atomic_dec_return(v) (atomic_sub_return(1, v))
15396
15397-static inline int atomic_cmpxchg(atomic_t *v, int old, int new)
15398+static inline int __intentional_overflow(-1) atomic_cmpxchg(atomic_t *v, int old, int new)
15399+{
15400+ return cmpxchg(&v->counter, old, new);
15401+}
15402+
15403+static inline int atomic_cmpxchg_unchecked(atomic_unchecked_t *v, int old, int new)
15404 {
15405 return cmpxchg(&v->counter, old, new);
15406 }
15407@@ -182,6 +323,11 @@ static inline int atomic_xchg(atomic_t *v, int new)
15408 return xchg(&v->counter, new);
15409 }
15410
15411+static inline int atomic_xchg_unchecked(atomic_unchecked_t *v, int new)
15412+{
15413+ return xchg(&v->counter, new);
15414+}
15415+
15416 /**
15417 * __atomic_add_unless - add unless the number is already a given value
15418 * @v: pointer of type atomic_t
15419@@ -193,12 +339,25 @@ static inline int atomic_xchg(atomic_t *v, int new)
15420 */
15421 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15422 {
15423- int c, old;
15424+ int c, old, new;
15425 c = atomic_read(v);
15426 for (;;) {
15427- if (unlikely(c == (u)))
15428+ if (unlikely(c == u))
15429 break;
15430- old = atomic_cmpxchg((v), c, c + (a));
15431+
15432+ asm volatile("addl %2,%0\n"
15433+
15434+#ifdef CONFIG_PAX_REFCOUNT
15435+ "jno 0f\n"
15436+ "subl %2,%0\n"
15437+ "int $4\n0:\n"
15438+ _ASM_EXTABLE(0b, 0b)
15439+#endif
15440+
15441+ : "=r" (new)
15442+ : "0" (c), "ir" (a));
15443+
15444+ old = atomic_cmpxchg(v, c, new);
15445 if (likely(old == c))
15446 break;
15447 c = old;
15448@@ -207,6 +366,49 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
15449 }
15450
15451 /**
15452+ * atomic_inc_not_zero_hint - increment if not null
15453+ * @v: pointer of type atomic_t
15454+ * @hint: probable value of the atomic before the increment
15455+ *
15456+ * This version of atomic_inc_not_zero() gives a hint of probable
15457+ * value of the atomic. This helps processor to not read the memory
15458+ * before doing the atomic read/modify/write cycle, lowering
15459+ * number of bus transactions on some arches.
15460+ *
15461+ * Returns: 0 if increment was not done, 1 otherwise.
15462+ */
15463+#define atomic_inc_not_zero_hint atomic_inc_not_zero_hint
15464+static inline int atomic_inc_not_zero_hint(atomic_t *v, int hint)
15465+{
15466+ int val, c = hint, new;
15467+
15468+ /* sanity test, should be removed by compiler if hint is a constant */
15469+ if (!hint)
15470+ return __atomic_add_unless(v, 1, 0);
15471+
15472+ do {
15473+ asm volatile("incl %0\n"
15474+
15475+#ifdef CONFIG_PAX_REFCOUNT
15476+ "jno 0f\n"
15477+ "decl %0\n"
15478+ "int $4\n0:\n"
15479+ _ASM_EXTABLE(0b, 0b)
15480+#endif
15481+
15482+ : "=r" (new)
15483+ : "0" (c));
15484+
15485+ val = atomic_cmpxchg(v, c, new);
15486+ if (val == c)
15487+ return 1;
15488+ c = val;
15489+ } while (c);
15490+
15491+ return 0;
15492+}
15493+
15494+/**
15495 * atomic_inc_short - increment of a short integer
15496 * @v: pointer to type int
15497 *
15498@@ -220,14 +422,37 @@ static inline short int atomic_inc_short(short int *v)
15499 }
15500
15501 /* These are x86-specific, used by some header files */
15502-#define atomic_clear_mask(mask, addr) \
15503- asm volatile(LOCK_PREFIX "andl %0,%1" \
15504- : : "r" (~(mask)), "m" (*(addr)) : "memory")
15505+static inline void atomic_clear_mask(unsigned int mask, atomic_t *v)
15506+{
15507+ asm volatile(LOCK_PREFIX "andl %1,%0"
15508+ : "+m" (v->counter)
15509+ : "r" (~(mask))
15510+ : "memory");
15511+}
15512
15513-#define atomic_set_mask(mask, addr) \
15514- asm volatile(LOCK_PREFIX "orl %0,%1" \
15515- : : "r" ((unsigned)(mask)), "m" (*(addr)) \
15516- : "memory")
15517+static inline void atomic_clear_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15518+{
15519+ asm volatile(LOCK_PREFIX "andl %1,%0"
15520+ : "+m" (v->counter)
15521+ : "r" (~(mask))
15522+ : "memory");
15523+}
15524+
15525+static inline void atomic_set_mask(unsigned int mask, atomic_t *v)
15526+{
15527+ asm volatile(LOCK_PREFIX "orl %1,%0"
15528+ : "+m" (v->counter)
15529+ : "r" (mask)
15530+ : "memory");
15531+}
15532+
15533+static inline void atomic_set_mask_unchecked(unsigned int mask, atomic_unchecked_t *v)
15534+{
15535+ asm volatile(LOCK_PREFIX "orl %1,%0"
15536+ : "+m" (v->counter)
15537+ : "r" (mask)
15538+ : "memory");
15539+}
15540
15541 #ifdef CONFIG_X86_32
15542 # include <asm/atomic64_32.h>
15543diff --git a/arch/x86/include/asm/atomic64_32.h b/arch/x86/include/asm/atomic64_32.h
15544index b154de7..bf18a5a 100644
15545--- a/arch/x86/include/asm/atomic64_32.h
15546+++ b/arch/x86/include/asm/atomic64_32.h
15547@@ -12,6 +12,14 @@ typedef struct {
15548 u64 __aligned(8) counter;
15549 } atomic64_t;
15550
15551+#ifdef CONFIG_PAX_REFCOUNT
15552+typedef struct {
15553+ u64 __aligned(8) counter;
15554+} atomic64_unchecked_t;
15555+#else
15556+typedef atomic64_t atomic64_unchecked_t;
15557+#endif
15558+
15559 #define ATOMIC64_INIT(val) { (val) }
15560
15561 #define __ATOMIC64_DECL(sym) void atomic64_##sym(atomic64_t *, ...)
15562@@ -37,21 +45,31 @@ typedef struct {
15563 ATOMIC64_DECL_ONE(sym##_386)
15564
15565 ATOMIC64_DECL_ONE(add_386);
15566+ATOMIC64_DECL_ONE(add_unchecked_386);
15567 ATOMIC64_DECL_ONE(sub_386);
15568+ATOMIC64_DECL_ONE(sub_unchecked_386);
15569 ATOMIC64_DECL_ONE(inc_386);
15570+ATOMIC64_DECL_ONE(inc_unchecked_386);
15571 ATOMIC64_DECL_ONE(dec_386);
15572+ATOMIC64_DECL_ONE(dec_unchecked_386);
15573 #endif
15574
15575 #define alternative_atomic64(f, out, in...) \
15576 __alternative_atomic64(f, f, ASM_OUTPUT2(out), ## in)
15577
15578 ATOMIC64_DECL(read);
15579+ATOMIC64_DECL(read_unchecked);
15580 ATOMIC64_DECL(set);
15581+ATOMIC64_DECL(set_unchecked);
15582 ATOMIC64_DECL(xchg);
15583 ATOMIC64_DECL(add_return);
15584+ATOMIC64_DECL(add_return_unchecked);
15585 ATOMIC64_DECL(sub_return);
15586+ATOMIC64_DECL(sub_return_unchecked);
15587 ATOMIC64_DECL(inc_return);
15588+ATOMIC64_DECL(inc_return_unchecked);
15589 ATOMIC64_DECL(dec_return);
15590+ATOMIC64_DECL(dec_return_unchecked);
15591 ATOMIC64_DECL(dec_if_positive);
15592 ATOMIC64_DECL(inc_not_zero);
15593 ATOMIC64_DECL(add_unless);
15594@@ -77,6 +95,21 @@ static inline long long atomic64_cmpxchg(atomic64_t *v, long long o, long long n
15595 }
15596
15597 /**
15598+ * atomic64_cmpxchg_unchecked - cmpxchg atomic64 variable
15599+ * @p: pointer to type atomic64_unchecked_t
15600+ * @o: expected value
15601+ * @n: new value
15602+ *
15603+ * Atomically sets @v to @n if it was equal to @o and returns
15604+ * the old value.
15605+ */
15606+
15607+static inline long long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long long o, long long n)
15608+{
15609+ return cmpxchg64(&v->counter, o, n);
15610+}
15611+
15612+/**
15613 * atomic64_xchg - xchg atomic64 variable
15614 * @v: pointer to type atomic64_t
15615 * @n: value to assign
15616@@ -112,6 +145,22 @@ static inline void atomic64_set(atomic64_t *v, long long i)
15617 }
15618
15619 /**
15620+ * atomic64_set_unchecked - set atomic64 variable
15621+ * @v: pointer to type atomic64_unchecked_t
15622+ * @n: value to assign
15623+ *
15624+ * Atomically sets the value of @v to @n.
15625+ */
15626+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long long i)
15627+{
15628+ unsigned high = (unsigned)(i >> 32);
15629+ unsigned low = (unsigned)i;
15630+ alternative_atomic64(set, /* no output */,
15631+ "S" (v), "b" (low), "c" (high)
15632+ : "eax", "edx", "memory");
15633+}
15634+
15635+/**
15636 * atomic64_read - read atomic64 variable
15637 * @v: pointer to type atomic64_t
15638 *
15639@@ -125,6 +174,19 @@ static inline long long atomic64_read(const atomic64_t *v)
15640 }
15641
15642 /**
15643+ * atomic64_read_unchecked - read atomic64 variable
15644+ * @v: pointer to type atomic64_unchecked_t
15645+ *
15646+ * Atomically reads the value of @v and returns it.
15647+ */
15648+static inline long long __intentional_overflow(-1) atomic64_read_unchecked(atomic64_unchecked_t *v)
15649+{
15650+ long long r;
15651+ alternative_atomic64(read, "=&A" (r), "c" (v) : "memory");
15652+ return r;
15653+ }
15654+
15655+/**
15656 * atomic64_add_return - add and return
15657 * @i: integer value to add
15658 * @v: pointer to type atomic64_t
15659@@ -139,6 +201,21 @@ static inline long long atomic64_add_return(long long i, atomic64_t *v)
15660 return i;
15661 }
15662
15663+/**
15664+ * atomic64_add_return_unchecked - add and return
15665+ * @i: integer value to add
15666+ * @v: pointer to type atomic64_unchecked_t
15667+ *
15668+ * Atomically adds @i to @v and returns @i + *@v
15669+ */
15670+static inline long long atomic64_add_return_unchecked(long long i, atomic64_unchecked_t *v)
15671+{
15672+ alternative_atomic64(add_return_unchecked,
15673+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15674+ ASM_NO_INPUT_CLOBBER("memory"));
15675+ return i;
15676+}
15677+
15678 /*
15679 * Other variants with different arithmetic operators:
15680 */
15681@@ -158,6 +235,14 @@ static inline long long atomic64_inc_return(atomic64_t *v)
15682 return a;
15683 }
15684
15685+static inline long long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15686+{
15687+ long long a;
15688+ alternative_atomic64(inc_return_unchecked, "=&A" (a),
15689+ "S" (v) : "memory", "ecx");
15690+ return a;
15691+}
15692+
15693 static inline long long atomic64_dec_return(atomic64_t *v)
15694 {
15695 long long a;
15696@@ -182,6 +267,21 @@ static inline long long atomic64_add(long long i, atomic64_t *v)
15697 }
15698
15699 /**
15700+ * atomic64_add_unchecked - add integer to atomic64 variable
15701+ * @i: integer value to add
15702+ * @v: pointer to type atomic64_unchecked_t
15703+ *
15704+ * Atomically adds @i to @v.
15705+ */
15706+static inline long long atomic64_add_unchecked(long long i, atomic64_unchecked_t *v)
15707+{
15708+ __alternative_atomic64(add_unchecked, add_return_unchecked,
15709+ ASM_OUTPUT2("+A" (i), "+c" (v)),
15710+ ASM_NO_INPUT_CLOBBER("memory"));
15711+ return i;
15712+}
15713+
15714+/**
15715 * atomic64_sub - subtract the atomic64 variable
15716 * @i: integer value to subtract
15717 * @v: pointer to type atomic64_t
15718diff --git a/arch/x86/include/asm/atomic64_64.h b/arch/x86/include/asm/atomic64_64.h
15719index f8d273e..02f39f3 100644
15720--- a/arch/x86/include/asm/atomic64_64.h
15721+++ b/arch/x86/include/asm/atomic64_64.h
15722@@ -22,6 +22,18 @@ static inline long atomic64_read(const atomic64_t *v)
15723 }
15724
15725 /**
15726+ * atomic64_read_unchecked - read atomic64 variable
15727+ * @v: pointer of type atomic64_unchecked_t
15728+ *
15729+ * Atomically reads the value of @v.
15730+ * Doesn't imply a read memory barrier.
15731+ */
15732+static inline long __intentional_overflow(-1) atomic64_read_unchecked(const atomic64_unchecked_t *v)
15733+{
15734+ return ACCESS_ONCE((v)->counter);
15735+}
15736+
15737+/**
15738 * atomic64_set - set atomic64 variable
15739 * @v: pointer to type atomic64_t
15740 * @i: required value
15741@@ -34,6 +46,18 @@ static inline void atomic64_set(atomic64_t *v, long i)
15742 }
15743
15744 /**
15745+ * atomic64_set_unchecked - set atomic64 variable
15746+ * @v: pointer to type atomic64_unchecked_t
15747+ * @i: required value
15748+ *
15749+ * Atomically sets the value of @v to @i.
15750+ */
15751+static inline void atomic64_set_unchecked(atomic64_unchecked_t *v, long i)
15752+{
15753+ v->counter = i;
15754+}
15755+
15756+/**
15757 * atomic64_add - add integer to atomic64 variable
15758 * @i: integer value to add
15759 * @v: pointer to type atomic64_t
15760@@ -42,6 +66,28 @@ static inline void atomic64_set(atomic64_t *v, long i)
15761 */
15762 static inline void atomic64_add(long i, atomic64_t *v)
15763 {
15764+ asm volatile(LOCK_PREFIX "addq %1,%0\n"
15765+
15766+#ifdef CONFIG_PAX_REFCOUNT
15767+ "jno 0f\n"
15768+ LOCK_PREFIX "subq %1,%0\n"
15769+ "int $4\n0:\n"
15770+ _ASM_EXTABLE(0b, 0b)
15771+#endif
15772+
15773+ : "=m" (v->counter)
15774+ : "er" (i), "m" (v->counter));
15775+}
15776+
15777+/**
15778+ * atomic64_add_unchecked - add integer to atomic64 variable
15779+ * @i: integer value to add
15780+ * @v: pointer to type atomic64_unchecked_t
15781+ *
15782+ * Atomically adds @i to @v.
15783+ */
15784+static inline void atomic64_add_unchecked(long i, atomic64_unchecked_t *v)
15785+{
15786 asm volatile(LOCK_PREFIX "addq %1,%0"
15787 : "=m" (v->counter)
15788 : "er" (i), "m" (v->counter));
15789@@ -56,7 +102,29 @@ static inline void atomic64_add(long i, atomic64_t *v)
15790 */
15791 static inline void atomic64_sub(long i, atomic64_t *v)
15792 {
15793- asm volatile(LOCK_PREFIX "subq %1,%0"
15794+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15795+
15796+#ifdef CONFIG_PAX_REFCOUNT
15797+ "jno 0f\n"
15798+ LOCK_PREFIX "addq %1,%0\n"
15799+ "int $4\n0:\n"
15800+ _ASM_EXTABLE(0b, 0b)
15801+#endif
15802+
15803+ : "=m" (v->counter)
15804+ : "er" (i), "m" (v->counter));
15805+}
15806+
15807+/**
15808+ * atomic64_sub_unchecked - subtract the atomic64 variable
15809+ * @i: integer value to subtract
15810+ * @v: pointer to type atomic64_unchecked_t
15811+ *
15812+ * Atomically subtracts @i from @v.
15813+ */
15814+static inline void atomic64_sub_unchecked(long i, atomic64_unchecked_t *v)
15815+{
15816+ asm volatile(LOCK_PREFIX "subq %1,%0\n"
15817 : "=m" (v->counter)
15818 : "er" (i), "m" (v->counter));
15819 }
15820@@ -72,7 +140,7 @@ static inline void atomic64_sub(long i, atomic64_t *v)
15821 */
15822 static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15823 {
15824- GEN_BINARY_RMWcc(LOCK_PREFIX "subq", v->counter, "er", i, "%0", "e");
15825+ GEN_BINARY_RMWcc(LOCK_PREFIX "subq", LOCK_PREFIX "addq", v->counter, "er", i, "%0", "e");
15826 }
15827
15828 /**
15829@@ -83,6 +151,27 @@ static inline int atomic64_sub_and_test(long i, atomic64_t *v)
15830 */
15831 static inline void atomic64_inc(atomic64_t *v)
15832 {
15833+ asm volatile(LOCK_PREFIX "incq %0\n"
15834+
15835+#ifdef CONFIG_PAX_REFCOUNT
15836+ "jno 0f\n"
15837+ LOCK_PREFIX "decq %0\n"
15838+ "int $4\n0:\n"
15839+ _ASM_EXTABLE(0b, 0b)
15840+#endif
15841+
15842+ : "=m" (v->counter)
15843+ : "m" (v->counter));
15844+}
15845+
15846+/**
15847+ * atomic64_inc_unchecked - increment atomic64 variable
15848+ * @v: pointer to type atomic64_unchecked_t
15849+ *
15850+ * Atomically increments @v by 1.
15851+ */
15852+static inline void atomic64_inc_unchecked(atomic64_unchecked_t *v)
15853+{
15854 asm volatile(LOCK_PREFIX "incq %0"
15855 : "=m" (v->counter)
15856 : "m" (v->counter));
15857@@ -96,7 +185,28 @@ static inline void atomic64_inc(atomic64_t *v)
15858 */
15859 static inline void atomic64_dec(atomic64_t *v)
15860 {
15861- asm volatile(LOCK_PREFIX "decq %0"
15862+ asm volatile(LOCK_PREFIX "decq %0\n"
15863+
15864+#ifdef CONFIG_PAX_REFCOUNT
15865+ "jno 0f\n"
15866+ LOCK_PREFIX "incq %0\n"
15867+ "int $4\n0:\n"
15868+ _ASM_EXTABLE(0b, 0b)
15869+#endif
15870+
15871+ : "=m" (v->counter)
15872+ : "m" (v->counter));
15873+}
15874+
15875+/**
15876+ * atomic64_dec_unchecked - decrement atomic64 variable
15877+ * @v: pointer to type atomic64_t
15878+ *
15879+ * Atomically decrements @v by 1.
15880+ */
15881+static inline void atomic64_dec_unchecked(atomic64_unchecked_t *v)
15882+{
15883+ asm volatile(LOCK_PREFIX "decq %0\n"
15884 : "=m" (v->counter)
15885 : "m" (v->counter));
15886 }
15887@@ -111,7 +221,7 @@ static inline void atomic64_dec(atomic64_t *v)
15888 */
15889 static inline int atomic64_dec_and_test(atomic64_t *v)
15890 {
15891- GEN_UNARY_RMWcc(LOCK_PREFIX "decq", v->counter, "%0", "e");
15892+ GEN_UNARY_RMWcc(LOCK_PREFIX "decq", LOCK_PREFIX "incq", v->counter, "%0", "e");
15893 }
15894
15895 /**
15896@@ -124,7 +234,7 @@ static inline int atomic64_dec_and_test(atomic64_t *v)
15897 */
15898 static inline int atomic64_inc_and_test(atomic64_t *v)
15899 {
15900- GEN_UNARY_RMWcc(LOCK_PREFIX "incq", v->counter, "%0", "e");
15901+ GEN_UNARY_RMWcc(LOCK_PREFIX "incq", LOCK_PREFIX "decq", v->counter, "%0", "e");
15902 }
15903
15904 /**
15905@@ -138,7 +248,7 @@ static inline int atomic64_inc_and_test(atomic64_t *v)
15906 */
15907 static inline int atomic64_add_negative(long i, atomic64_t *v)
15908 {
15909- GEN_BINARY_RMWcc(LOCK_PREFIX "addq", v->counter, "er", i, "%0", "s");
15910+ GEN_BINARY_RMWcc(LOCK_PREFIX "addq", LOCK_PREFIX "subq", v->counter, "er", i, "%0", "s");
15911 }
15912
15913 /**
15914@@ -150,6 +260,18 @@ static inline int atomic64_add_negative(long i, atomic64_t *v)
15915 */
15916 static inline long atomic64_add_return(long i, atomic64_t *v)
15917 {
15918+ return i + xadd_check_overflow(&v->counter, i);
15919+}
15920+
15921+/**
15922+ * atomic64_add_return_unchecked - add and return
15923+ * @i: integer value to add
15924+ * @v: pointer to type atomic64_unchecked_t
15925+ *
15926+ * Atomically adds @i to @v and returns @i + @v
15927+ */
15928+static inline long atomic64_add_return_unchecked(long i, atomic64_unchecked_t *v)
15929+{
15930 return i + xadd(&v->counter, i);
15931 }
15932
15933@@ -159,6 +281,10 @@ static inline long atomic64_sub_return(long i, atomic64_t *v)
15934 }
15935
15936 #define atomic64_inc_return(v) (atomic64_add_return(1, (v)))
15937+static inline long atomic64_inc_return_unchecked(atomic64_unchecked_t *v)
15938+{
15939+ return atomic64_add_return_unchecked(1, v);
15940+}
15941 #define atomic64_dec_return(v) (atomic64_sub_return(1, (v)))
15942
15943 static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15944@@ -166,6 +292,11 @@ static inline long atomic64_cmpxchg(atomic64_t *v, long old, long new)
15945 return cmpxchg(&v->counter, old, new);
15946 }
15947
15948+static inline long atomic64_cmpxchg_unchecked(atomic64_unchecked_t *v, long old, long new)
15949+{
15950+ return cmpxchg(&v->counter, old, new);
15951+}
15952+
15953 static inline long atomic64_xchg(atomic64_t *v, long new)
15954 {
15955 return xchg(&v->counter, new);
15956@@ -182,17 +313,30 @@ static inline long atomic64_xchg(atomic64_t *v, long new)
15957 */
15958 static inline int atomic64_add_unless(atomic64_t *v, long a, long u)
15959 {
15960- long c, old;
15961+ long c, old, new;
15962 c = atomic64_read(v);
15963 for (;;) {
15964- if (unlikely(c == (u)))
15965+ if (unlikely(c == u))
15966 break;
15967- old = atomic64_cmpxchg((v), c, c + (a));
15968+
15969+ asm volatile("add %2,%0\n"
15970+
15971+#ifdef CONFIG_PAX_REFCOUNT
15972+ "jno 0f\n"
15973+ "sub %2,%0\n"
15974+ "int $4\n0:\n"
15975+ _ASM_EXTABLE(0b, 0b)
15976+#endif
15977+
15978+ : "=r" (new)
15979+ : "0" (c), "ir" (a));
15980+
15981+ old = atomic64_cmpxchg(v, c, new);
15982 if (likely(old == c))
15983 break;
15984 c = old;
15985 }
15986- return c != (u);
15987+ return c != u;
15988 }
15989
15990 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
15991diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h
15992index 2ab1eb3..1e8cc5d 100644
15993--- a/arch/x86/include/asm/barrier.h
15994+++ b/arch/x86/include/asm/barrier.h
15995@@ -57,7 +57,7 @@
15996 do { \
15997 compiletime_assert_atomic_type(*p); \
15998 smp_mb(); \
15999- ACCESS_ONCE(*p) = (v); \
16000+ ACCESS_ONCE_RW(*p) = (v); \
16001 } while (0)
16002
16003 #define smp_load_acquire(p) \
16004@@ -74,7 +74,7 @@ do { \
16005 do { \
16006 compiletime_assert_atomic_type(*p); \
16007 barrier(); \
16008- ACCESS_ONCE(*p) = (v); \
16009+ ACCESS_ONCE_RW(*p) = (v); \
16010 } while (0)
16011
16012 #define smp_load_acquire(p) \
16013diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
16014index cfe3b95..d01b118 100644
16015--- a/arch/x86/include/asm/bitops.h
16016+++ b/arch/x86/include/asm/bitops.h
16017@@ -50,7 +50,7 @@
16018 * a mask operation on a byte.
16019 */
16020 #define IS_IMMEDIATE(nr) (__builtin_constant_p(nr))
16021-#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((void *)(addr) + ((nr)>>3))
16022+#define CONST_MASK_ADDR(nr, addr) BITOP_ADDR((volatile void *)(addr) + ((nr)>>3))
16023 #define CONST_MASK(nr) (1 << ((nr) & 7))
16024
16025 /**
16026@@ -203,7 +203,7 @@ static inline void change_bit(long nr, volatile unsigned long *addr)
16027 */
16028 static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
16029 {
16030- GEN_BINARY_RMWcc(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16031+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "bts", *addr, "Ir", nr, "%0", "c");
16032 }
16033
16034 /**
16035@@ -249,7 +249,7 @@ static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
16036 */
16037 static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
16038 {
16039- GEN_BINARY_RMWcc(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16040+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btr", *addr, "Ir", nr, "%0", "c");
16041 }
16042
16043 /**
16044@@ -302,7 +302,7 @@ static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
16045 */
16046 static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
16047 {
16048- GEN_BINARY_RMWcc(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16049+ GEN_BINARY_RMWcc_unchecked(LOCK_PREFIX "btc", *addr, "Ir", nr, "%0", "c");
16050 }
16051
16052 static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
16053@@ -343,7 +343,7 @@ static int test_bit(int nr, const volatile unsigned long *addr);
16054 *
16055 * Undefined if no bit exists, so code should check against 0 first.
16056 */
16057-static inline unsigned long __ffs(unsigned long word)
16058+static inline unsigned long __intentional_overflow(-1) __ffs(unsigned long word)
16059 {
16060 asm("rep; bsf %1,%0"
16061 : "=r" (word)
16062@@ -357,7 +357,7 @@ static inline unsigned long __ffs(unsigned long word)
16063 *
16064 * Undefined if no zero exists, so code should check against ~0UL first.
16065 */
16066-static inline unsigned long ffz(unsigned long word)
16067+static inline unsigned long __intentional_overflow(-1) ffz(unsigned long word)
16068 {
16069 asm("rep; bsf %1,%0"
16070 : "=r" (word)
16071@@ -371,7 +371,7 @@ static inline unsigned long ffz(unsigned long word)
16072 *
16073 * Undefined if no set bit exists, so code should check against 0 first.
16074 */
16075-static inline unsigned long __fls(unsigned long word)
16076+static inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
16077 {
16078 asm("bsr %1,%0"
16079 : "=r" (word)
16080@@ -434,7 +434,7 @@ static inline int ffs(int x)
16081 * set bit if value is nonzero. The last (most significant) bit is
16082 * at position 32.
16083 */
16084-static inline int fls(int x)
16085+static inline int __intentional_overflow(-1) fls(int x)
16086 {
16087 int r;
16088
16089@@ -476,7 +476,7 @@ static inline int fls(int x)
16090 * at position 64.
16091 */
16092 #ifdef CONFIG_X86_64
16093-static __always_inline int fls64(__u64 x)
16094+static __always_inline __intentional_overflow(-1) int fls64(__u64 x)
16095 {
16096 int bitpos = -1;
16097 /*
16098diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h
16099index 4fa687a..60f2d39 100644
16100--- a/arch/x86/include/asm/boot.h
16101+++ b/arch/x86/include/asm/boot.h
16102@@ -6,10 +6,15 @@
16103 #include <uapi/asm/boot.h>
16104
16105 /* Physical address where kernel should be loaded. */
16106-#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16107+#define ____LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
16108 + (CONFIG_PHYSICAL_ALIGN - 1)) \
16109 & ~(CONFIG_PHYSICAL_ALIGN - 1))
16110
16111+#ifndef __ASSEMBLY__
16112+extern unsigned char __LOAD_PHYSICAL_ADDR[];
16113+#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR)
16114+#endif
16115+
16116 /* Minimum kernel alignment, as a power of two */
16117 #ifdef CONFIG_X86_64
16118 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
16119diff --git a/arch/x86/include/asm/cache.h b/arch/x86/include/asm/cache.h
16120index 48f99f1..d78ebf9 100644
16121--- a/arch/x86/include/asm/cache.h
16122+++ b/arch/x86/include/asm/cache.h
16123@@ -5,12 +5,13 @@
16124
16125 /* L1 cache line size */
16126 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
16127-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
16128+#define L1_CACHE_BYTES (_AC(1,UL) << L1_CACHE_SHIFT)
16129
16130 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
16131+#define __read_only __attribute__((__section__(".data..read_only")))
16132
16133 #define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT
16134-#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)
16135+#define INTERNODE_CACHE_BYTES (_AC(1,UL) << INTERNODE_CACHE_SHIFT)
16136
16137 #ifdef CONFIG_X86_VSMP
16138 #ifdef CONFIG_SMP
16139diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
16140index 1f1297b..72b8439 100644
16141--- a/arch/x86/include/asm/calling.h
16142+++ b/arch/x86/include/asm/calling.h
16143@@ -82,106 +82,117 @@ For 32-bit we have the following conventions - kernel is built with
16144 #define RSP 152
16145 #define SS 160
16146
16147-#define ARGOFFSET R11
16148+#define ARGOFFSET R15
16149
16150 .macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1, rax_enosys=0
16151- subq $9*8+\addskip, %rsp
16152- CFI_ADJUST_CFA_OFFSET 9*8+\addskip
16153- movq_cfi rdi, 8*8
16154- movq_cfi rsi, 7*8
16155- movq_cfi rdx, 6*8
16156+ subq $ORIG_RAX-ARGOFFSET+\addskip, %rsp
16157+ CFI_ADJUST_CFA_OFFSET ORIG_RAX-ARGOFFSET+\addskip
16158+ movq_cfi rdi, RDI
16159+ movq_cfi rsi, RSI
16160+ movq_cfi rdx, RDX
16161
16162 .if \save_rcx
16163- movq_cfi rcx, 5*8
16164+ movq_cfi rcx, RCX
16165 .endif
16166
16167 .if \rax_enosys
16168- movq $-ENOSYS, 4*8(%rsp)
16169+ movq $-ENOSYS, RAX(%rsp)
16170 .else
16171- movq_cfi rax, 4*8
16172+ movq_cfi rax, RAX
16173 .endif
16174
16175 .if \save_r891011
16176- movq_cfi r8, 3*8
16177- movq_cfi r9, 2*8
16178- movq_cfi r10, 1*8
16179- movq_cfi r11, 0*8
16180+ movq_cfi r8, R8
16181+ movq_cfi r9, R9
16182+ movq_cfi r10, R10
16183+ movq_cfi r11, R11
16184 .endif
16185
16186+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16187+ movq_cfi r12, R12
16188+#endif
16189+
16190 .endm
16191
16192-#define ARG_SKIP (9*8)
16193+#define ARG_SKIP ORIG_RAX
16194
16195 .macro RESTORE_ARGS rstor_rax=1, addskip=0, rstor_rcx=1, rstor_r11=1, \
16196 rstor_r8910=1, rstor_rdx=1
16197+
16198+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16199+ movq_cfi_restore R12, r12
16200+#endif
16201+
16202 .if \rstor_r11
16203- movq_cfi_restore 0*8, r11
16204+ movq_cfi_restore R11, r11
16205 .endif
16206
16207 .if \rstor_r8910
16208- movq_cfi_restore 1*8, r10
16209- movq_cfi_restore 2*8, r9
16210- movq_cfi_restore 3*8, r8
16211+ movq_cfi_restore R10, r10
16212+ movq_cfi_restore R9, r9
16213+ movq_cfi_restore R8, r8
16214 .endif
16215
16216 .if \rstor_rax
16217- movq_cfi_restore 4*8, rax
16218+ movq_cfi_restore RAX, rax
16219 .endif
16220
16221 .if \rstor_rcx
16222- movq_cfi_restore 5*8, rcx
16223+ movq_cfi_restore RCX, rcx
16224 .endif
16225
16226 .if \rstor_rdx
16227- movq_cfi_restore 6*8, rdx
16228+ movq_cfi_restore RDX, rdx
16229 .endif
16230
16231- movq_cfi_restore 7*8, rsi
16232- movq_cfi_restore 8*8, rdi
16233+ movq_cfi_restore RSI, rsi
16234+ movq_cfi_restore RDI, rdi
16235
16236- .if ARG_SKIP+\addskip > 0
16237- addq $ARG_SKIP+\addskip, %rsp
16238- CFI_ADJUST_CFA_OFFSET -(ARG_SKIP+\addskip)
16239+ .if ORIG_RAX+\addskip > 0
16240+ addq $ORIG_RAX+\addskip, %rsp
16241+ CFI_ADJUST_CFA_OFFSET -(ORIG_RAX+\addskip)
16242 .endif
16243 .endm
16244
16245- .macro LOAD_ARGS offset, skiprax=0
16246- movq \offset(%rsp), %r11
16247- movq \offset+8(%rsp), %r10
16248- movq \offset+16(%rsp), %r9
16249- movq \offset+24(%rsp), %r8
16250- movq \offset+40(%rsp), %rcx
16251- movq \offset+48(%rsp), %rdx
16252- movq \offset+56(%rsp), %rsi
16253- movq \offset+64(%rsp), %rdi
16254+ .macro LOAD_ARGS skiprax=0
16255+ movq R11(%rsp), %r11
16256+ movq R10(%rsp), %r10
16257+ movq R9(%rsp), %r9
16258+ movq R8(%rsp), %r8
16259+ movq RCX(%rsp), %rcx
16260+ movq RDX(%rsp), %rdx
16261+ movq RSI(%rsp), %rsi
16262+ movq RDI(%rsp), %rdi
16263 .if \skiprax
16264 .else
16265- movq \offset+72(%rsp), %rax
16266+ movq ORIG_RAX(%rsp), %rax
16267 .endif
16268 .endm
16269
16270-#define REST_SKIP (6*8)
16271-
16272 .macro SAVE_REST
16273- subq $REST_SKIP, %rsp
16274- CFI_ADJUST_CFA_OFFSET REST_SKIP
16275- movq_cfi rbx, 5*8
16276- movq_cfi rbp, 4*8
16277- movq_cfi r12, 3*8
16278- movq_cfi r13, 2*8
16279- movq_cfi r14, 1*8
16280- movq_cfi r15, 0*8
16281+ movq_cfi rbx, RBX
16282+ movq_cfi rbp, RBP
16283+
16284+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16285+ movq_cfi r12, R12
16286+#endif
16287+
16288+ movq_cfi r13, R13
16289+ movq_cfi r14, R14
16290+ movq_cfi r15, R15
16291 .endm
16292
16293 .macro RESTORE_REST
16294- movq_cfi_restore 0*8, r15
16295- movq_cfi_restore 1*8, r14
16296- movq_cfi_restore 2*8, r13
16297- movq_cfi_restore 3*8, r12
16298- movq_cfi_restore 4*8, rbp
16299- movq_cfi_restore 5*8, rbx
16300- addq $REST_SKIP, %rsp
16301- CFI_ADJUST_CFA_OFFSET -(REST_SKIP)
16302+ movq_cfi_restore R15, r15
16303+ movq_cfi_restore R14, r14
16304+ movq_cfi_restore R13, r13
16305+
16306+#ifndef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
16307+ movq_cfi_restore R12, r12
16308+#endif
16309+
16310+ movq_cfi_restore RBP, rbp
16311+ movq_cfi_restore RBX, rbx
16312 .endm
16313
16314 .macro SAVE_ALL
16315diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
16316index f50de69..2b0a458 100644
16317--- a/arch/x86/include/asm/checksum_32.h
16318+++ b/arch/x86/include/asm/checksum_32.h
16319@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_generic(const void *src, void *dst,
16320 int len, __wsum sum,
16321 int *src_err_ptr, int *dst_err_ptr);
16322
16323+asmlinkage __wsum csum_partial_copy_generic_to_user(const void *src, void *dst,
16324+ int len, __wsum sum,
16325+ int *src_err_ptr, int *dst_err_ptr);
16326+
16327+asmlinkage __wsum csum_partial_copy_generic_from_user(const void *src, void *dst,
16328+ int len, __wsum sum,
16329+ int *src_err_ptr, int *dst_err_ptr);
16330+
16331 /*
16332 * Note: when you get a NULL pointer exception here this means someone
16333 * passed in an incorrect kernel address to one of these functions.
16334@@ -53,7 +61,7 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
16335
16336 might_sleep();
16337 stac();
16338- ret = csum_partial_copy_generic((__force void *)src, dst,
16339+ ret = csum_partial_copy_generic_from_user((__force void *)src, dst,
16340 len, sum, err_ptr, NULL);
16341 clac();
16342
16343@@ -187,7 +195,7 @@ static inline __wsum csum_and_copy_to_user(const void *src,
16344 might_sleep();
16345 if (access_ok(VERIFY_WRITE, dst, len)) {
16346 stac();
16347- ret = csum_partial_copy_generic(src, (__force void *)dst,
16348+ ret = csum_partial_copy_generic_to_user(src, (__force void *)dst,
16349 len, sum, NULL, err_ptr);
16350 clac();
16351 return ret;
16352diff --git a/arch/x86/include/asm/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
16353index 99c105d7..2f667ac 100644
16354--- a/arch/x86/include/asm/cmpxchg.h
16355+++ b/arch/x86/include/asm/cmpxchg.h
16356@@ -16,8 +16,12 @@ extern void __cmpxchg_wrong_size(void)
16357 __compiletime_error("Bad argument size for cmpxchg");
16358 extern void __xadd_wrong_size(void)
16359 __compiletime_error("Bad argument size for xadd");
16360+extern void __xadd_check_overflow_wrong_size(void)
16361+ __compiletime_error("Bad argument size for xadd_check_overflow");
16362 extern void __add_wrong_size(void)
16363 __compiletime_error("Bad argument size for add");
16364+extern void __add_check_overflow_wrong_size(void)
16365+ __compiletime_error("Bad argument size for add_check_overflow");
16366
16367 /*
16368 * Constants for operation sizes. On 32-bit, the 64-bit size it set to
16369@@ -69,6 +73,38 @@ extern void __add_wrong_size(void)
16370 __ret; \
16371 })
16372
16373+#ifdef CONFIG_PAX_REFCOUNT
16374+#define __xchg_op_check_overflow(ptr, arg, op, lock) \
16375+ ({ \
16376+ __typeof__ (*(ptr)) __ret = (arg); \
16377+ switch (sizeof(*(ptr))) { \
16378+ case __X86_CASE_L: \
16379+ asm volatile (lock #op "l %0, %1\n" \
16380+ "jno 0f\n" \
16381+ "mov %0,%1\n" \
16382+ "int $4\n0:\n" \
16383+ _ASM_EXTABLE(0b, 0b) \
16384+ : "+r" (__ret), "+m" (*(ptr)) \
16385+ : : "memory", "cc"); \
16386+ break; \
16387+ case __X86_CASE_Q: \
16388+ asm volatile (lock #op "q %q0, %1\n" \
16389+ "jno 0f\n" \
16390+ "mov %0,%1\n" \
16391+ "int $4\n0:\n" \
16392+ _ASM_EXTABLE(0b, 0b) \
16393+ : "+r" (__ret), "+m" (*(ptr)) \
16394+ : : "memory", "cc"); \
16395+ break; \
16396+ default: \
16397+ __ ## op ## _check_overflow_wrong_size(); \
16398+ } \
16399+ __ret; \
16400+ })
16401+#else
16402+#define __xchg_op_check_overflow(ptr, arg, op, lock) __xchg_op(ptr, arg, op, lock)
16403+#endif
16404+
16405 /*
16406 * Note: no "lock" prefix even on SMP: xchg always implies lock anyway.
16407 * Since this is generally used to protect other memory information, we
16408@@ -167,6 +203,9 @@ extern void __add_wrong_size(void)
16409 #define xadd_sync(ptr, inc) __xadd((ptr), (inc), "lock; ")
16410 #define xadd_local(ptr, inc) __xadd((ptr), (inc), "")
16411
16412+#define __xadd_check_overflow(ptr, inc, lock) __xchg_op_check_overflow((ptr), (inc), xadd, lock)
16413+#define xadd_check_overflow(ptr, inc) __xadd_check_overflow((ptr), (inc), LOCK_PREFIX)
16414+
16415 #define __add(ptr, inc, lock) \
16416 ({ \
16417 __typeof__ (*(ptr)) __ret = (inc); \
16418diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
16419index 59c6c40..5e0b22c 100644
16420--- a/arch/x86/include/asm/compat.h
16421+++ b/arch/x86/include/asm/compat.h
16422@@ -41,7 +41,7 @@ typedef s64 __attribute__((aligned(4))) compat_s64;
16423 typedef u32 compat_uint_t;
16424 typedef u32 compat_ulong_t;
16425 typedef u64 __attribute__((aligned(4))) compat_u64;
16426-typedef u32 compat_uptr_t;
16427+typedef u32 __user compat_uptr_t;
16428
16429 struct compat_timespec {
16430 compat_time_t tv_sec;
16431diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
16432index 90a5485..43b6211 100644
16433--- a/arch/x86/include/asm/cpufeature.h
16434+++ b/arch/x86/include/asm/cpufeature.h
16435@@ -213,7 +213,7 @@
16436 #define X86_FEATURE_PAUSEFILTER ( 8*32+13) /* AMD filtered pause intercept */
16437 #define X86_FEATURE_PFTHRESHOLD ( 8*32+14) /* AMD pause filter threshold */
16438 #define X86_FEATURE_VMMCALL ( 8*32+15) /* Prefer vmmcall to vmcall */
16439-
16440+#define X86_FEATURE_STRONGUDEREF (8*32+31) /* PaX PCID based strong UDEREF */
16441
16442 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ebx), word 9 */
16443 #define X86_FEATURE_FSGSBASE ( 9*32+ 0) /* {RD/WR}{FS/GS}BASE instructions*/
16444@@ -221,7 +221,7 @@
16445 #define X86_FEATURE_BMI1 ( 9*32+ 3) /* 1st group bit manipulation extensions */
16446 #define X86_FEATURE_HLE ( 9*32+ 4) /* Hardware Lock Elision */
16447 #define X86_FEATURE_AVX2 ( 9*32+ 5) /* AVX2 instructions */
16448-#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Protection */
16449+#define X86_FEATURE_SMEP ( 9*32+ 7) /* Supervisor Mode Execution Prevention */
16450 #define X86_FEATURE_BMI2 ( 9*32+ 8) /* 2nd group bit manipulation extensions */
16451 #define X86_FEATURE_ERMS ( 9*32+ 9) /* Enhanced REP MOVSB/STOSB */
16452 #define X86_FEATURE_INVPCID ( 9*32+10) /* Invalidate Processor Context ID */
16453@@ -390,6 +390,7 @@ extern const char * const x86_bug_flags[NBUGINTS*32];
16454 #define cpu_has_eager_fpu boot_cpu_has(X86_FEATURE_EAGER_FPU)
16455 #define cpu_has_topoext boot_cpu_has(X86_FEATURE_TOPOEXT)
16456 #define cpu_has_bpext boot_cpu_has(X86_FEATURE_BPEXT)
16457+#define cpu_has_pcid boot_cpu_has(X86_FEATURE_PCID)
16458
16459 #if __GNUC__ >= 4
16460 extern void warn_pre_alternatives(void);
16461@@ -441,7 +442,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16462
16463 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
16464 t_warn:
16465- warn_pre_alternatives();
16466+ if (bit != X86_FEATURE_PCID && bit != X86_FEATURE_INVPCID)
16467+ warn_pre_alternatives();
16468 return false;
16469 #endif
16470
16471@@ -461,7 +463,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
16472 ".section .discard,\"aw\",@progbits\n"
16473 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16474 ".previous\n"
16475- ".section .altinstr_replacement,\"ax\"\n"
16476+ ".section .altinstr_replacement,\"a\"\n"
16477 "3: movb $1,%0\n"
16478 "4:\n"
16479 ".previous\n"
16480@@ -498,7 +500,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16481 " .byte 2b - 1b\n" /* src len */
16482 " .byte 4f - 3f\n" /* repl len */
16483 ".previous\n"
16484- ".section .altinstr_replacement,\"ax\"\n"
16485+ ".section .altinstr_replacement,\"a\"\n"
16486 "3: .byte 0xe9\n .long %l[t_no] - 2b\n"
16487 "4:\n"
16488 ".previous\n"
16489@@ -531,7 +533,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16490 ".section .discard,\"aw\",@progbits\n"
16491 " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
16492 ".previous\n"
16493- ".section .altinstr_replacement,\"ax\"\n"
16494+ ".section .altinstr_replacement,\"a\"\n"
16495 "3: movb $0,%0\n"
16496 "4:\n"
16497 ".previous\n"
16498@@ -545,7 +547,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
16499 ".section .discard,\"aw\",@progbits\n"
16500 " .byte 0xff + (6f-5f) - (4b-3b)\n" /* size check */
16501 ".previous\n"
16502- ".section .altinstr_replacement,\"ax\"\n"
16503+ ".section .altinstr_replacement,\"a\"\n"
16504 "5: movb $1,%0\n"
16505 "6:\n"
16506 ".previous\n"
16507diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h
16508index a94b82e..59ecefa 100644
16509--- a/arch/x86/include/asm/desc.h
16510+++ b/arch/x86/include/asm/desc.h
16511@@ -4,6 +4,7 @@
16512 #include <asm/desc_defs.h>
16513 #include <asm/ldt.h>
16514 #include <asm/mmu.h>
16515+#include <asm/pgtable.h>
16516
16517 #include <linux/smp.h>
16518 #include <linux/percpu.h>
16519@@ -17,6 +18,7 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16520
16521 desc->type = (info->read_exec_only ^ 1) << 1;
16522 desc->type |= info->contents << 2;
16523+ desc->type |= info->seg_not_present ^ 1;
16524
16525 desc->s = 1;
16526 desc->dpl = 0x3;
16527@@ -35,19 +37,14 @@ static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *in
16528 }
16529
16530 extern struct desc_ptr idt_descr;
16531-extern gate_desc idt_table[];
16532-extern struct desc_ptr debug_idt_descr;
16533-extern gate_desc debug_idt_table[];
16534-
16535-struct gdt_page {
16536- struct desc_struct gdt[GDT_ENTRIES];
16537-} __attribute__((aligned(PAGE_SIZE)));
16538-
16539-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page);
16540+extern gate_desc idt_table[IDT_ENTRIES];
16541+extern const struct desc_ptr debug_idt_descr;
16542+extern gate_desc debug_idt_table[IDT_ENTRIES];
16543
16544+extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)];
16545 static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu)
16546 {
16547- return per_cpu(gdt_page, cpu).gdt;
16548+ return cpu_gdt_table[cpu];
16549 }
16550
16551 #ifdef CONFIG_X86_64
16552@@ -72,8 +69,14 @@ static inline void pack_gate(gate_desc *gate, unsigned char type,
16553 unsigned long base, unsigned dpl, unsigned flags,
16554 unsigned short seg)
16555 {
16556- gate->a = (seg << 16) | (base & 0xffff);
16557- gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8);
16558+ gate->gate.offset_low = base;
16559+ gate->gate.seg = seg;
16560+ gate->gate.reserved = 0;
16561+ gate->gate.type = type;
16562+ gate->gate.s = 0;
16563+ gate->gate.dpl = dpl;
16564+ gate->gate.p = 1;
16565+ gate->gate.offset_high = base >> 16;
16566 }
16567
16568 #endif
16569@@ -118,12 +121,16 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries)
16570
16571 static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate)
16572 {
16573+ pax_open_kernel();
16574 memcpy(&idt[entry], gate, sizeof(*gate));
16575+ pax_close_kernel();
16576 }
16577
16578 static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc)
16579 {
16580+ pax_open_kernel();
16581 memcpy(&ldt[entry], desc, 8);
16582+ pax_close_kernel();
16583 }
16584
16585 static inline void
16586@@ -137,7 +144,9 @@ native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int
16587 default: size = sizeof(*gdt); break;
16588 }
16589
16590+ pax_open_kernel();
16591 memcpy(&gdt[entry], desc, size);
16592+ pax_close_kernel();
16593 }
16594
16595 static inline void pack_descriptor(struct desc_struct *desc, unsigned long base,
16596@@ -210,7 +219,9 @@ static inline void native_set_ldt(const void *addr, unsigned int entries)
16597
16598 static inline void native_load_tr_desc(void)
16599 {
16600+ pax_open_kernel();
16601 asm volatile("ltr %w0"::"q" (GDT_ENTRY_TSS*8));
16602+ pax_close_kernel();
16603 }
16604
16605 static inline void native_load_gdt(const struct desc_ptr *dtr)
16606@@ -247,8 +258,10 @@ static inline void native_load_tls(struct thread_struct *t, unsigned int cpu)
16607 struct desc_struct *gdt = get_cpu_gdt_table(cpu);
16608 unsigned int i;
16609
16610+ pax_open_kernel();
16611 for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
16612 gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i];
16613+ pax_close_kernel();
16614 }
16615
16616 /* This intentionally ignores lm, since 32-bit apps don't have that field. */
16617@@ -295,7 +308,7 @@ static inline void load_LDT(mm_context_t *pc)
16618 preempt_enable();
16619 }
16620
16621-static inline unsigned long get_desc_base(const struct desc_struct *desc)
16622+static inline unsigned long __intentional_overflow(-1) get_desc_base(const struct desc_struct *desc)
16623 {
16624 return (unsigned)(desc->base0 | ((desc->base1) << 16) | ((desc->base2) << 24));
16625 }
16626@@ -319,7 +332,7 @@ static inline void set_desc_limit(struct desc_struct *desc, unsigned long limit)
16627 }
16628
16629 #ifdef CONFIG_X86_64
16630-static inline void set_nmi_gate(int gate, void *addr)
16631+static inline void set_nmi_gate(int gate, const void *addr)
16632 {
16633 gate_desc s;
16634
16635@@ -329,14 +342,14 @@ static inline void set_nmi_gate(int gate, void *addr)
16636 #endif
16637
16638 #ifdef CONFIG_TRACING
16639-extern struct desc_ptr trace_idt_descr;
16640-extern gate_desc trace_idt_table[];
16641+extern const struct desc_ptr trace_idt_descr;
16642+extern gate_desc trace_idt_table[IDT_ENTRIES];
16643 static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16644 {
16645 write_idt_entry(trace_idt_table, entry, gate);
16646 }
16647
16648-static inline void _trace_set_gate(int gate, unsigned type, void *addr,
16649+static inline void _trace_set_gate(int gate, unsigned type, const void *addr,
16650 unsigned dpl, unsigned ist, unsigned seg)
16651 {
16652 gate_desc s;
16653@@ -356,7 +369,7 @@ static inline void write_trace_idt_entry(int entry, const gate_desc *gate)
16654 #define _trace_set_gate(gate, type, addr, dpl, ist, seg)
16655 #endif
16656
16657-static inline void _set_gate(int gate, unsigned type, void *addr,
16658+static inline void _set_gate(int gate, unsigned type, const void *addr,
16659 unsigned dpl, unsigned ist, unsigned seg)
16660 {
16661 gate_desc s;
16662@@ -379,9 +392,9 @@ static inline void _set_gate(int gate, unsigned type, void *addr,
16663 #define set_intr_gate(n, addr) \
16664 do { \
16665 BUG_ON((unsigned)n > 0xFF); \
16666- _set_gate(n, GATE_INTERRUPT, (void *)addr, 0, 0, \
16667+ _set_gate(n, GATE_INTERRUPT, (const void *)addr, 0, 0, \
16668 __KERNEL_CS); \
16669- _trace_set_gate(n, GATE_INTERRUPT, (void *)trace_##addr,\
16670+ _trace_set_gate(n, GATE_INTERRUPT, (const void *)trace_##addr,\
16671 0, 0, __KERNEL_CS); \
16672 } while (0)
16673
16674@@ -409,19 +422,19 @@ static inline void alloc_system_vector(int vector)
16675 /*
16676 * This routine sets up an interrupt gate at directory privilege level 3.
16677 */
16678-static inline void set_system_intr_gate(unsigned int n, void *addr)
16679+static inline void set_system_intr_gate(unsigned int n, const void *addr)
16680 {
16681 BUG_ON((unsigned)n > 0xFF);
16682 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
16683 }
16684
16685-static inline void set_system_trap_gate(unsigned int n, void *addr)
16686+static inline void set_system_trap_gate(unsigned int n, const void *addr)
16687 {
16688 BUG_ON((unsigned)n > 0xFF);
16689 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
16690 }
16691
16692-static inline void set_trap_gate(unsigned int n, void *addr)
16693+static inline void set_trap_gate(unsigned int n, const void *addr)
16694 {
16695 BUG_ON((unsigned)n > 0xFF);
16696 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
16697@@ -430,16 +443,16 @@ static inline void set_trap_gate(unsigned int n, void *addr)
16698 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
16699 {
16700 BUG_ON((unsigned)n > 0xFF);
16701- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
16702+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
16703 }
16704
16705-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
16706+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
16707 {
16708 BUG_ON((unsigned)n > 0xFF);
16709 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
16710 }
16711
16712-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
16713+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
16714 {
16715 BUG_ON((unsigned)n > 0xFF);
16716 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
16717@@ -511,4 +524,17 @@ static inline void load_current_idt(void)
16718 else
16719 load_idt((const struct desc_ptr *)&idt_descr);
16720 }
16721+
16722+#ifdef CONFIG_X86_32
16723+static inline void set_user_cs(unsigned long base, unsigned long limit, int cpu)
16724+{
16725+ struct desc_struct d;
16726+
16727+ if (likely(limit))
16728+ limit = (limit - 1UL) >> PAGE_SHIFT;
16729+ pack_descriptor(&d, base, limit, 0xFB, 0xC);
16730+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_DEFAULT_USER_CS, &d, DESCTYPE_S);
16731+}
16732+#endif
16733+
16734 #endif /* _ASM_X86_DESC_H */
16735diff --git a/arch/x86/include/asm/desc_defs.h b/arch/x86/include/asm/desc_defs.h
16736index 278441f..b95a174 100644
16737--- a/arch/x86/include/asm/desc_defs.h
16738+++ b/arch/x86/include/asm/desc_defs.h
16739@@ -31,6 +31,12 @@ struct desc_struct {
16740 unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
16741 unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
16742 };
16743+ struct {
16744+ u16 offset_low;
16745+ u16 seg;
16746+ unsigned reserved: 8, type: 4, s: 1, dpl: 2, p: 1;
16747+ unsigned offset_high: 16;
16748+ } gate;
16749 };
16750 } __attribute__((packed));
16751
16752diff --git a/arch/x86/include/asm/div64.h b/arch/x86/include/asm/div64.h
16753index ced283a..ffe04cc 100644
16754--- a/arch/x86/include/asm/div64.h
16755+++ b/arch/x86/include/asm/div64.h
16756@@ -39,7 +39,7 @@
16757 __mod; \
16758 })
16759
16760-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16761+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
16762 {
16763 union {
16764 u64 v64;
16765diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h
16766index ca3347a..1a5082a 100644
16767--- a/arch/x86/include/asm/elf.h
16768+++ b/arch/x86/include/asm/elf.h
16769@@ -75,9 +75,6 @@ typedef struct user_fxsr_struct elf_fpxregset_t;
16770
16771 #include <asm/vdso.h>
16772
16773-#ifdef CONFIG_X86_64
16774-extern unsigned int vdso64_enabled;
16775-#endif
16776 #if defined(CONFIG_X86_32) || defined(CONFIG_COMPAT)
16777 extern unsigned int vdso32_enabled;
16778 #endif
16779@@ -249,7 +246,25 @@ extern int force_personality32;
16780 the loader. We need to make sure that it is out of the way of the program
16781 that it will "exec", and that there is sufficient room for the brk. */
16782
16783+#ifdef CONFIG_PAX_SEGMEXEC
16784+#define ELF_ET_DYN_BASE ((current->mm->pax_flags & MF_PAX_SEGMEXEC) ? SEGMEXEC_TASK_SIZE/3*2 : TASK_SIZE/3*2)
16785+#else
16786 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
16787+#endif
16788+
16789+#ifdef CONFIG_PAX_ASLR
16790+#ifdef CONFIG_X86_32
16791+#define PAX_ELF_ET_DYN_BASE 0x10000000UL
16792+
16793+#define PAX_DELTA_MMAP_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16794+#define PAX_DELTA_STACK_LEN (current->mm->pax_flags & MF_PAX_SEGMEXEC ? 15 : 16)
16795+#else
16796+#define PAX_ELF_ET_DYN_BASE 0x400000UL
16797+
16798+#define PAX_DELTA_MMAP_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16799+#define PAX_DELTA_STACK_LEN ((test_thread_flag(TIF_ADDR32)) ? 16 : TASK_SIZE_MAX_SHIFT - PAGE_SHIFT - 3)
16800+#endif
16801+#endif
16802
16803 /* This yields a mask that user programs can use to figure out what
16804 instruction set this CPU supports. This could be done in user space,
16805@@ -298,17 +313,13 @@ do { \
16806
16807 #define ARCH_DLINFO \
16808 do { \
16809- if (vdso64_enabled) \
16810- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16811- (unsigned long __force)current->mm->context.vdso); \
16812+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16813 } while (0)
16814
16815 /* As a historical oddity, the x32 and x86_64 vDSOs are controlled together. */
16816 #define ARCH_DLINFO_X32 \
16817 do { \
16818- if (vdso64_enabled) \
16819- NEW_AUX_ENT(AT_SYSINFO_EHDR, \
16820- (unsigned long __force)current->mm->context.vdso); \
16821+ NEW_AUX_ENT(AT_SYSINFO_EHDR, current->mm->context.vdso); \
16822 } while (0)
16823
16824 #define AT_SYSINFO 32
16825@@ -323,10 +334,10 @@ else \
16826
16827 #endif /* !CONFIG_X86_32 */
16828
16829-#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
16830+#define VDSO_CURRENT_BASE (current->mm->context.vdso)
16831
16832 #define VDSO_ENTRY \
16833- ((unsigned long)current->mm->context.vdso + \
16834+ (current->mm->context.vdso + \
16835 selected_vdso32->sym___kernel_vsyscall)
16836
16837 struct linux_binprm;
16838@@ -338,9 +349,6 @@ extern int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
16839 int uses_interp);
16840 #define compat_arch_setup_additional_pages compat_arch_setup_additional_pages
16841
16842-extern unsigned long arch_randomize_brk(struct mm_struct *mm);
16843-#define arch_randomize_brk arch_randomize_brk
16844-
16845 /*
16846 * True on X86_32 or when emulating IA32 on X86_64
16847 */
16848diff --git a/arch/x86/include/asm/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
16849index 77a99ac..39ff7f5 100644
16850--- a/arch/x86/include/asm/emergency-restart.h
16851+++ b/arch/x86/include/asm/emergency-restart.h
16852@@ -1,6 +1,6 @@
16853 #ifndef _ASM_X86_EMERGENCY_RESTART_H
16854 #define _ASM_X86_EMERGENCY_RESTART_H
16855
16856-extern void machine_emergency_restart(void);
16857+extern void machine_emergency_restart(void) __noreturn;
16858
16859 #endif /* _ASM_X86_EMERGENCY_RESTART_H */
16860diff --git a/arch/x86/include/asm/floppy.h b/arch/x86/include/asm/floppy.h
16861index 1c7eefe..d0e4702 100644
16862--- a/arch/x86/include/asm/floppy.h
16863+++ b/arch/x86/include/asm/floppy.h
16864@@ -229,18 +229,18 @@ static struct fd_routine_l {
16865 int (*_dma_setup)(char *addr, unsigned long size, int mode, int io);
16866 } fd_routine[] = {
16867 {
16868- request_dma,
16869- free_dma,
16870- get_dma_residue,
16871- dma_mem_alloc,
16872- hard_dma_setup
16873+ ._request_dma = request_dma,
16874+ ._free_dma = free_dma,
16875+ ._get_dma_residue = get_dma_residue,
16876+ ._dma_mem_alloc = dma_mem_alloc,
16877+ ._dma_setup = hard_dma_setup
16878 },
16879 {
16880- vdma_request_dma,
16881- vdma_nop,
16882- vdma_get_dma_residue,
16883- vdma_mem_alloc,
16884- vdma_dma_setup
16885+ ._request_dma = vdma_request_dma,
16886+ ._free_dma = vdma_nop,
16887+ ._get_dma_residue = vdma_get_dma_residue,
16888+ ._dma_mem_alloc = vdma_mem_alloc,
16889+ ._dma_setup = vdma_dma_setup
16890 }
16891 };
16892
16893diff --git a/arch/x86/include/asm/fpu-internal.h b/arch/x86/include/asm/fpu-internal.h
16894index 72ba21a..79f3f66 100644
16895--- a/arch/x86/include/asm/fpu-internal.h
16896+++ b/arch/x86/include/asm/fpu-internal.h
16897@@ -124,8 +124,11 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16898 #define user_insn(insn, output, input...) \
16899 ({ \
16900 int err; \
16901+ pax_open_userland(); \
16902 asm volatile(ASM_STAC "\n" \
16903- "1:" #insn "\n\t" \
16904+ "1:" \
16905+ __copyuser_seg \
16906+ #insn "\n\t" \
16907 "2: " ASM_CLAC "\n" \
16908 ".section .fixup,\"ax\"\n" \
16909 "3: movl $-1,%[err]\n" \
16910@@ -134,6 +137,7 @@ static inline void sanitize_i387_state(struct task_struct *tsk)
16911 _ASM_EXTABLE(1b, 3b) \
16912 : [err] "=r" (err), output \
16913 : "0"(0), input); \
16914+ pax_close_userland(); \
16915 err; \
16916 })
16917
16918@@ -300,7 +304,7 @@ static inline int restore_fpu_checking(struct task_struct *tsk)
16919 "fnclex\n\t"
16920 "emms\n\t"
16921 "fildl %P[addr]" /* set F?P to defined value */
16922- : : [addr] "m" (tsk->thread.fpu.has_fpu));
16923+ : : [addr] "m" (init_tss[raw_smp_processor_id()].x86_tss.sp0));
16924 }
16925
16926 return fpu_restore_checking(&tsk->thread.fpu);
16927diff --git a/arch/x86/include/asm/futex.h b/arch/x86/include/asm/futex.h
16928index b4c1f54..e290c08 100644
16929--- a/arch/x86/include/asm/futex.h
16930+++ b/arch/x86/include/asm/futex.h
16931@@ -12,6 +12,7 @@
16932 #include <asm/smap.h>
16933
16934 #define __futex_atomic_op1(insn, ret, oldval, uaddr, oparg) \
16935+ typecheck(u32 __user *, uaddr); \
16936 asm volatile("\t" ASM_STAC "\n" \
16937 "1:\t" insn "\n" \
16938 "2:\t" ASM_CLAC "\n" \
16939@@ -20,15 +21,16 @@
16940 "\tjmp\t2b\n" \
16941 "\t.previous\n" \
16942 _ASM_EXTABLE(1b, 3b) \
16943- : "=r" (oldval), "=r" (ret), "+m" (*uaddr) \
16944+ : "=r" (oldval), "=r" (ret), "+m" (*(u32 __user *)____m(uaddr)) \
16945 : "i" (-EFAULT), "0" (oparg), "1" (0))
16946
16947 #define __futex_atomic_op2(insn, ret, oldval, uaddr, oparg) \
16948+ typecheck(u32 __user *, uaddr); \
16949 asm volatile("\t" ASM_STAC "\n" \
16950 "1:\tmovl %2, %0\n" \
16951 "\tmovl\t%0, %3\n" \
16952 "\t" insn "\n" \
16953- "2:\t" LOCK_PREFIX "cmpxchgl %3, %2\n" \
16954+ "2:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %3, %2\n" \
16955 "\tjnz\t1b\n" \
16956 "3:\t" ASM_CLAC "\n" \
16957 "\t.section .fixup,\"ax\"\n" \
16958@@ -38,7 +40,7 @@
16959 _ASM_EXTABLE(1b, 4b) \
16960 _ASM_EXTABLE(2b, 4b) \
16961 : "=&a" (oldval), "=&r" (ret), \
16962- "+m" (*uaddr), "=&r" (tem) \
16963+ "+m" (*(u32 __user *)____m(uaddr)), "=&r" (tem) \
16964 : "r" (oparg), "i" (-EFAULT), "1" (0))
16965
16966 static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16967@@ -57,12 +59,13 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16968
16969 pagefault_disable();
16970
16971+ pax_open_userland();
16972 switch (op) {
16973 case FUTEX_OP_SET:
16974- __futex_atomic_op1("xchgl %0, %2", ret, oldval, uaddr, oparg);
16975+ __futex_atomic_op1(__copyuser_seg"xchgl %0, %2", ret, oldval, uaddr, oparg);
16976 break;
16977 case FUTEX_OP_ADD:
16978- __futex_atomic_op1(LOCK_PREFIX "xaddl %0, %2", ret, oldval,
16979+ __futex_atomic_op1(LOCK_PREFIX __copyuser_seg"xaddl %0, %2", ret, oldval,
16980 uaddr, oparg);
16981 break;
16982 case FUTEX_OP_OR:
16983@@ -77,6 +80,7 @@ static inline int futex_atomic_op_inuser(int encoded_op, u32 __user *uaddr)
16984 default:
16985 ret = -ENOSYS;
16986 }
16987+ pax_close_userland();
16988
16989 pagefault_enable();
16990
16991diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
16992index 9662290..49ca5e5 100644
16993--- a/arch/x86/include/asm/hw_irq.h
16994+++ b/arch/x86/include/asm/hw_irq.h
16995@@ -160,8 +160,8 @@ static inline void unlock_vector_lock(void) {}
16996 #endif /* CONFIG_X86_LOCAL_APIC */
16997
16998 /* Statistics */
16999-extern atomic_t irq_err_count;
17000-extern atomic_t irq_mis_count;
17001+extern atomic_unchecked_t irq_err_count;
17002+extern atomic_unchecked_t irq_mis_count;
17003
17004 /* EISA */
17005 extern void eisa_set_level_irq(unsigned int irq);
17006diff --git a/arch/x86/include/asm/i8259.h b/arch/x86/include/asm/i8259.h
17007index ccffa53..3c90c87 100644
17008--- a/arch/x86/include/asm/i8259.h
17009+++ b/arch/x86/include/asm/i8259.h
17010@@ -62,7 +62,7 @@ struct legacy_pic {
17011 void (*init)(int auto_eoi);
17012 int (*irq_pending)(unsigned int irq);
17013 void (*make_irq)(unsigned int irq);
17014-};
17015+} __do_const;
17016
17017 extern struct legacy_pic *legacy_pic;
17018 extern struct legacy_pic null_legacy_pic;
17019diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
17020index 34a5b93..27e40a6 100644
17021--- a/arch/x86/include/asm/io.h
17022+++ b/arch/x86/include/asm/io.h
17023@@ -52,12 +52,12 @@ static inline void name(type val, volatile void __iomem *addr) \
17024 "m" (*(volatile type __force *)addr) barrier); }
17025
17026 build_mmio_read(readb, "b", unsigned char, "=q", :"memory")
17027-build_mmio_read(readw, "w", unsigned short, "=r", :"memory")
17028-build_mmio_read(readl, "l", unsigned int, "=r", :"memory")
17029+build_mmio_read(__intentional_overflow(-1) readw, "w", unsigned short, "=r", :"memory")
17030+build_mmio_read(__intentional_overflow(-1) readl, "l", unsigned int, "=r", :"memory")
17031
17032 build_mmio_read(__readb, "b", unsigned char, "=q", )
17033-build_mmio_read(__readw, "w", unsigned short, "=r", )
17034-build_mmio_read(__readl, "l", unsigned int, "=r", )
17035+build_mmio_read(__intentional_overflow(-1) __readw, "w", unsigned short, "=r", )
17036+build_mmio_read(__intentional_overflow(-1) __readl, "l", unsigned int, "=r", )
17037
17038 build_mmio_write(writeb, "b", unsigned char, "q", :"memory")
17039 build_mmio_write(writew, "w", unsigned short, "r", :"memory")
17040@@ -113,7 +113,7 @@ build_mmio_write(writeq, "q", unsigned long, "r", :"memory")
17041 * this function
17042 */
17043
17044-static inline phys_addr_t virt_to_phys(volatile void *address)
17045+static inline phys_addr_t __intentional_overflow(-1) virt_to_phys(volatile void *address)
17046 {
17047 return __pa(address);
17048 }
17049@@ -189,7 +189,7 @@ static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
17050 return ioremap_nocache(offset, size);
17051 }
17052
17053-extern void iounmap(volatile void __iomem *addr);
17054+extern void iounmap(const volatile void __iomem *addr);
17055
17056 extern void set_iounmap_nonlazy(void);
17057
17058@@ -199,6 +199,17 @@ extern void set_iounmap_nonlazy(void);
17059
17060 #include <linux/vmalloc.h>
17061
17062+#define ARCH_HAS_VALID_PHYS_ADDR_RANGE
17063+static inline int valid_phys_addr_range(unsigned long addr, size_t count)
17064+{
17065+ return ((addr + count + PAGE_SIZE - 1) >> PAGE_SHIFT) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17066+}
17067+
17068+static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t count)
17069+{
17070+ return (pfn + (count >> PAGE_SHIFT)) < (1ULL << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0;
17071+}
17072+
17073 /*
17074 * Convert a virtual cached pointer to an uncached pointer
17075 */
17076diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
17077index 0a8b519..80e7d5b 100644
17078--- a/arch/x86/include/asm/irqflags.h
17079+++ b/arch/x86/include/asm/irqflags.h
17080@@ -141,6 +141,11 @@ static inline notrace unsigned long arch_local_irq_save(void)
17081 sti; \
17082 sysexit
17083
17084+#define GET_CR0_INTO_RDI mov %cr0, %rdi
17085+#define SET_RDI_INTO_CR0 mov %rdi, %cr0
17086+#define GET_CR3_INTO_RDI mov %cr3, %rdi
17087+#define SET_RDI_INTO_CR3 mov %rdi, %cr3
17088+
17089 #else
17090 #define INTERRUPT_RETURN iret
17091 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
17092diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
17093index 4421b5d..8543006 100644
17094--- a/arch/x86/include/asm/kprobes.h
17095+++ b/arch/x86/include/asm/kprobes.h
17096@@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
17097 #define RELATIVEJUMP_SIZE 5
17098 #define RELATIVECALL_OPCODE 0xe8
17099 #define RELATIVE_ADDR_SIZE 4
17100-#define MAX_STACK_SIZE 64
17101-#define MIN_STACK_SIZE(ADDR) \
17102- (((MAX_STACK_SIZE) < (((unsigned long)current_thread_info()) + \
17103- THREAD_SIZE - (unsigned long)(ADDR))) \
17104- ? (MAX_STACK_SIZE) \
17105- : (((unsigned long)current_thread_info()) + \
17106- THREAD_SIZE - (unsigned long)(ADDR)))
17107+#define MAX_STACK_SIZE 64UL
17108+#define MIN_STACK_SIZE(ADDR) min(MAX_STACK_SIZE, current->thread.sp0 - (unsigned long)(ADDR))
17109
17110 #define flush_insn_slot(p) do { } while (0)
17111
17112diff --git a/arch/x86/include/asm/local.h b/arch/x86/include/asm/local.h
17113index 4ad6560..75c7bdd 100644
17114--- a/arch/x86/include/asm/local.h
17115+++ b/arch/x86/include/asm/local.h
17116@@ -10,33 +10,97 @@ typedef struct {
17117 atomic_long_t a;
17118 } local_t;
17119
17120+typedef struct {
17121+ atomic_long_unchecked_t a;
17122+} local_unchecked_t;
17123+
17124 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
17125
17126 #define local_read(l) atomic_long_read(&(l)->a)
17127+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
17128 #define local_set(l, i) atomic_long_set(&(l)->a, (i))
17129+#define local_set_unchecked(l, i) atomic_long_set_unchecked(&(l)->a, (i))
17130
17131 static inline void local_inc(local_t *l)
17132 {
17133- asm volatile(_ASM_INC "%0"
17134+ asm volatile(_ASM_INC "%0\n"
17135+
17136+#ifdef CONFIG_PAX_REFCOUNT
17137+ "jno 0f\n"
17138+ _ASM_DEC "%0\n"
17139+ "int $4\n0:\n"
17140+ _ASM_EXTABLE(0b, 0b)
17141+#endif
17142+
17143+ : "+m" (l->a.counter));
17144+}
17145+
17146+static inline void local_inc_unchecked(local_unchecked_t *l)
17147+{
17148+ asm volatile(_ASM_INC "%0\n"
17149 : "+m" (l->a.counter));
17150 }
17151
17152 static inline void local_dec(local_t *l)
17153 {
17154- asm volatile(_ASM_DEC "%0"
17155+ asm volatile(_ASM_DEC "%0\n"
17156+
17157+#ifdef CONFIG_PAX_REFCOUNT
17158+ "jno 0f\n"
17159+ _ASM_INC "%0\n"
17160+ "int $4\n0:\n"
17161+ _ASM_EXTABLE(0b, 0b)
17162+#endif
17163+
17164+ : "+m" (l->a.counter));
17165+}
17166+
17167+static inline void local_dec_unchecked(local_unchecked_t *l)
17168+{
17169+ asm volatile(_ASM_DEC "%0\n"
17170 : "+m" (l->a.counter));
17171 }
17172
17173 static inline void local_add(long i, local_t *l)
17174 {
17175- asm volatile(_ASM_ADD "%1,%0"
17176+ asm volatile(_ASM_ADD "%1,%0\n"
17177+
17178+#ifdef CONFIG_PAX_REFCOUNT
17179+ "jno 0f\n"
17180+ _ASM_SUB "%1,%0\n"
17181+ "int $4\n0:\n"
17182+ _ASM_EXTABLE(0b, 0b)
17183+#endif
17184+
17185+ : "+m" (l->a.counter)
17186+ : "ir" (i));
17187+}
17188+
17189+static inline void local_add_unchecked(long i, local_unchecked_t *l)
17190+{
17191+ asm volatile(_ASM_ADD "%1,%0\n"
17192 : "+m" (l->a.counter)
17193 : "ir" (i));
17194 }
17195
17196 static inline void local_sub(long i, local_t *l)
17197 {
17198- asm volatile(_ASM_SUB "%1,%0"
17199+ asm volatile(_ASM_SUB "%1,%0\n"
17200+
17201+#ifdef CONFIG_PAX_REFCOUNT
17202+ "jno 0f\n"
17203+ _ASM_ADD "%1,%0\n"
17204+ "int $4\n0:\n"
17205+ _ASM_EXTABLE(0b, 0b)
17206+#endif
17207+
17208+ : "+m" (l->a.counter)
17209+ : "ir" (i));
17210+}
17211+
17212+static inline void local_sub_unchecked(long i, local_unchecked_t *l)
17213+{
17214+ asm volatile(_ASM_SUB "%1,%0\n"
17215 : "+m" (l->a.counter)
17216 : "ir" (i));
17217 }
17218@@ -52,7 +116,7 @@ static inline void local_sub(long i, local_t *l)
17219 */
17220 static inline int local_sub_and_test(long i, local_t *l)
17221 {
17222- GEN_BINARY_RMWcc(_ASM_SUB, l->a.counter, "er", i, "%0", "e");
17223+ GEN_BINARY_RMWcc(_ASM_SUB, _ASM_ADD, l->a.counter, "er", i, "%0", "e");
17224 }
17225
17226 /**
17227@@ -65,7 +129,7 @@ static inline int local_sub_and_test(long i, local_t *l)
17228 */
17229 static inline int local_dec_and_test(local_t *l)
17230 {
17231- GEN_UNARY_RMWcc(_ASM_DEC, l->a.counter, "%0", "e");
17232+ GEN_UNARY_RMWcc(_ASM_DEC, _ASM_INC, l->a.counter, "%0", "e");
17233 }
17234
17235 /**
17236@@ -78,7 +142,7 @@ static inline int local_dec_and_test(local_t *l)
17237 */
17238 static inline int local_inc_and_test(local_t *l)
17239 {
17240- GEN_UNARY_RMWcc(_ASM_INC, l->a.counter, "%0", "e");
17241+ GEN_UNARY_RMWcc(_ASM_INC, _ASM_DEC, l->a.counter, "%0", "e");
17242 }
17243
17244 /**
17245@@ -92,7 +156,7 @@ static inline int local_inc_and_test(local_t *l)
17246 */
17247 static inline int local_add_negative(long i, local_t *l)
17248 {
17249- GEN_BINARY_RMWcc(_ASM_ADD, l->a.counter, "er", i, "%0", "s");
17250+ GEN_BINARY_RMWcc(_ASM_ADD, _ASM_SUB, l->a.counter, "er", i, "%0", "s");
17251 }
17252
17253 /**
17254@@ -105,6 +169,30 @@ static inline int local_add_negative(long i, local_t *l)
17255 static inline long local_add_return(long i, local_t *l)
17256 {
17257 long __i = i;
17258+ asm volatile(_ASM_XADD "%0, %1\n"
17259+
17260+#ifdef CONFIG_PAX_REFCOUNT
17261+ "jno 0f\n"
17262+ _ASM_MOV "%0,%1\n"
17263+ "int $4\n0:\n"
17264+ _ASM_EXTABLE(0b, 0b)
17265+#endif
17266+
17267+ : "+r" (i), "+m" (l->a.counter)
17268+ : : "memory");
17269+ return i + __i;
17270+}
17271+
17272+/**
17273+ * local_add_return_unchecked - add and return
17274+ * @i: integer value to add
17275+ * @l: pointer to type local_unchecked_t
17276+ *
17277+ * Atomically adds @i to @l and returns @i + @l
17278+ */
17279+static inline long local_add_return_unchecked(long i, local_unchecked_t *l)
17280+{
17281+ long __i = i;
17282 asm volatile(_ASM_XADD "%0, %1;"
17283 : "+r" (i), "+m" (l->a.counter)
17284 : : "memory");
17285@@ -121,6 +209,8 @@ static inline long local_sub_return(long i, local_t *l)
17286
17287 #define local_cmpxchg(l, o, n) \
17288 (cmpxchg_local(&((l)->a.counter), (o), (n)))
17289+#define local_cmpxchg_unchecked(l, o, n) \
17290+ (cmpxchg_local(&((l)->a.counter), (o), (n)))
17291 /* Always has a lock prefix */
17292 #define local_xchg(l, n) (xchg(&((l)->a.counter), (n)))
17293
17294diff --git a/arch/x86/include/asm/mman.h b/arch/x86/include/asm/mman.h
17295new file mode 100644
17296index 0000000..2bfd3ba
17297--- /dev/null
17298+++ b/arch/x86/include/asm/mman.h
17299@@ -0,0 +1,15 @@
17300+#ifndef _X86_MMAN_H
17301+#define _X86_MMAN_H
17302+
17303+#include <uapi/asm/mman.h>
17304+
17305+#ifdef __KERNEL__
17306+#ifndef __ASSEMBLY__
17307+#ifdef CONFIG_X86_32
17308+#define arch_mmap_check i386_mmap_check
17309+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags);
17310+#endif
17311+#endif
17312+#endif
17313+
17314+#endif /* X86_MMAN_H */
17315diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h
17316index 09b9620..923aecd 100644
17317--- a/arch/x86/include/asm/mmu.h
17318+++ b/arch/x86/include/asm/mmu.h
17319@@ -9,7 +9,7 @@
17320 * we put the segment information here.
17321 */
17322 typedef struct {
17323- void *ldt;
17324+ struct desc_struct *ldt;
17325 int size;
17326
17327 #ifdef CONFIG_X86_64
17328@@ -18,7 +18,19 @@ typedef struct {
17329 #endif
17330
17331 struct mutex lock;
17332- void __user *vdso;
17333+ unsigned long vdso;
17334+
17335+#ifdef CONFIG_X86_32
17336+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
17337+ unsigned long user_cs_base;
17338+ unsigned long user_cs_limit;
17339+
17340+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17341+ cpumask_t cpu_user_cs_mask;
17342+#endif
17343+
17344+#endif
17345+#endif
17346
17347 atomic_t perf_rdpmc_allowed; /* nonzero if rdpmc is allowed */
17348 } mm_context_t;
17349diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
17350index 883f6b93..6869d96 100644
17351--- a/arch/x86/include/asm/mmu_context.h
17352+++ b/arch/x86/include/asm/mmu_context.h
17353@@ -42,6 +42,20 @@ void destroy_context(struct mm_struct *mm);
17354
17355 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
17356 {
17357+
17358+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17359+ if (!(static_cpu_has(X86_FEATURE_PCID))) {
17360+ unsigned int i;
17361+ pgd_t *pgd;
17362+
17363+ pax_open_kernel();
17364+ pgd = get_cpu_pgd(smp_processor_id(), kernel);
17365+ for (i = USER_PGD_PTRS; i < 2 * USER_PGD_PTRS; ++i)
17366+ set_pgd_batched(pgd+i, native_make_pgd(0));
17367+ pax_close_kernel();
17368+ }
17369+#endif
17370+
17371 #ifdef CONFIG_SMP
17372 if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
17373 this_cpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
17374@@ -52,16 +66,59 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17375 struct task_struct *tsk)
17376 {
17377 unsigned cpu = smp_processor_id();
17378+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17379+ int tlbstate = TLBSTATE_OK;
17380+#endif
17381
17382 if (likely(prev != next)) {
17383 #ifdef CONFIG_SMP
17384+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17385+ tlbstate = this_cpu_read(cpu_tlbstate.state);
17386+#endif
17387 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17388 this_cpu_write(cpu_tlbstate.active_mm, next);
17389 #endif
17390 cpumask_set_cpu(cpu, mm_cpumask(next));
17391
17392 /* Re-load page tables */
17393+#ifdef CONFIG_PAX_PER_CPU_PGD
17394+ pax_open_kernel();
17395+
17396+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17397+ if (static_cpu_has(X86_FEATURE_PCID))
17398+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17399+ else
17400+#endif
17401+
17402+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17403+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17404+ pax_close_kernel();
17405+ 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));
17406+
17407+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17408+ if (static_cpu_has(X86_FEATURE_PCID)) {
17409+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17410+ u64 descriptor[2];
17411+ descriptor[0] = PCID_USER;
17412+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17413+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17414+ descriptor[0] = PCID_KERNEL;
17415+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17416+ }
17417+ } else {
17418+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17419+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17420+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17421+ else
17422+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17423+ }
17424+ } else
17425+#endif
17426+
17427+ load_cr3(get_cpu_pgd(cpu, kernel));
17428+#else
17429 load_cr3(next->pgd);
17430+#endif
17431 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17432
17433 /* Stop flush ipis for the previous mm */
17434@@ -84,9 +141,67 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17435 */
17436 if (unlikely(prev->context.ldt != next->context.ldt))
17437 load_LDT_nolock(&next->context);
17438+
17439+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
17440+ if (!(__supported_pte_mask & _PAGE_NX)) {
17441+ smp_mb__before_atomic();
17442+ cpu_clear(cpu, prev->context.cpu_user_cs_mask);
17443+ smp_mb__after_atomic();
17444+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17445+ }
17446+#endif
17447+
17448+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17449+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
17450+ prev->context.user_cs_limit != next->context.user_cs_limit))
17451+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17452+#ifdef CONFIG_SMP
17453+ else if (unlikely(tlbstate != TLBSTATE_OK))
17454+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17455+#endif
17456+#endif
17457+
17458 }
17459+ else {
17460+
17461+#ifdef CONFIG_PAX_PER_CPU_PGD
17462+ pax_open_kernel();
17463+
17464+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17465+ if (static_cpu_has(X86_FEATURE_PCID))
17466+ __clone_user_pgds(get_cpu_pgd(cpu, user), next->pgd);
17467+ else
17468+#endif
17469+
17470+ __clone_user_pgds(get_cpu_pgd(cpu, kernel), next->pgd);
17471+ __shadow_user_pgds(get_cpu_pgd(cpu, kernel) + USER_PGD_PTRS, next->pgd);
17472+ pax_close_kernel();
17473+ 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));
17474+
17475+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17476+ if (static_cpu_has(X86_FEATURE_PCID)) {
17477+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
17478+ u64 descriptor[2];
17479+ descriptor[0] = PCID_USER;
17480+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17481+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF)) {
17482+ descriptor[0] = PCID_KERNEL;
17483+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_CONTEXT) : "memory");
17484+ }
17485+ } else {
17486+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
17487+ if (static_cpu_has(X86_FEATURE_STRONGUDEREF))
17488+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
17489+ else
17490+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
17491+ }
17492+ } else
17493+#endif
17494+
17495+ load_cr3(get_cpu_pgd(cpu, kernel));
17496+#endif
17497+
17498 #ifdef CONFIG_SMP
17499- else {
17500 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
17501 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
17502
17503@@ -103,13 +218,30 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
17504 * tlb flush IPI delivery. We must reload CR3
17505 * to make sure to use no freed page tables.
17506 */
17507+
17508+#ifndef CONFIG_PAX_PER_CPU_PGD
17509 load_cr3(next->pgd);
17510 trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
17511+#endif
17512+
17513 load_mm_cr4(next);
17514 load_LDT_nolock(&next->context);
17515+
17516+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
17517+ if (!(__supported_pte_mask & _PAGE_NX))
17518+ cpu_set(cpu, next->context.cpu_user_cs_mask);
17519+#endif
17520+
17521+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC))
17522+#ifdef CONFIG_PAX_PAGEEXEC
17523+ if (!((next->pax_flags & MF_PAX_PAGEEXEC) && (__supported_pte_mask & _PAGE_NX)))
17524+#endif
17525+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
17526+#endif
17527+
17528 }
17529+#endif
17530 }
17531-#endif
17532 }
17533
17534 #define activate_mm(prev, next) \
17535diff --git a/arch/x86/include/asm/module.h b/arch/x86/include/asm/module.h
17536index e3b7819..b257c64 100644
17537--- a/arch/x86/include/asm/module.h
17538+++ b/arch/x86/include/asm/module.h
17539@@ -5,6 +5,7 @@
17540
17541 #ifdef CONFIG_X86_64
17542 /* X86_64 does not define MODULE_PROC_FAMILY */
17543+#define MODULE_PROC_FAMILY ""
17544 #elif defined CONFIG_M486
17545 #define MODULE_PROC_FAMILY "486 "
17546 #elif defined CONFIG_M586
17547@@ -57,8 +58,20 @@
17548 #error unknown processor family
17549 #endif
17550
17551-#ifdef CONFIG_X86_32
17552-# define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY
17553+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS
17554+#define MODULE_PAX_KERNEXEC "KERNEXEC_BTS "
17555+#elif defined(CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR)
17556+#define MODULE_PAX_KERNEXEC "KERNEXEC_OR "
17557+#else
17558+#define MODULE_PAX_KERNEXEC ""
17559 #endif
17560
17561+#ifdef CONFIG_PAX_MEMORY_UDEREF
17562+#define MODULE_PAX_UDEREF "UDEREF "
17563+#else
17564+#define MODULE_PAX_UDEREF ""
17565+#endif
17566+
17567+#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF
17568+
17569 #endif /* _ASM_X86_MODULE_H */
17570diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
17571index 5f2fc44..106caa6 100644
17572--- a/arch/x86/include/asm/nmi.h
17573+++ b/arch/x86/include/asm/nmi.h
17574@@ -36,26 +36,35 @@ enum {
17575
17576 typedef int (*nmi_handler_t)(unsigned int, struct pt_regs *);
17577
17578+struct nmiaction;
17579+
17580+struct nmiwork {
17581+ const struct nmiaction *action;
17582+ u64 max_duration;
17583+ struct irq_work irq_work;
17584+};
17585+
17586 struct nmiaction {
17587 struct list_head list;
17588 nmi_handler_t handler;
17589- u64 max_duration;
17590- struct irq_work irq_work;
17591 unsigned long flags;
17592 const char *name;
17593-};
17594+ struct nmiwork *work;
17595+} __do_const;
17596
17597 #define register_nmi_handler(t, fn, fg, n, init...) \
17598 ({ \
17599- static struct nmiaction init fn##_na = { \
17600+ static struct nmiwork fn##_nw; \
17601+ static const struct nmiaction init fn##_na = { \
17602 .handler = (fn), \
17603 .name = (n), \
17604 .flags = (fg), \
17605+ .work = &fn##_nw, \
17606 }; \
17607 __register_nmi_handler((t), &fn##_na); \
17608 })
17609
17610-int __register_nmi_handler(unsigned int, struct nmiaction *);
17611+int __register_nmi_handler(unsigned int, const struct nmiaction *);
17612
17613 void unregister_nmi_handler(unsigned int, const char *);
17614
17615diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h
17616index 802dde3..9183e68 100644
17617--- a/arch/x86/include/asm/page.h
17618+++ b/arch/x86/include/asm/page.h
17619@@ -52,6 +52,7 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17620 __phys_addr_symbol(__phys_reloc_hide((unsigned long)(x)))
17621
17622 #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
17623+#define __early_va(x) ((void *)((unsigned long)(x)+__START_KERNEL_map - phys_base))
17624
17625 #define __boot_va(x) __va(x)
17626 #define __boot_pa(x) __pa(x)
17627@@ -60,11 +61,21 @@ static inline void copy_user_page(void *to, void *from, unsigned long vaddr,
17628 * virt_to_page(kaddr) returns a valid pointer if and only if
17629 * virt_addr_valid(kaddr) returns true.
17630 */
17631-#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17632 #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
17633 extern bool __virt_addr_valid(unsigned long kaddr);
17634 #define virt_addr_valid(kaddr) __virt_addr_valid((unsigned long) (kaddr))
17635
17636+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
17637+#define virt_to_page(kaddr) \
17638+ ({ \
17639+ const void *__kaddr = (const void *)(kaddr); \
17640+ BUG_ON(!virt_addr_valid(__kaddr)); \
17641+ pfn_to_page(__pa(__kaddr) >> PAGE_SHIFT); \
17642+ })
17643+#else
17644+#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
17645+#endif
17646+
17647 #endif /* __ASSEMBLY__ */
17648
17649 #include <asm-generic/memory_model.h>
17650diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h
17651index b3bebf9..13ac22e 100644
17652--- a/arch/x86/include/asm/page_64.h
17653+++ b/arch/x86/include/asm/page_64.h
17654@@ -7,9 +7,9 @@
17655
17656 /* duplicated to the one in bootmem.h */
17657 extern unsigned long max_pfn;
17658-extern unsigned long phys_base;
17659+extern const unsigned long phys_base;
17660
17661-static inline unsigned long __phys_addr_nodebug(unsigned long x)
17662+static inline unsigned long __intentional_overflow(-1) __phys_addr_nodebug(unsigned long x)
17663 {
17664 unsigned long y = x - __START_KERNEL_map;
17665
17666@@ -20,8 +20,8 @@ static inline unsigned long __phys_addr_nodebug(unsigned long x)
17667 }
17668
17669 #ifdef CONFIG_DEBUG_VIRTUAL
17670-extern unsigned long __phys_addr(unsigned long);
17671-extern unsigned long __phys_addr_symbol(unsigned long);
17672+extern unsigned long __intentional_overflow(-1) __phys_addr(unsigned long);
17673+extern unsigned long __intentional_overflow(-1) __phys_addr_symbol(unsigned long);
17674 #else
17675 #define __phys_addr(x) __phys_addr_nodebug(x)
17676 #define __phys_addr_symbol(x) \
17677diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
17678index 965c47d..ffe0af8 100644
17679--- a/arch/x86/include/asm/paravirt.h
17680+++ b/arch/x86/include/asm/paravirt.h
17681@@ -560,7 +560,7 @@ static inline pmd_t __pmd(pmdval_t val)
17682 return (pmd_t) { ret };
17683 }
17684
17685-static inline pmdval_t pmd_val(pmd_t pmd)
17686+static inline __intentional_overflow(-1) pmdval_t pmd_val(pmd_t pmd)
17687 {
17688 pmdval_t ret;
17689
17690@@ -626,6 +626,18 @@ static inline void set_pgd(pgd_t *pgdp, pgd_t pgd)
17691 val);
17692 }
17693
17694+static inline void set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
17695+{
17696+ pgdval_t val = native_pgd_val(pgd);
17697+
17698+ if (sizeof(pgdval_t) > sizeof(long))
17699+ PVOP_VCALL3(pv_mmu_ops.set_pgd_batched, pgdp,
17700+ val, (u64)val >> 32);
17701+ else
17702+ PVOP_VCALL2(pv_mmu_ops.set_pgd_batched, pgdp,
17703+ val);
17704+}
17705+
17706 static inline void pgd_clear(pgd_t *pgdp)
17707 {
17708 set_pgd(pgdp, __pgd(0));
17709@@ -710,6 +722,21 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,
17710 pv_mmu_ops.set_fixmap(idx, phys, flags);
17711 }
17712
17713+#ifdef CONFIG_PAX_KERNEXEC
17714+static inline unsigned long pax_open_kernel(void)
17715+{
17716+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_open_kernel);
17717+}
17718+
17719+static inline unsigned long pax_close_kernel(void)
17720+{
17721+ return PVOP_CALL0(unsigned long, pv_mmu_ops.pax_close_kernel);
17722+}
17723+#else
17724+static inline unsigned long pax_open_kernel(void) { return 0; }
17725+static inline unsigned long pax_close_kernel(void) { return 0; }
17726+#endif
17727+
17728 #if defined(CONFIG_SMP) && defined(CONFIG_PARAVIRT_SPINLOCKS)
17729
17730 static __always_inline void __ticket_lock_spinning(struct arch_spinlock *lock,
17731@@ -906,7 +933,7 @@ extern void default_banner(void);
17732
17733 #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4)
17734 #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4)
17735-#define PARA_INDIRECT(addr) *%cs:addr
17736+#define PARA_INDIRECT(addr) *%ss:addr
17737 #endif
17738
17739 #define INTERRUPT_RETURN \
17740@@ -981,6 +1008,21 @@ extern void default_banner(void);
17741 PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit), \
17742 CLBR_NONE, \
17743 jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))
17744+
17745+#define GET_CR0_INTO_RDI \
17746+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0); \
17747+ mov %rax,%rdi
17748+
17749+#define SET_RDI_INTO_CR0 \
17750+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
17751+
17752+#define GET_CR3_INTO_RDI \
17753+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_read_cr3); \
17754+ mov %rax,%rdi
17755+
17756+#define SET_RDI_INTO_CR3 \
17757+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_write_cr3)
17758+
17759 #endif /* CONFIG_X86_32 */
17760
17761 #endif /* __ASSEMBLY__ */
17762diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
17763index 7549b8b..f0edfda 100644
17764--- a/arch/x86/include/asm/paravirt_types.h
17765+++ b/arch/x86/include/asm/paravirt_types.h
17766@@ -84,7 +84,7 @@ struct pv_init_ops {
17767 */
17768 unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
17769 unsigned long addr, unsigned len);
17770-};
17771+} __no_const __no_randomize_layout;
17772
17773
17774 struct pv_lazy_ops {
17775@@ -92,13 +92,13 @@ struct pv_lazy_ops {
17776 void (*enter)(void);
17777 void (*leave)(void);
17778 void (*flush)(void);
17779-};
17780+} __no_randomize_layout;
17781
17782 struct pv_time_ops {
17783 unsigned long long (*sched_clock)(void);
17784 unsigned long long (*steal_clock)(int cpu);
17785 unsigned long (*get_tsc_khz)(void);
17786-};
17787+} __no_const __no_randomize_layout;
17788
17789 struct pv_cpu_ops {
17790 /* hooks for various privileged instructions */
17791@@ -192,7 +192,7 @@ struct pv_cpu_ops {
17792
17793 void (*start_context_switch)(struct task_struct *prev);
17794 void (*end_context_switch)(struct task_struct *next);
17795-};
17796+} __no_const __no_randomize_layout;
17797
17798 struct pv_irq_ops {
17799 /*
17800@@ -215,7 +215,7 @@ struct pv_irq_ops {
17801 #ifdef CONFIG_X86_64
17802 void (*adjust_exception_frame)(void);
17803 #endif
17804-};
17805+} __no_randomize_layout;
17806
17807 struct pv_apic_ops {
17808 #ifdef CONFIG_X86_LOCAL_APIC
17809@@ -223,7 +223,7 @@ struct pv_apic_ops {
17810 unsigned long start_eip,
17811 unsigned long start_esp);
17812 #endif
17813-};
17814+} __no_const __no_randomize_layout;
17815
17816 struct pv_mmu_ops {
17817 unsigned long (*read_cr2)(void);
17818@@ -313,6 +313,7 @@ struct pv_mmu_ops {
17819 struct paravirt_callee_save make_pud;
17820
17821 void (*set_pgd)(pgd_t *pudp, pgd_t pgdval);
17822+ void (*set_pgd_batched)(pgd_t *pudp, pgd_t pgdval);
17823 #endif /* PAGETABLE_LEVELS == 4 */
17824 #endif /* PAGETABLE_LEVELS >= 3 */
17825
17826@@ -324,7 +325,13 @@ struct pv_mmu_ops {
17827 an mfn. We can tell which is which from the index. */
17828 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx,
17829 phys_addr_t phys, pgprot_t flags);
17830-};
17831+
17832+#ifdef CONFIG_PAX_KERNEXEC
17833+ unsigned long (*pax_open_kernel)(void);
17834+ unsigned long (*pax_close_kernel)(void);
17835+#endif
17836+
17837+} __no_randomize_layout;
17838
17839 struct arch_spinlock;
17840 #ifdef CONFIG_SMP
17841@@ -336,11 +343,14 @@ typedef u16 __ticket_t;
17842 struct pv_lock_ops {
17843 struct paravirt_callee_save lock_spinning;
17844 void (*unlock_kick)(struct arch_spinlock *lock, __ticket_t ticket);
17845-};
17846+} __no_randomize_layout;
17847
17848 /* This contains all the paravirt structures: we get a convenient
17849 * number for each function using the offset which we use to indicate
17850- * what to patch. */
17851+ * what to patch.
17852+ * shouldn't be randomized due to the "NEAT TRICK" in paravirt.c
17853+ */
17854+
17855 struct paravirt_patch_template {
17856 struct pv_init_ops pv_init_ops;
17857 struct pv_time_ops pv_time_ops;
17858@@ -349,7 +359,7 @@ struct paravirt_patch_template {
17859 struct pv_apic_ops pv_apic_ops;
17860 struct pv_mmu_ops pv_mmu_ops;
17861 struct pv_lock_ops pv_lock_ops;
17862-};
17863+} __no_randomize_layout;
17864
17865 extern struct pv_info pv_info;
17866 extern struct pv_init_ops pv_init_ops;
17867diff --git a/arch/x86/include/asm/pgalloc.h b/arch/x86/include/asm/pgalloc.h
17868index c4412e9..90e88c5 100644
17869--- a/arch/x86/include/asm/pgalloc.h
17870+++ b/arch/x86/include/asm/pgalloc.h
17871@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm,
17872 pmd_t *pmd, pte_t *pte)
17873 {
17874 paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17875+ set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE));
17876+}
17877+
17878+static inline void pmd_populate_user(struct mm_struct *mm,
17879+ pmd_t *pmd, pte_t *pte)
17880+{
17881+ paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);
17882 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
17883 }
17884
17885@@ -108,12 +115,22 @@ static inline void __pmd_free_tlb(struct mmu_gather *tlb, pmd_t *pmd,
17886
17887 #ifdef CONFIG_X86_PAE
17888 extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
17889+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
17890+{
17891+ pud_populate(mm, pudp, pmd);
17892+}
17893 #else /* !CONFIG_X86_PAE */
17894 static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17895 {
17896 paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17897 set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));
17898 }
17899+
17900+static inline void pud_populate_kernel(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)
17901+{
17902+ paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);
17903+ set_pud(pud, __pud(_KERNPG_TABLE | __pa(pmd)));
17904+}
17905 #endif /* CONFIG_X86_PAE */
17906
17907 #if PAGETABLE_LEVELS > 3
17908@@ -123,6 +140,12 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17909 set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(pud)));
17910 }
17911
17912+static inline void pgd_populate_kernel(struct mm_struct *mm, pgd_t *pgd, pud_t *pud)
17913+{
17914+ paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);
17915+ set_pgd(pgd, __pgd(_KERNPG_TABLE | __pa(pud)));
17916+}
17917+
17918 static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)
17919 {
17920 return (pud_t *)get_zeroed_page(GFP_KERNEL|__GFP_REPEAT);
17921diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
17922index fd74a11..35fd5af 100644
17923--- a/arch/x86/include/asm/pgtable-2level.h
17924+++ b/arch/x86/include/asm/pgtable-2level.h
17925@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t *ptep , pte_t pte)
17926
17927 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17928 {
17929+ pax_open_kernel();
17930 *pmdp = pmd;
17931+ pax_close_kernel();
17932 }
17933
17934 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17935diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
17936index cdaa58c..e61122b 100644
17937--- a/arch/x86/include/asm/pgtable-3level.h
17938+++ b/arch/x86/include/asm/pgtable-3level.h
17939@@ -92,12 +92,16 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
17940
17941 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
17942 {
17943+ pax_open_kernel();
17944 set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));
17945+ pax_close_kernel();
17946 }
17947
17948 static inline void native_set_pud(pud_t *pudp, pud_t pud)
17949 {
17950+ pax_open_kernel();
17951 set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
17952+ pax_close_kernel();
17953 }
17954
17955 /*
17956diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
17957index a0c35bf..3647d79 100644
17958--- a/arch/x86/include/asm/pgtable.h
17959+++ b/arch/x86/include/asm/pgtable.h
17960@@ -47,6 +47,7 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17961
17962 #ifndef __PAGETABLE_PUD_FOLDED
17963 #define set_pgd(pgdp, pgd) native_set_pgd(pgdp, pgd)
17964+#define set_pgd_batched(pgdp, pgd) native_set_pgd_batched(pgdp, pgd)
17965 #define pgd_clear(pgd) native_pgd_clear(pgd)
17966 #endif
17967
17968@@ -84,12 +85,53 @@ extern struct mm_struct *pgd_page_get_mm(struct page *page);
17969
17970 #define arch_end_context_switch(prev) do {} while(0)
17971
17972+#define pax_open_kernel() native_pax_open_kernel()
17973+#define pax_close_kernel() native_pax_close_kernel()
17974 #endif /* CONFIG_PARAVIRT */
17975
17976+#define __HAVE_ARCH_PAX_OPEN_KERNEL
17977+#define __HAVE_ARCH_PAX_CLOSE_KERNEL
17978+
17979+#ifdef CONFIG_PAX_KERNEXEC
17980+static inline unsigned long native_pax_open_kernel(void)
17981+{
17982+ unsigned long cr0;
17983+
17984+ preempt_disable();
17985+ barrier();
17986+ cr0 = read_cr0() ^ X86_CR0_WP;
17987+ BUG_ON(cr0 & X86_CR0_WP);
17988+ write_cr0(cr0);
17989+ barrier();
17990+ return cr0 ^ X86_CR0_WP;
17991+}
17992+
17993+static inline unsigned long native_pax_close_kernel(void)
17994+{
17995+ unsigned long cr0;
17996+
17997+ barrier();
17998+ cr0 = read_cr0() ^ X86_CR0_WP;
17999+ BUG_ON(!(cr0 & X86_CR0_WP));
18000+ write_cr0(cr0);
18001+ barrier();
18002+ preempt_enable_no_resched();
18003+ return cr0 ^ X86_CR0_WP;
18004+}
18005+#else
18006+static inline unsigned long native_pax_open_kernel(void) { return 0; }
18007+static inline unsigned long native_pax_close_kernel(void) { return 0; }
18008+#endif
18009+
18010 /*
18011 * The following only work if pte_present() is true.
18012 * Undefined behaviour if not..
18013 */
18014+static inline int pte_user(pte_t pte)
18015+{
18016+ return pte_val(pte) & _PAGE_USER;
18017+}
18018+
18019 static inline int pte_dirty(pte_t pte)
18020 {
18021 return pte_flags(pte) & _PAGE_DIRTY;
18022@@ -150,6 +192,11 @@ static inline unsigned long pud_pfn(pud_t pud)
18023 return (pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT;
18024 }
18025
18026+static inline unsigned long pgd_pfn(pgd_t pgd)
18027+{
18028+ return (pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT;
18029+}
18030+
18031 #define pte_page(pte) pfn_to_page(pte_pfn(pte))
18032
18033 static inline int pmd_large(pmd_t pte)
18034@@ -203,9 +250,29 @@ static inline pte_t pte_wrprotect(pte_t pte)
18035 return pte_clear_flags(pte, _PAGE_RW);
18036 }
18037
18038+static inline pte_t pte_mkread(pte_t pte)
18039+{
18040+ return __pte(pte_val(pte) | _PAGE_USER);
18041+}
18042+
18043 static inline pte_t pte_mkexec(pte_t pte)
18044 {
18045- return pte_clear_flags(pte, _PAGE_NX);
18046+#ifdef CONFIG_X86_PAE
18047+ if (__supported_pte_mask & _PAGE_NX)
18048+ return pte_clear_flags(pte, _PAGE_NX);
18049+ else
18050+#endif
18051+ return pte_set_flags(pte, _PAGE_USER);
18052+}
18053+
18054+static inline pte_t pte_exprotect(pte_t pte)
18055+{
18056+#ifdef CONFIG_X86_PAE
18057+ if (__supported_pte_mask & _PAGE_NX)
18058+ return pte_set_flags(pte, _PAGE_NX);
18059+ else
18060+#endif
18061+ return pte_clear_flags(pte, _PAGE_USER);
18062 }
18063
18064 static inline pte_t pte_mkdirty(pte_t pte)
18065@@ -420,6 +487,16 @@ pte_t *populate_extra_pte(unsigned long vaddr);
18066 #endif
18067
18068 #ifndef __ASSEMBLY__
18069+
18070+#ifdef CONFIG_PAX_PER_CPU_PGD
18071+extern pgd_t cpu_pgd[NR_CPUS][2][PTRS_PER_PGD];
18072+enum cpu_pgd_type {kernel = 0, user = 1};
18073+static inline pgd_t *get_cpu_pgd(unsigned int cpu, enum cpu_pgd_type type)
18074+{
18075+ return cpu_pgd[cpu][type];
18076+}
18077+#endif
18078+
18079 #include <linux/mm_types.h>
18080 #include <linux/mmdebug.h>
18081 #include <linux/log2.h>
18082@@ -571,7 +648,7 @@ static inline unsigned long pud_page_vaddr(pud_t pud)
18083 * Currently stuck as a macro due to indirect forward reference to
18084 * linux/mmzone.h's __section_mem_map_addr() definition:
18085 */
18086-#define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT)
18087+#define pud_page(pud) pfn_to_page((pud_val(pud) & PTE_PFN_MASK) >> PAGE_SHIFT)
18088
18089 /* Find an entry in the second-level page table.. */
18090 static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address)
18091@@ -611,7 +688,7 @@ static inline unsigned long pgd_page_vaddr(pgd_t pgd)
18092 * Currently stuck as a macro due to indirect forward reference to
18093 * linux/mmzone.h's __section_mem_map_addr() definition:
18094 */
18095-#define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT)
18096+#define pgd_page(pgd) pfn_to_page((pgd_val(pgd) & PTE_PFN_MASK) >> PAGE_SHIFT)
18097
18098 /* to find an entry in a page-table-directory. */
18099 static inline unsigned long pud_index(unsigned long address)
18100@@ -626,7 +703,7 @@ static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address)
18101
18102 static inline int pgd_bad(pgd_t pgd)
18103 {
18104- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE;
18105+ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE;
18106 }
18107
18108 static inline int pgd_none(pgd_t pgd)
18109@@ -649,7 +726,12 @@ static inline int pgd_none(pgd_t pgd)
18110 * pgd_offset() returns a (pgd_t *)
18111 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;
18112 */
18113-#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))
18114+#define pgd_offset(mm, address) ((mm)->pgd + pgd_index(address))
18115+
18116+#ifdef CONFIG_PAX_PER_CPU_PGD
18117+#define pgd_offset_cpu(cpu, type, address) (get_cpu_pgd(cpu, type) + pgd_index(address))
18118+#endif
18119+
18120 /*
18121 * a shortcut which implies the use of the kernel's pgd, instead
18122 * of a process's
18123@@ -660,6 +742,23 @@ static inline int pgd_none(pgd_t pgd)
18124 #define KERNEL_PGD_BOUNDARY pgd_index(PAGE_OFFSET)
18125 #define KERNEL_PGD_PTRS (PTRS_PER_PGD - KERNEL_PGD_BOUNDARY)
18126
18127+#ifdef CONFIG_X86_32
18128+#define USER_PGD_PTRS KERNEL_PGD_BOUNDARY
18129+#else
18130+#define TASK_SIZE_MAX_SHIFT CONFIG_TASK_SIZE_MAX_SHIFT
18131+#define USER_PGD_PTRS (_AC(1,UL) << (TASK_SIZE_MAX_SHIFT - PGDIR_SHIFT))
18132+
18133+#ifdef CONFIG_PAX_MEMORY_UDEREF
18134+#ifdef __ASSEMBLY__
18135+#define pax_user_shadow_base pax_user_shadow_base(%rip)
18136+#else
18137+extern unsigned long pax_user_shadow_base;
18138+extern pgdval_t clone_pgd_mask;
18139+#endif
18140+#endif
18141+
18142+#endif
18143+
18144 #ifndef __ASSEMBLY__
18145
18146 extern int direct_gbpages;
18147@@ -826,11 +925,24 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm,
18148 * dst and src can be on the same page, but the range must not overlap,
18149 * and must not cross a page boundary.
18150 */
18151-static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count)
18152+static inline void clone_pgd_range(pgd_t *dst, const pgd_t *src, int count)
18153 {
18154- memcpy(dst, src, count * sizeof(pgd_t));
18155+ pax_open_kernel();
18156+ while (count--)
18157+ *dst++ = *src++;
18158+ pax_close_kernel();
18159 }
18160
18161+#ifdef CONFIG_PAX_PER_CPU_PGD
18162+extern void __clone_user_pgds(pgd_t *dst, const pgd_t *src);
18163+#endif
18164+
18165+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
18166+extern void __shadow_user_pgds(pgd_t *dst, const pgd_t *src);
18167+#else
18168+static inline void __shadow_user_pgds(pgd_t *dst, const pgd_t *src) {}
18169+#endif
18170+
18171 #define PTE_SHIFT ilog2(PTRS_PER_PTE)
18172 static inline int page_level_shift(enum pg_level level)
18173 {
18174diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
18175index b6c0b40..3535d47 100644
18176--- a/arch/x86/include/asm/pgtable_32.h
18177+++ b/arch/x86/include/asm/pgtable_32.h
18178@@ -25,9 +25,6 @@
18179 struct mm_struct;
18180 struct vm_area_struct;
18181
18182-extern pgd_t swapper_pg_dir[1024];
18183-extern pgd_t initial_page_table[1024];
18184-
18185 static inline void pgtable_cache_init(void) { }
18186 static inline void check_pgt_cache(void) { }
18187 void paging_init(void);
18188@@ -45,6 +42,12 @@ void paging_init(void);
18189 # include <asm/pgtable-2level.h>
18190 #endif
18191
18192+extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
18193+extern pgd_t initial_page_table[PTRS_PER_PGD];
18194+#ifdef CONFIG_X86_PAE
18195+extern pmd_t swapper_pm_dir[PTRS_PER_PGD][PTRS_PER_PMD];
18196+#endif
18197+
18198 #if defined(CONFIG_HIGHPTE)
18199 #define pte_offset_map(dir, address) \
18200 ((pte_t *)kmap_atomic(pmd_page(*(dir))) + \
18201@@ -59,12 +62,17 @@ void paging_init(void);
18202 /* Clear a kernel PTE and flush it from the TLB */
18203 #define kpte_clear_flush(ptep, vaddr) \
18204 do { \
18205+ pax_open_kernel(); \
18206 pte_clear(&init_mm, (vaddr), (ptep)); \
18207+ pax_close_kernel(); \
18208 __flush_tlb_one((vaddr)); \
18209 } while (0)
18210
18211 #endif /* !__ASSEMBLY__ */
18212
18213+#define HAVE_ARCH_UNMAPPED_AREA
18214+#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN
18215+
18216 /*
18217 * kern_addr_valid() is (1) for FLATMEM and (0) for
18218 * SPARSEMEM and DISCONTIGMEM
18219diff --git a/arch/x86/include/asm/pgtable_32_types.h b/arch/x86/include/asm/pgtable_32_types.h
18220index 9fb2f2b..b04b4bf 100644
18221--- a/arch/x86/include/asm/pgtable_32_types.h
18222+++ b/arch/x86/include/asm/pgtable_32_types.h
18223@@ -8,7 +8,7 @@
18224 */
18225 #ifdef CONFIG_X86_PAE
18226 # include <asm/pgtable-3level_types.h>
18227-# define PMD_SIZE (1UL << PMD_SHIFT)
18228+# define PMD_SIZE (_AC(1, UL) << PMD_SHIFT)
18229 # define PMD_MASK (~(PMD_SIZE - 1))
18230 #else
18231 # include <asm/pgtable-2level_types.h>
18232@@ -46,6 +46,19 @@ extern bool __vmalloc_start_set; /* set once high_memory is set */
18233 # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE)
18234 #endif
18235
18236+#ifdef CONFIG_PAX_KERNEXEC
18237+#ifndef __ASSEMBLY__
18238+extern unsigned char MODULES_EXEC_VADDR[];
18239+extern unsigned char MODULES_EXEC_END[];
18240+#endif
18241+#include <asm/boot.h>
18242+#define ktla_ktva(addr) (addr + LOAD_PHYSICAL_ADDR + PAGE_OFFSET)
18243+#define ktva_ktla(addr) (addr - LOAD_PHYSICAL_ADDR - PAGE_OFFSET)
18244+#else
18245+#define ktla_ktva(addr) (addr)
18246+#define ktva_ktla(addr) (addr)
18247+#endif
18248+
18249 #define MODULES_VADDR VMALLOC_START
18250 #define MODULES_END VMALLOC_END
18251 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
18252diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
18253index 2ee7811..db41d8c 100644
18254--- a/arch/x86/include/asm/pgtable_64.h
18255+++ b/arch/x86/include/asm/pgtable_64.h
18256@@ -16,11 +16,16 @@
18257
18258 extern pud_t level3_kernel_pgt[512];
18259 extern pud_t level3_ident_pgt[512];
18260+extern pud_t level3_vmalloc_start_pgt[512];
18261+extern pud_t level3_vmalloc_end_pgt[512];
18262+extern pud_t level3_vmemmap_pgt[512];
18263+extern pud_t level2_vmemmap_pgt[512];
18264 extern pmd_t level2_kernel_pgt[512];
18265 extern pmd_t level2_fixmap_pgt[512];
18266-extern pmd_t level2_ident_pgt[512];
18267+extern pmd_t level2_ident_pgt[512*2];
18268 extern pte_t level1_fixmap_pgt[512];
18269-extern pgd_t init_level4_pgt[];
18270+extern pte_t level1_vsyscall_pgt[512];
18271+extern pgd_t init_level4_pgt[512];
18272
18273 #define swapper_pg_dir init_level4_pgt
18274
18275@@ -62,7 +67,9 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
18276
18277 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
18278 {
18279+ pax_open_kernel();
18280 *pmdp = pmd;
18281+ pax_close_kernel();
18282 }
18283
18284 static inline void native_pmd_clear(pmd_t *pmd)
18285@@ -98,7 +105,9 @@ static inline pmd_t native_pmdp_get_and_clear(pmd_t *xp)
18286
18287 static inline void native_set_pud(pud_t *pudp, pud_t pud)
18288 {
18289+ pax_open_kernel();
18290 *pudp = pud;
18291+ pax_close_kernel();
18292 }
18293
18294 static inline void native_pud_clear(pud_t *pud)
18295@@ -108,6 +117,13 @@ static inline void native_pud_clear(pud_t *pud)
18296
18297 static inline void native_set_pgd(pgd_t *pgdp, pgd_t pgd)
18298 {
18299+ pax_open_kernel();
18300+ *pgdp = pgd;
18301+ pax_close_kernel();
18302+}
18303+
18304+static inline void native_set_pgd_batched(pgd_t *pgdp, pgd_t pgd)
18305+{
18306 *pgdp = pgd;
18307 }
18308
18309diff --git a/arch/x86/include/asm/pgtable_64_types.h b/arch/x86/include/asm/pgtable_64_types.h
18310index 602b602..acb53ed 100644
18311--- a/arch/x86/include/asm/pgtable_64_types.h
18312+++ b/arch/x86/include/asm/pgtable_64_types.h
18313@@ -61,11 +61,16 @@ typedef struct { pteval_t pte; } pte_t;
18314 #define MODULES_VADDR (__START_KERNEL_map + KERNEL_IMAGE_SIZE)
18315 #define MODULES_END _AC(0xffffffffff000000, UL)
18316 #define MODULES_LEN (MODULES_END - MODULES_VADDR)
18317+#define MODULES_EXEC_VADDR MODULES_VADDR
18318+#define MODULES_EXEC_END MODULES_END
18319 #define ESPFIX_PGD_ENTRY _AC(-2, UL)
18320 #define ESPFIX_BASE_ADDR (ESPFIX_PGD_ENTRY << PGDIR_SHIFT)
18321 #define EFI_VA_START ( -4 * (_AC(1, UL) << 30))
18322 #define EFI_VA_END (-68 * (_AC(1, UL) << 30))
18323
18324+#define ktla_ktva(addr) (addr)
18325+#define ktva_ktla(addr) (addr)
18326+
18327 #define EARLY_DYNAMIC_PAGE_TABLES 64
18328
18329 #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
18330diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
18331index 8c7c108..1c1b77f 100644
18332--- a/arch/x86/include/asm/pgtable_types.h
18333+++ b/arch/x86/include/asm/pgtable_types.h
18334@@ -85,8 +85,10 @@
18335
18336 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
18337 #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX)
18338-#else
18339+#elif defined(CONFIG_KMEMCHECK) || defined(CONFIG_MEM_SOFT_DIRTY)
18340 #define _PAGE_NX (_AT(pteval_t, 0))
18341+#else
18342+#define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_HIDDEN)
18343 #endif
18344
18345 #define _PAGE_PROTNONE (_AT(pteval_t, 1) << _PAGE_BIT_PROTNONE)
18346@@ -141,6 +143,9 @@ enum page_cache_mode {
18347 #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \
18348 _PAGE_ACCESSED)
18349
18350+#define PAGE_READONLY_NOEXEC PAGE_READONLY
18351+#define PAGE_SHARED_NOEXEC PAGE_SHARED
18352+
18353 #define __PAGE_KERNEL_EXEC \
18354 (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL)
18355 #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX)
18356@@ -148,7 +153,7 @@ enum page_cache_mode {
18357 #define __PAGE_KERNEL_RO (__PAGE_KERNEL & ~_PAGE_RW)
18358 #define __PAGE_KERNEL_RX (__PAGE_KERNEL_EXEC & ~_PAGE_RW)
18359 #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_NOCACHE)
18360-#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RX | _PAGE_USER)
18361+#define __PAGE_KERNEL_VSYSCALL (__PAGE_KERNEL_RO | _PAGE_USER)
18362 #define __PAGE_KERNEL_VVAR (__PAGE_KERNEL_RO | _PAGE_USER)
18363 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE)
18364 #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE)
18365@@ -194,7 +199,7 @@ enum page_cache_mode {
18366 #ifdef CONFIG_X86_64
18367 #define __PAGE_KERNEL_IDENT_LARGE_EXEC __PAGE_KERNEL_LARGE_EXEC
18368 #else
18369-#define PTE_IDENT_ATTR 0x003 /* PRESENT+RW */
18370+#define PTE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18371 #define PDE_IDENT_ATTR 0x063 /* PRESENT+RW+DIRTY+ACCESSED */
18372 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */
18373 #endif
18374@@ -233,7 +238,17 @@ static inline pgdval_t pgd_flags(pgd_t pgd)
18375 {
18376 return native_pgd_val(pgd) & PTE_FLAGS_MASK;
18377 }
18378+#endif
18379
18380+#if PAGETABLE_LEVELS == 3
18381+#include <asm-generic/pgtable-nopud.h>
18382+#endif
18383+
18384+#if PAGETABLE_LEVELS == 2
18385+#include <asm-generic/pgtable-nopmd.h>
18386+#endif
18387+
18388+#ifndef __ASSEMBLY__
18389 #if PAGETABLE_LEVELS > 3
18390 typedef struct { pudval_t pud; } pud_t;
18391
18392@@ -247,8 +262,6 @@ static inline pudval_t native_pud_val(pud_t pud)
18393 return pud.pud;
18394 }
18395 #else
18396-#include <asm-generic/pgtable-nopud.h>
18397-
18398 static inline pudval_t native_pud_val(pud_t pud)
18399 {
18400 return native_pgd_val(pud.pgd);
18401@@ -268,8 +281,6 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)
18402 return pmd.pmd;
18403 }
18404 #else
18405-#include <asm-generic/pgtable-nopmd.h>
18406-
18407 static inline pmdval_t native_pmd_val(pmd_t pmd)
18408 {
18409 return native_pgd_val(pmd.pud.pgd);
18410@@ -362,7 +373,6 @@ typedef struct page *pgtable_t;
18411
18412 extern pteval_t __supported_pte_mask;
18413 extern void set_nx(void);
18414-extern int nx_enabled;
18415
18416 #define pgprot_writecombine pgprot_writecombine
18417 extern pgprot_t pgprot_writecombine(pgprot_t prot);
18418diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
18419index 8f327184..368fb29 100644
18420--- a/arch/x86/include/asm/preempt.h
18421+++ b/arch/x86/include/asm/preempt.h
18422@@ -84,7 +84,7 @@ static __always_inline void __preempt_count_sub(int val)
18423 */
18424 static __always_inline bool __preempt_count_dec_and_test(void)
18425 {
18426- GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), "e");
18427+ GEN_UNARY_RMWcc("decl", "incl", __preempt_count, __percpu_arg(0), "e");
18428 }
18429
18430 /*
18431diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
18432index ec1c935..5cc6023 100644
18433--- a/arch/x86/include/asm/processor.h
18434+++ b/arch/x86/include/asm/processor.h
18435@@ -127,7 +127,7 @@ struct cpuinfo_x86 {
18436 /* Index into per_cpu list: */
18437 u16 cpu_index;
18438 u32 microcode;
18439-};
18440+} __randomize_layout;
18441
18442 #define X86_VENDOR_INTEL 0
18443 #define X86_VENDOR_CYRIX 1
18444@@ -198,9 +198,21 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
18445 : "memory");
18446 }
18447
18448+/* invpcid (%rdx),%rax */
18449+#define __ASM_INVPCID ".byte 0x66,0x0f,0x38,0x82,0x02"
18450+
18451+#define INVPCID_SINGLE_ADDRESS 0UL
18452+#define INVPCID_SINGLE_CONTEXT 1UL
18453+#define INVPCID_ALL_GLOBAL 2UL
18454+#define INVPCID_ALL_NONGLOBAL 3UL
18455+
18456+#define PCID_KERNEL 0UL
18457+#define PCID_USER 1UL
18458+#define PCID_NOFLUSH (1UL << 63)
18459+
18460 static inline void load_cr3(pgd_t *pgdir)
18461 {
18462- write_cr3(__pa(pgdir));
18463+ write_cr3(__pa(pgdir) | PCID_KERNEL);
18464 }
18465
18466 #ifdef CONFIG_X86_32
18467@@ -282,7 +294,7 @@ struct tss_struct {
18468
18469 } ____cacheline_aligned;
18470
18471-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss);
18472+extern struct tss_struct init_tss[NR_CPUS];
18473
18474 /*
18475 * Save the original ist values for checking stack pointers during debugging
18476@@ -479,6 +491,7 @@ struct thread_struct {
18477 unsigned short ds;
18478 unsigned short fsindex;
18479 unsigned short gsindex;
18480+ unsigned short ss;
18481 #endif
18482 #ifdef CONFIG_X86_32
18483 unsigned long ip;
18484@@ -805,11 +818,18 @@ static inline void spin_lock_prefetch(const void *x)
18485 */
18486 #define TASK_SIZE PAGE_OFFSET
18487 #define TASK_SIZE_MAX TASK_SIZE
18488+
18489+#ifdef CONFIG_PAX_SEGMEXEC
18490+#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2)
18491+#define STACK_TOP ((current->mm->pax_flags & MF_PAX_SEGMEXEC)?SEGMEXEC_TASK_SIZE:TASK_SIZE)
18492+#else
18493 #define STACK_TOP TASK_SIZE
18494-#define STACK_TOP_MAX STACK_TOP
18495+#endif
18496+
18497+#define STACK_TOP_MAX TASK_SIZE
18498
18499 #define INIT_THREAD { \
18500- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18501+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18502 .vm86_info = NULL, \
18503 .sysenter_cs = __KERNEL_CS, \
18504 .io_bitmap_ptr = NULL, \
18505@@ -823,7 +843,7 @@ static inline void spin_lock_prefetch(const void *x)
18506 */
18507 #define INIT_TSS { \
18508 .x86_tss = { \
18509- .sp0 = sizeof(init_stack) + (long)&init_stack, \
18510+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \
18511 .ss0 = __KERNEL_DS, \
18512 .ss1 = __KERNEL_CS, \
18513 .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \
18514@@ -834,11 +854,7 @@ static inline void spin_lock_prefetch(const void *x)
18515 extern unsigned long thread_saved_pc(struct task_struct *tsk);
18516
18517 #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long))
18518-#define KSTK_TOP(info) \
18519-({ \
18520- unsigned long *__ptr = (unsigned long *)(info); \
18521- (unsigned long)(&__ptr[THREAD_SIZE_LONGS]); \
18522-})
18523+#define KSTK_TOP(info) ((container_of(info, struct task_struct, tinfo))->thread.sp0)
18524
18525 /*
18526 * The below -8 is to reserve 8 bytes on top of the ring0 stack.
18527@@ -853,7 +869,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18528 #define task_pt_regs(task) \
18529 ({ \
18530 struct pt_regs *__regs__; \
18531- __regs__ = (struct pt_regs *)(KSTK_TOP(task_stack_page(task))-8); \
18532+ __regs__ = (struct pt_regs *)((task)->thread.sp0); \
18533 __regs__ - 1; \
18534 })
18535
18536@@ -869,13 +885,13 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18537 * particular problem by preventing anything from being mapped
18538 * at the maximum canonical address.
18539 */
18540-#define TASK_SIZE_MAX ((1UL << 47) - PAGE_SIZE)
18541+#define TASK_SIZE_MAX ((1UL << TASK_SIZE_MAX_SHIFT) - PAGE_SIZE)
18542
18543 /* This decides where the kernel will search for a free chunk of vm
18544 * space during mmap's.
18545 */
18546 #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \
18547- 0xc0000000 : 0xFFFFe000)
18548+ 0xc0000000 : 0xFFFFf000)
18549
18550 #define TASK_SIZE (test_thread_flag(TIF_ADDR32) ? \
18551 IA32_PAGE_OFFSET : TASK_SIZE_MAX)
18552@@ -886,11 +902,11 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
18553 #define STACK_TOP_MAX TASK_SIZE_MAX
18554
18555 #define INIT_THREAD { \
18556- .sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18557+ .sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18558 }
18559
18560 #define INIT_TSS { \
18561- .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) \
18562+ .x86_tss.sp0 = (unsigned long)&init_stack + sizeof(init_stack) - 16 \
18563 }
18564
18565 /*
18566@@ -918,6 +934,10 @@ extern void start_thread(struct pt_regs *regs, unsigned long new_ip,
18567 */
18568 #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3))
18569
18570+#ifdef CONFIG_PAX_SEGMEXEC
18571+#define SEGMEXEC_TASK_UNMAPPED_BASE (PAGE_ALIGN(SEGMEXEC_TASK_SIZE / 3))
18572+#endif
18573+
18574 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
18575
18576 /* Get/set a process' ability to use the timestamp counter instruction */
18577@@ -962,7 +982,7 @@ static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
18578 return 0;
18579 }
18580
18581-extern unsigned long arch_align_stack(unsigned long sp);
18582+#define arch_align_stack(x) ((x) & ~0xfUL)
18583 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
18584
18585 void default_idle(void);
18586@@ -972,6 +992,6 @@ bool xen_set_default_idle(void);
18587 #define xen_set_default_idle 0
18588 #endif
18589
18590-void stop_this_cpu(void *dummy);
18591+void stop_this_cpu(void *dummy) __noreturn;
18592 void df_debug(struct pt_regs *regs, long error_code);
18593 #endif /* _ASM_X86_PROCESSOR_H */
18594diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h
18595index 86fc2bb..bd5049a 100644
18596--- a/arch/x86/include/asm/ptrace.h
18597+++ b/arch/x86/include/asm/ptrace.h
18598@@ -89,28 +89,29 @@ static inline unsigned long regs_return_value(struct pt_regs *regs)
18599 }
18600
18601 /*
18602- * user_mode_vm(regs) determines whether a register set came from user mode.
18603+ * user_mode(regs) determines whether a register set came from user mode.
18604 * This is true if V8086 mode was enabled OR if the register set was from
18605 * protected mode with RPL-3 CS value. This tricky test checks that with
18606 * one comparison. Many places in the kernel can bypass this full check
18607- * if they have already ruled out V8086 mode, so user_mode(regs) can be used.
18608+ * if they have already ruled out V8086 mode, so user_mode_novm(regs) can
18609+ * be used.
18610 */
18611-static inline int user_mode(struct pt_regs *regs)
18612+static inline int user_mode_novm(struct pt_regs *regs)
18613 {
18614 #ifdef CONFIG_X86_32
18615 return (regs->cs & SEGMENT_RPL_MASK) == USER_RPL;
18616 #else
18617- return !!(regs->cs & 3);
18618+ return !!(regs->cs & SEGMENT_RPL_MASK);
18619 #endif
18620 }
18621
18622-static inline int user_mode_vm(struct pt_regs *regs)
18623+static inline int user_mode(struct pt_regs *regs)
18624 {
18625 #ifdef CONFIG_X86_32
18626 return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
18627 USER_RPL;
18628 #else
18629- return user_mode(regs);
18630+ return user_mode_novm(regs);
18631 #endif
18632 }
18633
18634@@ -126,15 +127,16 @@ static inline int v8086_mode(struct pt_regs *regs)
18635 #ifdef CONFIG_X86_64
18636 static inline bool user_64bit_mode(struct pt_regs *regs)
18637 {
18638+ unsigned long cs = regs->cs & 0xffff;
18639 #ifndef CONFIG_PARAVIRT
18640 /*
18641 * On non-paravirt systems, this is the only long mode CPL 3
18642 * selector. We do not allow long mode selectors in the LDT.
18643 */
18644- return regs->cs == __USER_CS;
18645+ return cs == __USER_CS;
18646 #else
18647 /* Headers are too twisted for this to go in paravirt.h. */
18648- return regs->cs == __USER_CS || regs->cs == pv_info.extra_user_64bit_cs;
18649+ return cs == __USER_CS || cs == pv_info.extra_user_64bit_cs;
18650 #endif
18651 }
18652
18653@@ -185,9 +187,11 @@ static inline unsigned long regs_get_register(struct pt_regs *regs,
18654 * Traps from the kernel do not save sp and ss.
18655 * Use the helper function to retrieve sp.
18656 */
18657- if (offset == offsetof(struct pt_regs, sp) &&
18658- regs->cs == __KERNEL_CS)
18659- return kernel_stack_pointer(regs);
18660+ if (offset == offsetof(struct pt_regs, sp)) {
18661+ unsigned long cs = regs->cs & 0xffff;
18662+ if (cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS)
18663+ return kernel_stack_pointer(regs);
18664+ }
18665 #endif
18666 return *(unsigned long *)((unsigned long)regs + offset);
18667 }
18668diff --git a/arch/x86/include/asm/qrwlock.h b/arch/x86/include/asm/qrwlock.h
18669index ae0e241..e80b10b 100644
18670--- a/arch/x86/include/asm/qrwlock.h
18671+++ b/arch/x86/include/asm/qrwlock.h
18672@@ -7,8 +7,8 @@
18673 #define queue_write_unlock queue_write_unlock
18674 static inline void queue_write_unlock(struct qrwlock *lock)
18675 {
18676- barrier();
18677- ACCESS_ONCE(*(u8 *)&lock->cnts) = 0;
18678+ barrier();
18679+ ACCESS_ONCE_RW(*(u8 *)&lock->cnts) = 0;
18680 }
18681 #endif
18682
18683diff --git a/arch/x86/include/asm/realmode.h b/arch/x86/include/asm/realmode.h
18684index 9c6b890..5305f53 100644
18685--- a/arch/x86/include/asm/realmode.h
18686+++ b/arch/x86/include/asm/realmode.h
18687@@ -22,16 +22,14 @@ struct real_mode_header {
18688 #endif
18689 /* APM/BIOS reboot */
18690 u32 machine_real_restart_asm;
18691-#ifdef CONFIG_X86_64
18692 u32 machine_real_restart_seg;
18693-#endif
18694 };
18695
18696 /* This must match data at trampoline_32/64.S */
18697 struct trampoline_header {
18698 #ifdef CONFIG_X86_32
18699 u32 start;
18700- u16 gdt_pad;
18701+ u16 boot_cs;
18702 u16 gdt_limit;
18703 u32 gdt_base;
18704 #else
18705diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h
18706index a82c4f1..ac45053 100644
18707--- a/arch/x86/include/asm/reboot.h
18708+++ b/arch/x86/include/asm/reboot.h
18709@@ -6,13 +6,13 @@
18710 struct pt_regs;
18711
18712 struct machine_ops {
18713- void (*restart)(char *cmd);
18714- void (*halt)(void);
18715- void (*power_off)(void);
18716+ void (* __noreturn restart)(char *cmd);
18717+ void (* __noreturn halt)(void);
18718+ void (* __noreturn power_off)(void);
18719 void (*shutdown)(void);
18720 void (*crash_shutdown)(struct pt_regs *);
18721- void (*emergency_restart)(void);
18722-};
18723+ void (* __noreturn emergency_restart)(void);
18724+} __no_const;
18725
18726 extern struct machine_ops machine_ops;
18727
18728diff --git a/arch/x86/include/asm/rmwcc.h b/arch/x86/include/asm/rmwcc.h
18729index 8f7866a..e442f20 100644
18730--- a/arch/x86/include/asm/rmwcc.h
18731+++ b/arch/x86/include/asm/rmwcc.h
18732@@ -3,7 +3,34 @@
18733
18734 #ifdef CC_HAVE_ASM_GOTO
18735
18736-#define __GEN_RMWcc(fullop, var, cc, ...) \
18737+#ifdef CONFIG_PAX_REFCOUNT
18738+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18739+do { \
18740+ asm_volatile_goto (fullop \
18741+ ";jno 0f\n" \
18742+ fullantiop \
18743+ ";int $4\n0:\n" \
18744+ _ASM_EXTABLE(0b, 0b) \
18745+ ";j" cc " %l[cc_label]" \
18746+ : : "m" (var), ## __VA_ARGS__ \
18747+ : "memory" : cc_label); \
18748+ return 0; \
18749+cc_label: \
18750+ return 1; \
18751+} while (0)
18752+#else
18753+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18754+do { \
18755+ asm_volatile_goto (fullop ";j" cc " %l[cc_label]" \
18756+ : : "m" (var), ## __VA_ARGS__ \
18757+ : "memory" : cc_label); \
18758+ return 0; \
18759+cc_label: \
18760+ return 1; \
18761+} while (0)
18762+#endif
18763+
18764+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18765 do { \
18766 asm_volatile_goto (fullop "; j" cc " %l[cc_label]" \
18767 : : "m" (var), ## __VA_ARGS__ \
18768@@ -13,15 +40,46 @@ cc_label: \
18769 return 1; \
18770 } while (0)
18771
18772-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18773- __GEN_RMWcc(op " " arg0, var, cc)
18774+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18775+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18776
18777-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18778- __GEN_RMWcc(op " %1, " arg0, var, cc, vcon (val))
18779+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18780+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18781+
18782+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18783+ __GEN_RMWcc(op " %1, " arg0, antiop " %1, " arg0, var, cc, vcon (val))
18784+
18785+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18786+ __GEN_RMWcc_unchecked(op " %1, " arg0, var, cc, vcon (val))
18787
18788 #else /* !CC_HAVE_ASM_GOTO */
18789
18790-#define __GEN_RMWcc(fullop, var, cc, ...) \
18791+#ifdef CONFIG_PAX_REFCOUNT
18792+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18793+do { \
18794+ char c; \
18795+ asm volatile (fullop \
18796+ ";jno 0f\n" \
18797+ fullantiop \
18798+ ";int $4\n0:\n" \
18799+ _ASM_EXTABLE(0b, 0b) \
18800+ "; set" cc " %1" \
18801+ : "+m" (var), "=qm" (c) \
18802+ : __VA_ARGS__ : "memory"); \
18803+ return c != 0; \
18804+} while (0)
18805+#else
18806+#define __GEN_RMWcc(fullop, fullantiop, var, cc, ...) \
18807+do { \
18808+ char c; \
18809+ asm volatile (fullop "; set" cc " %1" \
18810+ : "+m" (var), "=qm" (c) \
18811+ : __VA_ARGS__ : "memory"); \
18812+ return c != 0; \
18813+} while (0)
18814+#endif
18815+
18816+#define __GEN_RMWcc_unchecked(fullop, var, cc, ...) \
18817 do { \
18818 char c; \
18819 asm volatile (fullop "; set" cc " %1" \
18820@@ -30,11 +88,17 @@ do { \
18821 return c != 0; \
18822 } while (0)
18823
18824-#define GEN_UNARY_RMWcc(op, var, arg0, cc) \
18825- __GEN_RMWcc(op " " arg0, var, cc)
18826+#define GEN_UNARY_RMWcc(op, antiop, var, arg0, cc) \
18827+ __GEN_RMWcc(op " " arg0, antiop " " arg0, var, cc)
18828+
18829+#define GEN_UNARY_RMWcc_unchecked(op, var, arg0, cc) \
18830+ __GEN_RMWcc_unchecked(op " " arg0, var, cc)
18831+
18832+#define GEN_BINARY_RMWcc(op, antiop, var, vcon, val, arg0, cc) \
18833+ __GEN_RMWcc(op " %2, " arg0, antiop " %2, " arg0, var, cc, vcon (val))
18834
18835-#define GEN_BINARY_RMWcc(op, var, vcon, val, arg0, cc) \
18836- __GEN_RMWcc(op " %2, " arg0, var, cc, vcon (val))
18837+#define GEN_BINARY_RMWcc_unchecked(op, var, vcon, val, arg0, cc) \
18838+ __GEN_RMWcc_unchecked(op " %2, " arg0, var, cc, vcon (val))
18839
18840 #endif /* CC_HAVE_ASM_GOTO */
18841
18842diff --git a/arch/x86/include/asm/rwsem.h b/arch/x86/include/asm/rwsem.h
18843index cad82c9..2e5c5c1 100644
18844--- a/arch/x86/include/asm/rwsem.h
18845+++ b/arch/x86/include/asm/rwsem.h
18846@@ -64,6 +64,14 @@ static inline void __down_read(struct rw_semaphore *sem)
18847 {
18848 asm volatile("# beginning down_read\n\t"
18849 LOCK_PREFIX _ASM_INC "(%1)\n\t"
18850+
18851+#ifdef CONFIG_PAX_REFCOUNT
18852+ "jno 0f\n"
18853+ LOCK_PREFIX _ASM_DEC "(%1)\n"
18854+ "int $4\n0:\n"
18855+ _ASM_EXTABLE(0b, 0b)
18856+#endif
18857+
18858 /* adds 0x00000001 */
18859 " jns 1f\n"
18860 " call call_rwsem_down_read_failed\n"
18861@@ -85,6 +93,14 @@ static inline int __down_read_trylock(struct rw_semaphore *sem)
18862 "1:\n\t"
18863 " mov %1,%2\n\t"
18864 " add %3,%2\n\t"
18865+
18866+#ifdef CONFIG_PAX_REFCOUNT
18867+ "jno 0f\n"
18868+ "sub %3,%2\n"
18869+ "int $4\n0:\n"
18870+ _ASM_EXTABLE(0b, 0b)
18871+#endif
18872+
18873 " jle 2f\n\t"
18874 LOCK_PREFIX " cmpxchg %2,%0\n\t"
18875 " jnz 1b\n\t"
18876@@ -104,6 +120,14 @@ static inline void __down_write_nested(struct rw_semaphore *sem, int subclass)
18877 long tmp;
18878 asm volatile("# beginning down_write\n\t"
18879 LOCK_PREFIX " xadd %1,(%2)\n\t"
18880+
18881+#ifdef CONFIG_PAX_REFCOUNT
18882+ "jno 0f\n"
18883+ "mov %1,(%2)\n"
18884+ "int $4\n0:\n"
18885+ _ASM_EXTABLE(0b, 0b)
18886+#endif
18887+
18888 /* adds 0xffff0001, returns the old value */
18889 " test " __ASM_SEL(%w1,%k1) "," __ASM_SEL(%w1,%k1) "\n\t"
18890 /* was the active mask 0 before? */
18891@@ -155,6 +179,14 @@ static inline void __up_read(struct rw_semaphore *sem)
18892 long tmp;
18893 asm volatile("# beginning __up_read\n\t"
18894 LOCK_PREFIX " xadd %1,(%2)\n\t"
18895+
18896+#ifdef CONFIG_PAX_REFCOUNT
18897+ "jno 0f\n"
18898+ "mov %1,(%2)\n"
18899+ "int $4\n0:\n"
18900+ _ASM_EXTABLE(0b, 0b)
18901+#endif
18902+
18903 /* subtracts 1, returns the old value */
18904 " jns 1f\n\t"
18905 " call call_rwsem_wake\n" /* expects old value in %edx */
18906@@ -173,6 +205,14 @@ static inline void __up_write(struct rw_semaphore *sem)
18907 long tmp;
18908 asm volatile("# beginning __up_write\n\t"
18909 LOCK_PREFIX " xadd %1,(%2)\n\t"
18910+
18911+#ifdef CONFIG_PAX_REFCOUNT
18912+ "jno 0f\n"
18913+ "mov %1,(%2)\n"
18914+ "int $4\n0:\n"
18915+ _ASM_EXTABLE(0b, 0b)
18916+#endif
18917+
18918 /* subtracts 0xffff0001, returns the old value */
18919 " jns 1f\n\t"
18920 " call call_rwsem_wake\n" /* expects old value in %edx */
18921@@ -190,6 +230,14 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18922 {
18923 asm volatile("# beginning __downgrade_write\n\t"
18924 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
18925+
18926+#ifdef CONFIG_PAX_REFCOUNT
18927+ "jno 0f\n"
18928+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
18929+ "int $4\n0:\n"
18930+ _ASM_EXTABLE(0b, 0b)
18931+#endif
18932+
18933 /*
18934 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
18935 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
18936@@ -208,7 +256,15 @@ static inline void __downgrade_write(struct rw_semaphore *sem)
18937 */
18938 static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18939 {
18940- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
18941+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
18942+
18943+#ifdef CONFIG_PAX_REFCOUNT
18944+ "jno 0f\n"
18945+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
18946+ "int $4\n0:\n"
18947+ _ASM_EXTABLE(0b, 0b)
18948+#endif
18949+
18950 : "+m" (sem->count)
18951 : "er" (delta));
18952 }
18953@@ -218,7 +274,7 @@ static inline void rwsem_atomic_add(long delta, struct rw_semaphore *sem)
18954 */
18955 static inline long rwsem_atomic_update(long delta, struct rw_semaphore *sem)
18956 {
18957- return delta + xadd(&sem->count, delta);
18958+ return delta + xadd_check_overflow(&sem->count, delta);
18959 }
18960
18961 #endif /* __KERNEL__ */
18962diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h
18963index db257a5..b91bc77 100644
18964--- a/arch/x86/include/asm/segment.h
18965+++ b/arch/x86/include/asm/segment.h
18966@@ -73,10 +73,15 @@
18967 * 26 - ESPFIX small SS
18968 * 27 - per-cpu [ offset to per-cpu data area ]
18969 * 28 - stack_canary-20 [ for stack protector ]
18970- * 29 - unused
18971- * 30 - unused
18972+ * 29 - PCI BIOS CS
18973+ * 30 - PCI BIOS DS
18974 * 31 - TSS for double fault handler
18975 */
18976+#define GDT_ENTRY_KERNEXEC_EFI_CS (1)
18977+#define GDT_ENTRY_KERNEXEC_EFI_DS (2)
18978+#define __KERNEXEC_EFI_CS (GDT_ENTRY_KERNEXEC_EFI_CS*8)
18979+#define __KERNEXEC_EFI_DS (GDT_ENTRY_KERNEXEC_EFI_DS*8)
18980+
18981 #define GDT_ENTRY_TLS_MIN 6
18982 #define GDT_ENTRY_TLS_MAX (GDT_ENTRY_TLS_MIN + GDT_ENTRY_TLS_ENTRIES - 1)
18983
18984@@ -88,6 +93,8 @@
18985
18986 #define GDT_ENTRY_KERNEL_CS (GDT_ENTRY_KERNEL_BASE+0)
18987
18988+#define GDT_ENTRY_KERNEXEC_KERNEL_CS (4)
18989+
18990 #define GDT_ENTRY_KERNEL_DS (GDT_ENTRY_KERNEL_BASE+1)
18991
18992 #define GDT_ENTRY_TSS (GDT_ENTRY_KERNEL_BASE+4)
18993@@ -113,6 +120,12 @@
18994 #define __KERNEL_STACK_CANARY 0
18995 #endif
18996
18997+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE+17)
18998+#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8)
18999+
19000+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE+18)
19001+#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8)
19002+
19003 #define GDT_ENTRY_DOUBLEFAULT_TSS 31
19004
19005 /*
19006@@ -140,7 +153,7 @@
19007 */
19008
19009 /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
19010-#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
19011+#define SEGMENT_IS_PNP_CODE(x) (((x) & 0xFFFCU) == PNP_CS32 || ((x) & 0xFFFCU) == PNP_CS16)
19012
19013
19014 #else
19015@@ -164,6 +177,8 @@
19016 #define __USER32_CS (GDT_ENTRY_DEFAULT_USER32_CS*8+3)
19017 #define __USER32_DS __USER_DS
19018
19019+#define GDT_ENTRY_KERNEXEC_KERNEL_CS 7
19020+
19021 #define GDT_ENTRY_TSS 8 /* needs two entries */
19022 #define GDT_ENTRY_LDT 10 /* needs two entries */
19023 #define GDT_ENTRY_TLS_MIN 12
19024@@ -172,6 +187,8 @@
19025 #define GDT_ENTRY_PER_CPU 15 /* Abused to load per CPU data from limit */
19026 #define __PER_CPU_SEG (GDT_ENTRY_PER_CPU * 8 + 3)
19027
19028+#define GDT_ENTRY_UDEREF_KERNEL_DS 16
19029+
19030 /* TLS indexes for 64bit - hardcoded in arch_prctl */
19031 #define FS_TLS 0
19032 #define GS_TLS 1
19033@@ -179,12 +196,14 @@
19034 #define GS_TLS_SEL ((GDT_ENTRY_TLS_MIN+GS_TLS)*8 + 3)
19035 #define FS_TLS_SEL ((GDT_ENTRY_TLS_MIN+FS_TLS)*8 + 3)
19036
19037-#define GDT_ENTRIES 16
19038+#define GDT_ENTRIES 17
19039
19040 #endif
19041
19042 #define __KERNEL_CS (GDT_ENTRY_KERNEL_CS*8)
19043+#define __KERNEXEC_KERNEL_CS (GDT_ENTRY_KERNEXEC_KERNEL_CS*8)
19044 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS*8)
19045+#define __UDEREF_KERNEL_DS (GDT_ENTRY_UDEREF_KERNEL_DS*8)
19046 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS*8+3)
19047 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS*8+3)
19048 #ifndef CONFIG_PARAVIRT
19049@@ -256,7 +275,7 @@ static inline unsigned long get_limit(unsigned long segment)
19050 {
19051 unsigned long __limit;
19052 asm("lsll %1,%0" : "=r" (__limit) : "r" (segment));
19053- return __limit + 1;
19054+ return __limit;
19055 }
19056
19057 #endif /* !__ASSEMBLY__ */
19058diff --git a/arch/x86/include/asm/smap.h b/arch/x86/include/asm/smap.h
19059index 8d3120f..352b440 100644
19060--- a/arch/x86/include/asm/smap.h
19061+++ b/arch/x86/include/asm/smap.h
19062@@ -25,11 +25,40 @@
19063
19064 #include <asm/alternative-asm.h>
19065
19066+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19067+#define ASM_PAX_OPEN_USERLAND \
19068+ 661: jmp 663f; \
19069+ .pushsection .altinstr_replacement, "a" ; \
19070+ 662: pushq %rax; nop; \
19071+ .popsection ; \
19072+ .pushsection .altinstructions, "a" ; \
19073+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19074+ .popsection ; \
19075+ call __pax_open_userland; \
19076+ popq %rax; \
19077+ 663:
19078+
19079+#define ASM_PAX_CLOSE_USERLAND \
19080+ 661: jmp 663f; \
19081+ .pushsection .altinstr_replacement, "a" ; \
19082+ 662: pushq %rax; nop; \
19083+ .popsection; \
19084+ .pushsection .altinstructions, "a" ; \
19085+ altinstruction_entry 661b, 662b, X86_FEATURE_STRONGUDEREF, 2, 2;\
19086+ .popsection; \
19087+ call __pax_close_userland; \
19088+ popq %rax; \
19089+ 663:
19090+#else
19091+#define ASM_PAX_OPEN_USERLAND
19092+#define ASM_PAX_CLOSE_USERLAND
19093+#endif
19094+
19095 #ifdef CONFIG_X86_SMAP
19096
19097 #define ASM_CLAC \
19098 661: ASM_NOP3 ; \
19099- .pushsection .altinstr_replacement, "ax" ; \
19100+ .pushsection .altinstr_replacement, "a" ; \
19101 662: __ASM_CLAC ; \
19102 .popsection ; \
19103 .pushsection .altinstructions, "a" ; \
19104@@ -38,7 +67,7 @@
19105
19106 #define ASM_STAC \
19107 661: ASM_NOP3 ; \
19108- .pushsection .altinstr_replacement, "ax" ; \
19109+ .pushsection .altinstr_replacement, "a" ; \
19110 662: __ASM_STAC ; \
19111 .popsection ; \
19112 .pushsection .altinstructions, "a" ; \
19113@@ -56,6 +85,37 @@
19114
19115 #include <asm/alternative.h>
19116
19117+#define __HAVE_ARCH_PAX_OPEN_USERLAND
19118+#define __HAVE_ARCH_PAX_CLOSE_USERLAND
19119+
19120+extern void __pax_open_userland(void);
19121+static __always_inline unsigned long pax_open_userland(void)
19122+{
19123+
19124+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19125+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[open]", X86_FEATURE_STRONGUDEREF)
19126+ :
19127+ : [open] "i" (__pax_open_userland)
19128+ : "memory", "rax");
19129+#endif
19130+
19131+ return 0;
19132+}
19133+
19134+extern void __pax_close_userland(void);
19135+static __always_inline unsigned long pax_close_userland(void)
19136+{
19137+
19138+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19139+ asm volatile(ALTERNATIVE(ASM_NOP5, "call %P[close]", X86_FEATURE_STRONGUDEREF)
19140+ :
19141+ : [close] "i" (__pax_close_userland)
19142+ : "memory", "rax");
19143+#endif
19144+
19145+ return 0;
19146+}
19147+
19148 #ifdef CONFIG_X86_SMAP
19149
19150 static __always_inline void clac(void)
19151diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h
19152index 8cd1cc3..827e09e 100644
19153--- a/arch/x86/include/asm/smp.h
19154+++ b/arch/x86/include/asm/smp.h
19155@@ -35,7 +35,7 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map);
19156 /* cpus sharing the last level cache: */
19157 DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);
19158 DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);
19159-DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);
19160+DECLARE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
19161
19162 static inline struct cpumask *cpu_sibling_mask(int cpu)
19163 {
19164@@ -78,7 +78,7 @@ struct smp_ops {
19165
19166 void (*send_call_func_ipi)(const struct cpumask *mask);
19167 void (*send_call_func_single_ipi)(int cpu);
19168-};
19169+} __no_const;
19170
19171 /* Globals due to paravirt */
19172 extern void set_cpu_sibling_map(int cpu);
19173@@ -191,14 +191,8 @@ extern unsigned disabled_cpus;
19174 extern int safe_smp_processor_id(void);
19175
19176 #elif defined(CONFIG_X86_64_SMP)
19177-#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19178-
19179-#define stack_smp_processor_id() \
19180-({ \
19181- struct thread_info *ti; \
19182- __asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK)); \
19183- ti->cpu; \
19184-})
19185+#define raw_smp_processor_id() (this_cpu_read(cpu_number))
19186+#define stack_smp_processor_id() raw_smp_processor_id()
19187 #define safe_smp_processor_id() smp_processor_id()
19188
19189 #endif
19190diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
19191index 6a99859..03cb807 100644
19192--- a/arch/x86/include/asm/stackprotector.h
19193+++ b/arch/x86/include/asm/stackprotector.h
19194@@ -47,7 +47,7 @@
19195 * head_32 for boot CPU and setup_per_cpu_areas() for others.
19196 */
19197 #define GDT_STACK_CANARY_INIT \
19198- [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x18),
19199+ [GDT_ENTRY_STACK_CANARY] = GDT_ENTRY_INIT(0x4090, 0, 0x17),
19200
19201 /*
19202 * Initialize the stackprotector canary value.
19203@@ -112,7 +112,7 @@ static inline void setup_stack_canary_segment(int cpu)
19204
19205 static inline void load_stack_canary_segment(void)
19206 {
19207-#ifdef CONFIG_X86_32
19208+#if defined(CONFIG_X86_32) && !defined(CONFIG_PAX_MEMORY_UDEREF)
19209 asm volatile ("mov %0, %%gs" : : "r" (0));
19210 #endif
19211 }
19212diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
19213index 70bbe39..4ae2bd4 100644
19214--- a/arch/x86/include/asm/stacktrace.h
19215+++ b/arch/x86/include/asm/stacktrace.h
19216@@ -11,28 +11,20 @@
19217
19218 extern int kstack_depth_to_print;
19219
19220-struct thread_info;
19221+struct task_struct;
19222 struct stacktrace_ops;
19223
19224-typedef unsigned long (*walk_stack_t)(struct thread_info *tinfo,
19225- unsigned long *stack,
19226- unsigned long bp,
19227- const struct stacktrace_ops *ops,
19228- void *data,
19229- unsigned long *end,
19230- int *graph);
19231+typedef unsigned long walk_stack_t(struct task_struct *task,
19232+ void *stack_start,
19233+ unsigned long *stack,
19234+ unsigned long bp,
19235+ const struct stacktrace_ops *ops,
19236+ void *data,
19237+ unsigned long *end,
19238+ int *graph);
19239
19240-extern unsigned long
19241-print_context_stack(struct thread_info *tinfo,
19242- unsigned long *stack, unsigned long bp,
19243- const struct stacktrace_ops *ops, void *data,
19244- unsigned long *end, int *graph);
19245-
19246-extern unsigned long
19247-print_context_stack_bp(struct thread_info *tinfo,
19248- unsigned long *stack, unsigned long bp,
19249- const struct stacktrace_ops *ops, void *data,
19250- unsigned long *end, int *graph);
19251+extern walk_stack_t print_context_stack;
19252+extern walk_stack_t print_context_stack_bp;
19253
19254 /* Generic stack tracer with callbacks */
19255
19256@@ -40,7 +32,7 @@ struct stacktrace_ops {
19257 void (*address)(void *data, unsigned long address, int reliable);
19258 /* On negative return stop dumping */
19259 int (*stack)(void *data, char *name);
19260- walk_stack_t walk_stack;
19261+ walk_stack_t *walk_stack;
19262 };
19263
19264 void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
19265diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
19266index 751bf4b..a1278b5 100644
19267--- a/arch/x86/include/asm/switch_to.h
19268+++ b/arch/x86/include/asm/switch_to.h
19269@@ -112,7 +112,7 @@ do { \
19270 "call __switch_to\n\t" \
19271 "movq "__percpu_arg([current_task])",%%rsi\n\t" \
19272 __switch_canary \
19273- "movq %P[thread_info](%%rsi),%%r8\n\t" \
19274+ "movq "__percpu_arg([thread_info])",%%r8\n\t" \
19275 "movq %%rax,%%rdi\n\t" \
19276 "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \
19277 "jnz ret_from_fork\n\t" \
19278@@ -123,7 +123,7 @@ do { \
19279 [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \
19280 [ti_flags] "i" (offsetof(struct thread_info, flags)), \
19281 [_tif_fork] "i" (_TIF_FORK), \
19282- [thread_info] "i" (offsetof(struct task_struct, stack)), \
19283+ [thread_info] "m" (current_tinfo), \
19284 [current_task] "m" (current_task) \
19285 __switch_canary_iparam \
19286 : "memory", "cc" __EXTRA_CLOBBER)
19287diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
19288index 1d4e4f2..506db18 100644
19289--- a/arch/x86/include/asm/thread_info.h
19290+++ b/arch/x86/include/asm/thread_info.h
19291@@ -24,7 +24,6 @@ struct exec_domain;
19292 #include <linux/atomic.h>
19293
19294 struct thread_info {
19295- struct task_struct *task; /* main task structure */
19296 struct exec_domain *exec_domain; /* execution domain */
19297 __u32 flags; /* low level flags */
19298 __u32 status; /* thread synchronous flags */
19299@@ -32,13 +31,13 @@ struct thread_info {
19300 int saved_preempt_count;
19301 mm_segment_t addr_limit;
19302 void __user *sysenter_return;
19303+ unsigned long lowest_stack;
19304 unsigned int sig_on_uaccess_error:1;
19305 unsigned int uaccess_err:1; /* uaccess failed */
19306 };
19307
19308-#define INIT_THREAD_INFO(tsk) \
19309+#define INIT_THREAD_INFO \
19310 { \
19311- .task = &tsk, \
19312 .exec_domain = &default_exec_domain, \
19313 .flags = 0, \
19314 .cpu = 0, \
19315@@ -46,7 +45,7 @@ struct thread_info {
19316 .addr_limit = KERNEL_DS, \
19317 }
19318
19319-#define init_thread_info (init_thread_union.thread_info)
19320+#define init_thread_info (init_thread_union.stack)
19321 #define init_stack (init_thread_union.stack)
19322
19323 #else /* !__ASSEMBLY__ */
19324@@ -86,6 +85,7 @@ struct thread_info {
19325 #define TIF_SYSCALL_TRACEPOINT 28 /* syscall tracepoint instrumentation */
19326 #define TIF_ADDR32 29 /* 32-bit address space on 64 bits */
19327 #define TIF_X32 30 /* 32-bit native x86-64 binary */
19328+#define TIF_GRSEC_SETXID 31 /* update credentials on syscall entry/exit */
19329
19330 #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
19331 #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
19332@@ -109,17 +109,18 @@ struct thread_info {
19333 #define _TIF_SYSCALL_TRACEPOINT (1 << TIF_SYSCALL_TRACEPOINT)
19334 #define _TIF_ADDR32 (1 << TIF_ADDR32)
19335 #define _TIF_X32 (1 << TIF_X32)
19336+#define _TIF_GRSEC_SETXID (1 << TIF_GRSEC_SETXID)
19337
19338 /* work to do in syscall_trace_enter() */
19339 #define _TIF_WORK_SYSCALL_ENTRY \
19340 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_EMU | _TIF_SYSCALL_AUDIT | \
19341 _TIF_SECCOMP | _TIF_SINGLESTEP | _TIF_SYSCALL_TRACEPOINT | \
19342- _TIF_NOHZ)
19343+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19344
19345 /* work to do in syscall_trace_leave() */
19346 #define _TIF_WORK_SYSCALL_EXIT \
19347 (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SINGLESTEP | \
19348- _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ)
19349+ _TIF_SYSCALL_TRACEPOINT | _TIF_NOHZ | _TIF_GRSEC_SETXID)
19350
19351 /* work to do on interrupt/exception return */
19352 #define _TIF_WORK_MASK \
19353@@ -130,7 +131,7 @@ struct thread_info {
19354 /* work to do on any return to user space */
19355 #define _TIF_ALLWORK_MASK \
19356 ((0x0000FFFF & ~_TIF_SECCOMP) | _TIF_SYSCALL_TRACEPOINT | \
19357- _TIF_NOHZ)
19358+ _TIF_NOHZ | _TIF_GRSEC_SETXID)
19359
19360 /* Only used for 64 bit */
19361 #define _TIF_DO_NOTIFY_MASK \
19362@@ -145,7 +146,6 @@ struct thread_info {
19363 #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
19364
19365 #define STACK_WARN (THREAD_SIZE/8)
19366-#define KERNEL_STACK_OFFSET (5*(BITS_PER_LONG/8))
19367
19368 /*
19369 * macros/functions for gaining access to the thread information structure
19370@@ -156,12 +156,11 @@ struct thread_info {
19371
19372 DECLARE_PER_CPU(unsigned long, kernel_stack);
19373
19374+DECLARE_PER_CPU(struct thread_info *, current_tinfo);
19375+
19376 static inline struct thread_info *current_thread_info(void)
19377 {
19378- struct thread_info *ti;
19379- ti = (void *)(this_cpu_read_stable(kernel_stack) +
19380- KERNEL_STACK_OFFSET - THREAD_SIZE);
19381- return ti;
19382+ return this_cpu_read_stable(current_tinfo);
19383 }
19384
19385 static inline unsigned long current_stack_pointer(void)
19386@@ -179,14 +178,7 @@ static inline unsigned long current_stack_pointer(void)
19387
19388 /* how to get the thread information struct from ASM */
19389 #define GET_THREAD_INFO(reg) \
19390- _ASM_MOV PER_CPU_VAR(kernel_stack),reg ; \
19391- _ASM_SUB $(THREAD_SIZE-KERNEL_STACK_OFFSET),reg ;
19392-
19393-/*
19394- * Same if PER_CPU_VAR(kernel_stack) is, perhaps with some offset, already in
19395- * a certain register (to be used in assembler memory operands).
19396- */
19397-#define THREAD_INFO(reg, off) KERNEL_STACK_OFFSET+(off)-THREAD_SIZE(reg)
19398+ _ASM_MOV PER_CPU_VAR(current_tinfo),reg ;
19399
19400 #endif
19401
19402@@ -242,5 +234,12 @@ static inline bool is_ia32_task(void)
19403 extern void arch_task_cache_init(void);
19404 extern int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src);
19405 extern void arch_release_task_struct(struct task_struct *tsk);
19406+
19407+#define __HAVE_THREAD_FUNCTIONS
19408+#define task_thread_info(task) (&(task)->tinfo)
19409+#define task_stack_page(task) ((task)->stack)
19410+#define setup_thread_stack(p, org) do {} while (0)
19411+#define end_of_stack(p) ((unsigned long *)task_stack_page(p) + 1)
19412+
19413 #endif
19414 #endif /* _ASM_X86_THREAD_INFO_H */
19415diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
19416index cd79194..e7a9491 100644
19417--- a/arch/x86/include/asm/tlbflush.h
19418+++ b/arch/x86/include/asm/tlbflush.h
19419@@ -86,18 +86,44 @@ static inline void cr4_set_bits_and_update_boot(unsigned long mask)
19420
19421 static inline void __native_flush_tlb(void)
19422 {
19423+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19424+ u64 descriptor[2];
19425+
19426+ descriptor[0] = PCID_KERNEL;
19427+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_NONGLOBAL) : "memory");
19428+ return;
19429+ }
19430+
19431+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19432+ if (static_cpu_has(X86_FEATURE_PCID)) {
19433+ unsigned int cpu = raw_get_cpu();
19434+
19435+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER);
19436+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL);
19437+ raw_put_cpu_no_resched();
19438+ return;
19439+ }
19440+#endif
19441+
19442 native_write_cr3(native_read_cr3());
19443 }
19444
19445 static inline void __native_flush_tlb_global_irq_disabled(void)
19446 {
19447- unsigned long cr4;
19448+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19449+ u64 descriptor[2];
19450
19451- cr4 = this_cpu_read(cpu_tlbstate.cr4);
19452- /* clear PGE */
19453- native_write_cr4(cr4 & ~X86_CR4_PGE);
19454- /* write old PGE again and flush TLBs */
19455- native_write_cr4(cr4);
19456+ descriptor[0] = PCID_KERNEL;
19457+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_ALL_GLOBAL) : "memory");
19458+ } else {
19459+ unsigned long cr4;
19460+
19461+ cr4 = this_cpu_read(cpu_tlbstate.cr4);
19462+ /* clear PGE */
19463+ native_write_cr4(cr4 & ~X86_CR4_PGE);
19464+ /* write old PGE again and flush TLBs */
19465+ native_write_cr4(cr4);
19466+ }
19467 }
19468
19469 static inline void __native_flush_tlb_global(void)
19470@@ -118,6 +144,41 @@ static inline void __native_flush_tlb_global(void)
19471
19472 static inline void __native_flush_tlb_single(unsigned long addr)
19473 {
19474+ if (static_cpu_has(X86_FEATURE_INVPCID)) {
19475+ u64 descriptor[2];
19476+
19477+ descriptor[0] = PCID_KERNEL;
19478+ descriptor[1] = addr;
19479+
19480+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19481+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) || addr >= TASK_SIZE_MAX) {
19482+ if (addr < TASK_SIZE_MAX)
19483+ descriptor[1] += pax_user_shadow_base;
19484+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19485+ }
19486+
19487+ descriptor[0] = PCID_USER;
19488+ descriptor[1] = addr;
19489+#endif
19490+
19491+ asm volatile(__ASM_INVPCID : : "d"(&descriptor), "a"(INVPCID_SINGLE_ADDRESS) : "memory");
19492+ return;
19493+ }
19494+
19495+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19496+ if (static_cpu_has(X86_FEATURE_PCID)) {
19497+ unsigned int cpu = raw_get_cpu();
19498+
19499+ native_write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
19500+ asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19501+ native_write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
19502+ raw_put_cpu_no_resched();
19503+
19504+ if (!static_cpu_has(X86_FEATURE_STRONGUDEREF) && addr < TASK_SIZE_MAX)
19505+ addr += pax_user_shadow_base;
19506+ }
19507+#endif
19508+
19509 asm volatile("invlpg (%0)" ::"r" (addr) : "memory");
19510 }
19511
19512diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
19513index ace9dec..3f9e253 100644
19514--- a/arch/x86/include/asm/uaccess.h
19515+++ b/arch/x86/include/asm/uaccess.h
19516@@ -7,6 +7,7 @@
19517 #include <linux/compiler.h>
19518 #include <linux/thread_info.h>
19519 #include <linux/string.h>
19520+#include <linux/spinlock.h>
19521 #include <asm/asm.h>
19522 #include <asm/page.h>
19523 #include <asm/smap.h>
19524@@ -29,7 +30,12 @@
19525
19526 #define get_ds() (KERNEL_DS)
19527 #define get_fs() (current_thread_info()->addr_limit)
19528+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19529+void __set_fs(mm_segment_t x);
19530+void set_fs(mm_segment_t x);
19531+#else
19532 #define set_fs(x) (current_thread_info()->addr_limit = (x))
19533+#endif
19534
19535 #define segment_eq(a, b) ((a).seg == (b).seg)
19536
19537@@ -85,8 +91,36 @@ static inline bool __chk_range_not_ok(unsigned long addr, unsigned long size, un
19538 * checks that the pointer is in the user space range - after calling
19539 * this function, memory access functions may still return -EFAULT.
19540 */
19541-#define access_ok(type, addr, size) \
19542- likely(!__range_not_ok(addr, size, user_addr_max()))
19543+extern int _cond_resched(void);
19544+#define access_ok_noprefault(type, addr, size) (likely(!__range_not_ok(addr, size, user_addr_max())))
19545+#define access_ok(type, addr, size) \
19546+({ \
19547+ unsigned long __size = size; \
19548+ unsigned long __addr = (unsigned long)addr; \
19549+ bool __ret_ao = __range_not_ok(__addr, __size, user_addr_max()) == 0;\
19550+ if (__ret_ao && __size) { \
19551+ unsigned long __addr_ao = __addr & PAGE_MASK; \
19552+ unsigned long __end_ao = __addr + __size - 1; \
19553+ if (unlikely((__end_ao ^ __addr_ao) & PAGE_MASK)) { \
19554+ while (__addr_ao <= __end_ao) { \
19555+ char __c_ao; \
19556+ __addr_ao += PAGE_SIZE; \
19557+ if (__size > PAGE_SIZE) \
19558+ _cond_resched(); \
19559+ if (__get_user(__c_ao, (char __user *)__addr)) \
19560+ break; \
19561+ if (type != VERIFY_WRITE) { \
19562+ __addr = __addr_ao; \
19563+ continue; \
19564+ } \
19565+ if (__put_user(__c_ao, (char __user *)__addr)) \
19566+ break; \
19567+ __addr = __addr_ao; \
19568+ } \
19569+ } \
19570+ } \
19571+ __ret_ao; \
19572+})
19573
19574 /*
19575 * The exception table consists of pairs of addresses relative to the
19576@@ -134,11 +168,13 @@ extern int __get_user_8(void);
19577 extern int __get_user_bad(void);
19578
19579 /*
19580- * This is a type: either unsigned long, if the argument fits into
19581- * that type, or otherwise unsigned long long.
19582+ * This is a type: either (un)signed int, if the argument fits into
19583+ * that type, or otherwise (un)signed long long.
19584 */
19585 #define __inttype(x) \
19586-__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19587+__typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0U), \
19588+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0ULL, 0LL),\
19589+ __builtin_choose_expr(__type_is_unsigned(__typeof__(x)), 0U, 0)))
19590
19591 /**
19592 * get_user: - Get a simple variable from user space.
19593@@ -176,10 +212,12 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19594 register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX); \
19595 __chk_user_ptr(ptr); \
19596 might_fault(); \
19597+ pax_open_userland(); \
19598 asm volatile("call __get_user_%P3" \
19599 : "=a" (__ret_gu), "=r" (__val_gu) \
19600 : "0" (ptr), "i" (sizeof(*(ptr)))); \
19601 (x) = (__force __typeof__(*(ptr))) __val_gu; \
19602+ pax_close_userland(); \
19603 __ret_gu; \
19604 })
19605
19606@@ -187,13 +225,21 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19607 asm volatile("call __put_user_" #size : "=a" (__ret_pu) \
19608 : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx")
19609
19610-
19611+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
19612+#define __copyuser_seg "gs;"
19613+#define __COPYUSER_SET_ES "pushl %%gs; popl %%es\n"
19614+#define __COPYUSER_RESTORE_ES "pushl %%ss; popl %%es\n"
19615+#else
19616+#define __copyuser_seg
19617+#define __COPYUSER_SET_ES
19618+#define __COPYUSER_RESTORE_ES
19619+#endif
19620
19621 #ifdef CONFIG_X86_32
19622 #define __put_user_asm_u64(x, addr, err, errret) \
19623 asm volatile(ASM_STAC "\n" \
19624- "1: movl %%eax,0(%2)\n" \
19625- "2: movl %%edx,4(%2)\n" \
19626+ "1: "__copyuser_seg"movl %%eax,0(%2)\n" \
19627+ "2: "__copyuser_seg"movl %%edx,4(%2)\n" \
19628 "3: " ASM_CLAC "\n" \
19629 ".section .fixup,\"ax\"\n" \
19630 "4: movl %3,%0\n" \
19631@@ -206,8 +252,8 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
19632
19633 #define __put_user_asm_ex_u64(x, addr) \
19634 asm volatile(ASM_STAC "\n" \
19635- "1: movl %%eax,0(%1)\n" \
19636- "2: movl %%edx,4(%1)\n" \
19637+ "1: "__copyuser_seg"movl %%eax,0(%1)\n" \
19638+ "2: "__copyuser_seg"movl %%edx,4(%1)\n" \
19639 "3: " ASM_CLAC "\n" \
19640 _ASM_EXTABLE_EX(1b, 2b) \
19641 _ASM_EXTABLE_EX(2b, 3b) \
19642@@ -257,7 +303,8 @@ extern void __put_user_8(void);
19643 __typeof__(*(ptr)) __pu_val; \
19644 __chk_user_ptr(ptr); \
19645 might_fault(); \
19646- __pu_val = x; \
19647+ __pu_val = (x); \
19648+ pax_open_userland(); \
19649 switch (sizeof(*(ptr))) { \
19650 case 1: \
19651 __put_user_x(1, __pu_val, ptr, __ret_pu); \
19652@@ -275,6 +322,7 @@ extern void __put_user_8(void);
19653 __put_user_x(X, __pu_val, ptr, __ret_pu); \
19654 break; \
19655 } \
19656+ pax_close_userland(); \
19657 __ret_pu; \
19658 })
19659
19660@@ -355,8 +403,10 @@ do { \
19661 } while (0)
19662
19663 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19664+do { \
19665+ pax_open_userland(); \
19666 asm volatile(ASM_STAC "\n" \
19667- "1: mov"itype" %2,%"rtype"1\n" \
19668+ "1: "__copyuser_seg"mov"itype" %2,%"rtype"1\n"\
19669 "2: " ASM_CLAC "\n" \
19670 ".section .fixup,\"ax\"\n" \
19671 "3: mov %3,%0\n" \
19672@@ -364,8 +414,10 @@ do { \
19673 " jmp 2b\n" \
19674 ".previous\n" \
19675 _ASM_EXTABLE(1b, 3b) \
19676- : "=r" (err), ltype(x) \
19677- : "m" (__m(addr)), "i" (errret), "0" (err))
19678+ : "=r" (err), ltype (x) \
19679+ : "m" (__m(addr)), "i" (errret), "0" (err)); \
19680+ pax_close_userland(); \
19681+} while (0)
19682
19683 #define __get_user_size_ex(x, ptr, size) \
19684 do { \
19685@@ -389,7 +441,7 @@ do { \
19686 } while (0)
19687
19688 #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \
19689- asm volatile("1: mov"itype" %1,%"rtype"0\n" \
19690+ asm volatile("1: "__copyuser_seg"mov"itype" %1,%"rtype"0\n"\
19691 "2:\n" \
19692 _ASM_EXTABLE_EX(1b, 2b) \
19693 : ltype(x) : "m" (__m(addr)))
19694@@ -406,13 +458,24 @@ do { \
19695 int __gu_err; \
19696 unsigned long __gu_val; \
19697 __get_user_size(__gu_val, (ptr), (size), __gu_err, -EFAULT); \
19698- (x) = (__force __typeof__(*(ptr)))__gu_val; \
19699+ (x) = (__typeof__(*(ptr)))__gu_val; \
19700 __gu_err; \
19701 })
19702
19703 /* FIXME: this hack is definitely wrong -AK */
19704 struct __large_struct { unsigned long buf[100]; };
19705-#define __m(x) (*(struct __large_struct __user *)(x))
19706+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19707+#define ____m(x) \
19708+({ \
19709+ unsigned long ____x = (unsigned long)(x); \
19710+ if (____x < pax_user_shadow_base) \
19711+ ____x += pax_user_shadow_base; \
19712+ (typeof(x))____x; \
19713+})
19714+#else
19715+#define ____m(x) (x)
19716+#endif
19717+#define __m(x) (*(struct __large_struct __user *)____m(x))
19718
19719 /*
19720 * Tell gcc we read from memory instead of writing: this is because
19721@@ -420,8 +483,10 @@ struct __large_struct { unsigned long buf[100]; };
19722 * aliasing issues.
19723 */
19724 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \
19725+do { \
19726+ pax_open_userland(); \
19727 asm volatile(ASM_STAC "\n" \
19728- "1: mov"itype" %"rtype"1,%2\n" \
19729+ "1: "__copyuser_seg"mov"itype" %"rtype"1,%2\n"\
19730 "2: " ASM_CLAC "\n" \
19731 ".section .fixup,\"ax\"\n" \
19732 "3: mov %3,%0\n" \
19733@@ -429,10 +494,12 @@ struct __large_struct { unsigned long buf[100]; };
19734 ".previous\n" \
19735 _ASM_EXTABLE(1b, 3b) \
19736 : "=r"(err) \
19737- : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err))
19738+ : ltype (x), "m" (__m(addr)), "i" (errret), "0" (err));\
19739+ pax_close_userland(); \
19740+} while (0)
19741
19742 #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \
19743- asm volatile("1: mov"itype" %"rtype"0,%1\n" \
19744+ asm volatile("1: "__copyuser_seg"mov"itype" %"rtype"0,%1\n"\
19745 "2:\n" \
19746 _ASM_EXTABLE_EX(1b, 2b) \
19747 : : ltype(x), "m" (__m(addr)))
19748@@ -442,11 +509,13 @@ struct __large_struct { unsigned long buf[100]; };
19749 */
19750 #define uaccess_try do { \
19751 current_thread_info()->uaccess_err = 0; \
19752+ pax_open_userland(); \
19753 stac(); \
19754 barrier();
19755
19756 #define uaccess_catch(err) \
19757 clac(); \
19758+ pax_close_userland(); \
19759 (err) |= (current_thread_info()->uaccess_err ? -EFAULT : 0); \
19760 } while (0)
19761
19762@@ -471,8 +540,12 @@ struct __large_struct { unsigned long buf[100]; };
19763 * On error, the variable @x is set to zero.
19764 */
19765
19766+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19767+#define __get_user(x, ptr) get_user((x), (ptr))
19768+#else
19769 #define __get_user(x, ptr) \
19770 __get_user_nocheck((x), (ptr), sizeof(*(ptr)))
19771+#endif
19772
19773 /**
19774 * __put_user: - Write a simple value into user space, with less checking.
19775@@ -494,8 +567,12 @@ struct __large_struct { unsigned long buf[100]; };
19776 * Returns zero on success, or -EFAULT on error.
19777 */
19778
19779+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
19780+#define __put_user(x, ptr) put_user((x), (ptr))
19781+#else
19782 #define __put_user(x, ptr) \
19783 __put_user_nocheck((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr)))
19784+#endif
19785
19786 #define __get_user_unaligned __get_user
19787 #define __put_user_unaligned __put_user
19788@@ -513,7 +590,7 @@ struct __large_struct { unsigned long buf[100]; };
19789 #define get_user_ex(x, ptr) do { \
19790 unsigned long __gue_val; \
19791 __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \
19792- (x) = (__force __typeof__(*(ptr)))__gue_val; \
19793+ (x) = (__typeof__(*(ptr)))__gue_val; \
19794 } while (0)
19795
19796 #define put_user_try uaccess_try
19797@@ -531,7 +608,7 @@ extern __must_check long strlen_user(const char __user *str);
19798 extern __must_check long strnlen_user(const char __user *str, long n);
19799
19800 unsigned long __must_check clear_user(void __user *mem, unsigned long len);
19801-unsigned long __must_check __clear_user(void __user *mem, unsigned long len);
19802+unsigned long __must_check __clear_user(void __user *mem, unsigned long len) __size_overflow(2);
19803
19804 extern void __cmpxchg_wrong_size(void)
19805 __compiletime_error("Bad argument size for cmpxchg");
19806@@ -542,18 +619,19 @@ extern void __cmpxchg_wrong_size(void)
19807 __typeof__(ptr) __uval = (uval); \
19808 __typeof__(*(ptr)) __old = (old); \
19809 __typeof__(*(ptr)) __new = (new); \
19810+ pax_open_userland(); \
19811 switch (size) { \
19812 case 1: \
19813 { \
19814 asm volatile("\t" ASM_STAC "\n" \
19815- "1:\t" LOCK_PREFIX "cmpxchgb %4, %2\n" \
19816+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgb %4, %2\n"\
19817 "2:\t" ASM_CLAC "\n" \
19818 "\t.section .fixup, \"ax\"\n" \
19819 "3:\tmov %3, %0\n" \
19820 "\tjmp 2b\n" \
19821 "\t.previous\n" \
19822 _ASM_EXTABLE(1b, 3b) \
19823- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19824+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19825 : "i" (-EFAULT), "q" (__new), "1" (__old) \
19826 : "memory" \
19827 ); \
19828@@ -562,14 +640,14 @@ extern void __cmpxchg_wrong_size(void)
19829 case 2: \
19830 { \
19831 asm volatile("\t" ASM_STAC "\n" \
19832- "1:\t" LOCK_PREFIX "cmpxchgw %4, %2\n" \
19833+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgw %4, %2\n"\
19834 "2:\t" ASM_CLAC "\n" \
19835 "\t.section .fixup, \"ax\"\n" \
19836 "3:\tmov %3, %0\n" \
19837 "\tjmp 2b\n" \
19838 "\t.previous\n" \
19839 _ASM_EXTABLE(1b, 3b) \
19840- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19841+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19842 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19843 : "memory" \
19844 ); \
19845@@ -578,14 +656,14 @@ extern void __cmpxchg_wrong_size(void)
19846 case 4: \
19847 { \
19848 asm volatile("\t" ASM_STAC "\n" \
19849- "1:\t" LOCK_PREFIX "cmpxchgl %4, %2\n" \
19850+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgl %4, %2\n"\
19851 "2:\t" ASM_CLAC "\n" \
19852 "\t.section .fixup, \"ax\"\n" \
19853 "3:\tmov %3, %0\n" \
19854 "\tjmp 2b\n" \
19855 "\t.previous\n" \
19856 _ASM_EXTABLE(1b, 3b) \
19857- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19858+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19859 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19860 : "memory" \
19861 ); \
19862@@ -597,14 +675,14 @@ extern void __cmpxchg_wrong_size(void)
19863 __cmpxchg_wrong_size(); \
19864 \
19865 asm volatile("\t" ASM_STAC "\n" \
19866- "1:\t" LOCK_PREFIX "cmpxchgq %4, %2\n" \
19867+ "1:\t" LOCK_PREFIX __copyuser_seg"cmpxchgq %4, %2\n"\
19868 "2:\t" ASM_CLAC "\n" \
19869 "\t.section .fixup, \"ax\"\n" \
19870 "3:\tmov %3, %0\n" \
19871 "\tjmp 2b\n" \
19872 "\t.previous\n" \
19873 _ASM_EXTABLE(1b, 3b) \
19874- : "+r" (__ret), "=a" (__old), "+m" (*(ptr)) \
19875+ : "+r" (__ret), "=a" (__old), "+m" (*____m(ptr))\
19876 : "i" (-EFAULT), "r" (__new), "1" (__old) \
19877 : "memory" \
19878 ); \
19879@@ -613,6 +691,7 @@ extern void __cmpxchg_wrong_size(void)
19880 default: \
19881 __cmpxchg_wrong_size(); \
19882 } \
19883+ pax_close_userland(); \
19884 *__uval = __old; \
19885 __ret; \
19886 })
19887@@ -636,17 +715,6 @@ extern struct movsl_mask {
19888
19889 #define ARCH_HAS_NOCACHE_UACCESS 1
19890
19891-#ifdef CONFIG_X86_32
19892-# include <asm/uaccess_32.h>
19893-#else
19894-# include <asm/uaccess_64.h>
19895-#endif
19896-
19897-unsigned long __must_check _copy_from_user(void *to, const void __user *from,
19898- unsigned n);
19899-unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19900- unsigned n);
19901-
19902 #ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
19903 # define copy_user_diag __compiletime_error
19904 #else
19905@@ -656,7 +724,7 @@ unsigned long __must_check _copy_to_user(void __user *to, const void *from,
19906 extern void copy_user_diag("copy_from_user() buffer size is too small")
19907 copy_from_user_overflow(void);
19908 extern void copy_user_diag("copy_to_user() buffer size is too small")
19909-copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19910+copy_to_user_overflow(void);
19911
19912 #undef copy_user_diag
19913
19914@@ -669,7 +737,7 @@ __copy_from_user_overflow(void) __asm__("copy_from_user_overflow");
19915
19916 extern void
19917 __compiletime_warning("copy_to_user() buffer size is not provably correct")
19918-__copy_to_user_overflow(void) __asm__("copy_from_user_overflow");
19919+__copy_to_user_overflow(void) __asm__("copy_to_user_overflow");
19920 #define __copy_to_user_overflow(size, count) __copy_to_user_overflow()
19921
19922 #else
19923@@ -684,10 +752,16 @@ __copy_from_user_overflow(int size, unsigned long count)
19924
19925 #endif
19926
19927+#ifdef CONFIG_X86_32
19928+# include <asm/uaccess_32.h>
19929+#else
19930+# include <asm/uaccess_64.h>
19931+#endif
19932+
19933 static inline unsigned long __must_check
19934 copy_from_user(void *to, const void __user *from, unsigned long n)
19935 {
19936- int sz = __compiletime_object_size(to);
19937+ size_t sz = __compiletime_object_size(to);
19938
19939 might_fault();
19940
19941@@ -709,12 +783,15 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19942 * case, and do only runtime checking for non-constant sizes.
19943 */
19944
19945- if (likely(sz < 0 || sz >= n))
19946- n = _copy_from_user(to, from, n);
19947- else if(__builtin_constant_p(n))
19948- copy_from_user_overflow();
19949- else
19950- __copy_from_user_overflow(sz, n);
19951+ if (likely(sz != (size_t)-1 && sz < n)) {
19952+ if(__builtin_constant_p(n))
19953+ copy_from_user_overflow();
19954+ else
19955+ __copy_from_user_overflow(sz, n);
19956+ } else if (access_ok(VERIFY_READ, from, n))
19957+ n = __copy_from_user(to, from, n);
19958+ else if ((long)n > 0)
19959+ memset(to, 0, n);
19960
19961 return n;
19962 }
19963@@ -722,17 +799,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n)
19964 static inline unsigned long __must_check
19965 copy_to_user(void __user *to, const void *from, unsigned long n)
19966 {
19967- int sz = __compiletime_object_size(from);
19968+ size_t sz = __compiletime_object_size(from);
19969
19970 might_fault();
19971
19972 /* See the comment in copy_from_user() above. */
19973- if (likely(sz < 0 || sz >= n))
19974- n = _copy_to_user(to, from, n);
19975- else if(__builtin_constant_p(n))
19976- copy_to_user_overflow();
19977- else
19978- __copy_to_user_overflow(sz, n);
19979+ if (likely(sz != (size_t)-1 && sz < n)) {
19980+ if(__builtin_constant_p(n))
19981+ copy_to_user_overflow();
19982+ else
19983+ __copy_to_user_overflow(sz, n);
19984+ } else if (access_ok(VERIFY_WRITE, to, n))
19985+ n = __copy_to_user(to, from, n);
19986
19987 return n;
19988 }
19989diff --git a/arch/x86/include/asm/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
19990index 3c03a5d..edb68ae 100644
19991--- a/arch/x86/include/asm/uaccess_32.h
19992+++ b/arch/x86/include/asm/uaccess_32.h
19993@@ -40,9 +40,14 @@ unsigned long __must_check __copy_from_user_ll_nocache_nozero
19994 * anything, so this is accurate.
19995 */
19996
19997-static __always_inline unsigned long __must_check
19998+static __always_inline __size_overflow(3) unsigned long __must_check
19999 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n)
20000 {
20001+ if ((long)n < 0)
20002+ return n;
20003+
20004+ check_object_size(from, n, true);
20005+
20006 if (__builtin_constant_p(n)) {
20007 unsigned long ret;
20008
20009@@ -82,12 +87,16 @@ static __always_inline unsigned long __must_check
20010 __copy_to_user(void __user *to, const void *from, unsigned long n)
20011 {
20012 might_fault();
20013+
20014 return __copy_to_user_inatomic(to, from, n);
20015 }
20016
20017-static __always_inline unsigned long
20018+static __always_inline __size_overflow(3) unsigned long
20019 __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n)
20020 {
20021+ if ((long)n < 0)
20022+ return n;
20023+
20024 /* Avoid zeroing the tail if the copy fails..
20025 * If 'n' is constant and 1, 2, or 4, we do still zero on a failure,
20026 * but as the zeroing behaviour is only significant when n is not
20027@@ -137,6 +146,12 @@ static __always_inline unsigned long
20028 __copy_from_user(void *to, const void __user *from, unsigned long n)
20029 {
20030 might_fault();
20031+
20032+ if ((long)n < 0)
20033+ return n;
20034+
20035+ check_object_size(to, n, false);
20036+
20037 if (__builtin_constant_p(n)) {
20038 unsigned long ret;
20039
20040@@ -159,6 +174,10 @@ static __always_inline unsigned long __copy_from_user_nocache(void *to,
20041 const void __user *from, unsigned long n)
20042 {
20043 might_fault();
20044+
20045+ if ((long)n < 0)
20046+ return n;
20047+
20048 if (__builtin_constant_p(n)) {
20049 unsigned long ret;
20050
20051@@ -181,7 +200,10 @@ static __always_inline unsigned long
20052 __copy_from_user_inatomic_nocache(void *to, const void __user *from,
20053 unsigned long n)
20054 {
20055- return __copy_from_user_ll_nocache_nozero(to, from, n);
20056+ if ((long)n < 0)
20057+ return n;
20058+
20059+ return __copy_from_user_ll_nocache_nozero(to, from, n);
20060 }
20061
20062 #endif /* _ASM_X86_UACCESS_32_H */
20063diff --git a/arch/x86/include/asm/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
20064index f2f9b39..2ae1bf8 100644
20065--- a/arch/x86/include/asm/uaccess_64.h
20066+++ b/arch/x86/include/asm/uaccess_64.h
20067@@ -10,6 +10,9 @@
20068 #include <asm/alternative.h>
20069 #include <asm/cpufeature.h>
20070 #include <asm/page.h>
20071+#include <asm/pgtable.h>
20072+
20073+#define set_fs(x) (current_thread_info()->addr_limit = (x))
20074
20075 /*
20076 * Copy To/From Userspace
20077@@ -23,8 +26,8 @@ copy_user_generic_string(void *to, const void *from, unsigned len);
20078 __must_check unsigned long
20079 copy_user_generic_unrolled(void *to, const void *from, unsigned len);
20080
20081-static __always_inline __must_check unsigned long
20082-copy_user_generic(void *to, const void *from, unsigned len)
20083+static __always_inline __must_check __size_overflow(3) unsigned long
20084+copy_user_generic(void *to, const void *from, unsigned long len)
20085 {
20086 unsigned ret;
20087
20088@@ -46,121 +49,170 @@ copy_user_generic(void *to, const void *from, unsigned len)
20089 }
20090
20091 __must_check unsigned long
20092-copy_in_user(void __user *to, const void __user *from, unsigned len);
20093+copy_in_user(void __user *to, const void __user *from, unsigned long len);
20094
20095 static __always_inline __must_check
20096-int __copy_from_user_nocheck(void *dst, const void __user *src, unsigned size)
20097+unsigned long __copy_from_user_nocheck(void *dst, const void __user *src, unsigned long size)
20098 {
20099- int ret = 0;
20100+ size_t sz = __compiletime_object_size(dst);
20101+ unsigned ret = 0;
20102+
20103+ if (size > INT_MAX)
20104+ return size;
20105+
20106+ check_object_size(dst, size, false);
20107+
20108+#ifdef CONFIG_PAX_MEMORY_UDEREF
20109+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20110+ return size;
20111+#endif
20112+
20113+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20114+ if(__builtin_constant_p(size))
20115+ copy_from_user_overflow();
20116+ else
20117+ __copy_from_user_overflow(sz, size);
20118+ return size;
20119+ }
20120
20121 if (!__builtin_constant_p(size))
20122- return copy_user_generic(dst, (__force void *)src, size);
20123+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20124 switch (size) {
20125- case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src,
20126+ case 1:__get_user_asm(*(u8 *)dst, (const u8 __user *)src,
20127 ret, "b", "b", "=q", 1);
20128 return ret;
20129- case 2:__get_user_asm(*(u16 *)dst, (u16 __user *)src,
20130+ case 2:__get_user_asm(*(u16 *)dst, (const u16 __user *)src,
20131 ret, "w", "w", "=r", 2);
20132 return ret;
20133- case 4:__get_user_asm(*(u32 *)dst, (u32 __user *)src,
20134+ case 4:__get_user_asm(*(u32 *)dst, (const u32 __user *)src,
20135 ret, "l", "k", "=r", 4);
20136 return ret;
20137- case 8:__get_user_asm(*(u64 *)dst, (u64 __user *)src,
20138+ case 8:__get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20139 ret, "q", "", "=r", 8);
20140 return ret;
20141 case 10:
20142- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20143+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20144 ret, "q", "", "=r", 10);
20145 if (unlikely(ret))
20146 return ret;
20147 __get_user_asm(*(u16 *)(8 + (char *)dst),
20148- (u16 __user *)(8 + (char __user *)src),
20149+ (const u16 __user *)(8 + (const char __user *)src),
20150 ret, "w", "w", "=r", 2);
20151 return ret;
20152 case 16:
20153- __get_user_asm(*(u64 *)dst, (u64 __user *)src,
20154+ __get_user_asm(*(u64 *)dst, (const u64 __user *)src,
20155 ret, "q", "", "=r", 16);
20156 if (unlikely(ret))
20157 return ret;
20158 __get_user_asm(*(u64 *)(8 + (char *)dst),
20159- (u64 __user *)(8 + (char __user *)src),
20160+ (const u64 __user *)(8 + (const char __user *)src),
20161 ret, "q", "", "=r", 8);
20162 return ret;
20163 default:
20164- return copy_user_generic(dst, (__force void *)src, size);
20165+ return copy_user_generic(dst, (__force_kernel const void *)____m(src), size);
20166 }
20167 }
20168
20169 static __always_inline __must_check
20170-int __copy_from_user(void *dst, const void __user *src, unsigned size)
20171+unsigned long __copy_from_user(void *dst, const void __user *src, unsigned long size)
20172 {
20173 might_fault();
20174 return __copy_from_user_nocheck(dst, src, size);
20175 }
20176
20177 static __always_inline __must_check
20178-int __copy_to_user_nocheck(void __user *dst, const void *src, unsigned size)
20179+unsigned long __copy_to_user_nocheck(void __user *dst, const void *src, unsigned long size)
20180 {
20181- int ret = 0;
20182+ size_t sz = __compiletime_object_size(src);
20183+ unsigned ret = 0;
20184+
20185+ if (size > INT_MAX)
20186+ return size;
20187+
20188+ check_object_size(src, size, true);
20189+
20190+#ifdef CONFIG_PAX_MEMORY_UDEREF
20191+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20192+ return size;
20193+#endif
20194+
20195+ if (unlikely(sz != (size_t)-1 && sz < size)) {
20196+ if(__builtin_constant_p(size))
20197+ copy_to_user_overflow();
20198+ else
20199+ __copy_to_user_overflow(sz, size);
20200+ return size;
20201+ }
20202
20203 if (!__builtin_constant_p(size))
20204- return copy_user_generic((__force void *)dst, src, size);
20205+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20206 switch (size) {
20207- case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst,
20208+ case 1:__put_user_asm(*(const u8 *)src, (u8 __user *)dst,
20209 ret, "b", "b", "iq", 1);
20210 return ret;
20211- case 2:__put_user_asm(*(u16 *)src, (u16 __user *)dst,
20212+ case 2:__put_user_asm(*(const u16 *)src, (u16 __user *)dst,
20213 ret, "w", "w", "ir", 2);
20214 return ret;
20215- case 4:__put_user_asm(*(u32 *)src, (u32 __user *)dst,
20216+ case 4:__put_user_asm(*(const u32 *)src, (u32 __user *)dst,
20217 ret, "l", "k", "ir", 4);
20218 return ret;
20219- case 8:__put_user_asm(*(u64 *)src, (u64 __user *)dst,
20220+ case 8:__put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20221 ret, "q", "", "er", 8);
20222 return ret;
20223 case 10:
20224- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20225+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20226 ret, "q", "", "er", 10);
20227 if (unlikely(ret))
20228 return ret;
20229 asm("":::"memory");
20230- __put_user_asm(4[(u16 *)src], 4 + (u16 __user *)dst,
20231+ __put_user_asm(4[(const u16 *)src], 4 + (u16 __user *)dst,
20232 ret, "w", "w", "ir", 2);
20233 return ret;
20234 case 16:
20235- __put_user_asm(*(u64 *)src, (u64 __user *)dst,
20236+ __put_user_asm(*(const u64 *)src, (u64 __user *)dst,
20237 ret, "q", "", "er", 16);
20238 if (unlikely(ret))
20239 return ret;
20240 asm("":::"memory");
20241- __put_user_asm(1[(u64 *)src], 1 + (u64 __user *)dst,
20242+ __put_user_asm(1[(const u64 *)src], 1 + (u64 __user *)dst,
20243 ret, "q", "", "er", 8);
20244 return ret;
20245 default:
20246- return copy_user_generic((__force void *)dst, src, size);
20247+ return copy_user_generic((__force_kernel void *)____m(dst), src, size);
20248 }
20249 }
20250
20251 static __always_inline __must_check
20252-int __copy_to_user(void __user *dst, const void *src, unsigned size)
20253+unsigned long __copy_to_user(void __user *dst, const void *src, unsigned long size)
20254 {
20255 might_fault();
20256 return __copy_to_user_nocheck(dst, src, size);
20257 }
20258
20259 static __always_inline __must_check
20260-int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20261+unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20262 {
20263- int ret = 0;
20264+ unsigned ret = 0;
20265
20266 might_fault();
20267+
20268+ if (size > INT_MAX)
20269+ return size;
20270+
20271+#ifdef CONFIG_PAX_MEMORY_UDEREF
20272+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20273+ return size;
20274+ if (!access_ok_noprefault(VERIFY_WRITE, dst, size))
20275+ return size;
20276+#endif
20277+
20278 if (!__builtin_constant_p(size))
20279- return copy_user_generic((__force void *)dst,
20280- (__force void *)src, size);
20281+ return copy_user_generic((__force_kernel void *)____m(dst),
20282+ (__force_kernel const void *)____m(src), size);
20283 switch (size) {
20284 case 1: {
20285 u8 tmp;
20286- __get_user_asm(tmp, (u8 __user *)src,
20287+ __get_user_asm(tmp, (const u8 __user *)src,
20288 ret, "b", "b", "=q", 1);
20289 if (likely(!ret))
20290 __put_user_asm(tmp, (u8 __user *)dst,
20291@@ -169,7 +221,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20292 }
20293 case 2: {
20294 u16 tmp;
20295- __get_user_asm(tmp, (u16 __user *)src,
20296+ __get_user_asm(tmp, (const u16 __user *)src,
20297 ret, "w", "w", "=r", 2);
20298 if (likely(!ret))
20299 __put_user_asm(tmp, (u16 __user *)dst,
20300@@ -179,7 +231,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20301
20302 case 4: {
20303 u32 tmp;
20304- __get_user_asm(tmp, (u32 __user *)src,
20305+ __get_user_asm(tmp, (const u32 __user *)src,
20306 ret, "l", "k", "=r", 4);
20307 if (likely(!ret))
20308 __put_user_asm(tmp, (u32 __user *)dst,
20309@@ -188,7 +240,7 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20310 }
20311 case 8: {
20312 u64 tmp;
20313- __get_user_asm(tmp, (u64 __user *)src,
20314+ __get_user_asm(tmp, (const u64 __user *)src,
20315 ret, "q", "", "=r", 8);
20316 if (likely(!ret))
20317 __put_user_asm(tmp, (u64 __user *)dst,
20318@@ -196,41 +248,58 @@ int __copy_in_user(void __user *dst, const void __user *src, unsigned size)
20319 return ret;
20320 }
20321 default:
20322- return copy_user_generic((__force void *)dst,
20323- (__force void *)src, size);
20324+ return copy_user_generic((__force_kernel void *)____m(dst),
20325+ (__force_kernel const void *)____m(src), size);
20326 }
20327 }
20328
20329-static __must_check __always_inline int
20330-__copy_from_user_inatomic(void *dst, const void __user *src, unsigned size)
20331+static __must_check __always_inline unsigned long
20332+__copy_from_user_inatomic(void *dst, const void __user *src, unsigned long size)
20333 {
20334 return __copy_from_user_nocheck(dst, src, size);
20335 }
20336
20337-static __must_check __always_inline int
20338-__copy_to_user_inatomic(void __user *dst, const void *src, unsigned size)
20339+static __must_check __always_inline unsigned long
20340+__copy_to_user_inatomic(void __user *dst, const void *src, unsigned long size)
20341 {
20342 return __copy_to_user_nocheck(dst, src, size);
20343 }
20344
20345-extern long __copy_user_nocache(void *dst, const void __user *src,
20346- unsigned size, int zerorest);
20347+extern unsigned long __copy_user_nocache(void *dst, const void __user *src,
20348+ unsigned long size, int zerorest);
20349
20350-static inline int
20351-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size)
20352+static inline unsigned long
20353+__copy_from_user_nocache(void *dst, const void __user *src, unsigned long size)
20354 {
20355 might_fault();
20356+
20357+ if (size > INT_MAX)
20358+ return size;
20359+
20360+#ifdef CONFIG_PAX_MEMORY_UDEREF
20361+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20362+ return size;
20363+#endif
20364+
20365 return __copy_user_nocache(dst, src, size, 1);
20366 }
20367
20368-static inline int
20369+static inline unsigned long
20370 __copy_from_user_inatomic_nocache(void *dst, const void __user *src,
20371- unsigned size)
20372+ unsigned long size)
20373 {
20374+ if (size > INT_MAX)
20375+ return size;
20376+
20377+#ifdef CONFIG_PAX_MEMORY_UDEREF
20378+ if (!access_ok_noprefault(VERIFY_READ, src, size))
20379+ return size;
20380+#endif
20381+
20382 return __copy_user_nocache(dst, src, size, 0);
20383 }
20384
20385 unsigned long
20386-copy_user_handle_tail(char *to, char *from, unsigned len);
20387+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len) __size_overflow(3);
20388
20389 #endif /* _ASM_X86_UACCESS_64_H */
20390diff --git a/arch/x86/include/asm/word-at-a-time.h b/arch/x86/include/asm/word-at-a-time.h
20391index 5b238981..77fdd78 100644
20392--- a/arch/x86/include/asm/word-at-a-time.h
20393+++ b/arch/x86/include/asm/word-at-a-time.h
20394@@ -11,7 +11,7 @@
20395 * and shift, for example.
20396 */
20397 struct word_at_a_time {
20398- const unsigned long one_bits, high_bits;
20399+ unsigned long one_bits, high_bits;
20400 };
20401
20402 #define WORD_AT_A_TIME_CONSTANTS { REPEAT_BYTE(0x01), REPEAT_BYTE(0x80) }
20403diff --git a/arch/x86/include/asm/x86_init.h b/arch/x86/include/asm/x86_init.h
20404index f58a9c7..dc378042a 100644
20405--- a/arch/x86/include/asm/x86_init.h
20406+++ b/arch/x86/include/asm/x86_init.h
20407@@ -129,7 +129,7 @@ struct x86_init_ops {
20408 struct x86_init_timers timers;
20409 struct x86_init_iommu iommu;
20410 struct x86_init_pci pci;
20411-};
20412+} __no_const;
20413
20414 /**
20415 * struct x86_cpuinit_ops - platform specific cpu hotplug setups
20416@@ -140,7 +140,7 @@ struct x86_cpuinit_ops {
20417 void (*setup_percpu_clockev)(void);
20418 void (*early_percpu_clock_init)(void);
20419 void (*fixup_cpu_id)(struct cpuinfo_x86 *c, int node);
20420-};
20421+} __no_const;
20422
20423 struct timespec;
20424
20425@@ -168,7 +168,7 @@ struct x86_platform_ops {
20426 void (*save_sched_clock_state)(void);
20427 void (*restore_sched_clock_state)(void);
20428 void (*apic_post_init)(void);
20429-};
20430+} __no_const;
20431
20432 struct pci_dev;
20433 struct msi_msg;
20434@@ -182,7 +182,7 @@ struct x86_msi_ops {
20435 void (*teardown_msi_irqs)(struct pci_dev *dev);
20436 void (*restore_msi_irqs)(struct pci_dev *dev);
20437 int (*setup_hpet_msi)(unsigned int irq, unsigned int id);
20438-};
20439+} __no_const;
20440
20441 struct IO_APIC_route_entry;
20442 struct io_apic_irq_attr;
20443@@ -203,7 +203,7 @@ struct x86_io_apic_ops {
20444 unsigned int destination, int vector,
20445 struct io_apic_irq_attr *attr);
20446 void (*eoi_ioapic_pin)(int apic, int pin, int vector);
20447-};
20448+} __no_const;
20449
20450 extern struct x86_init_ops x86_init;
20451 extern struct x86_cpuinit_ops x86_cpuinit;
20452diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
20453index 358dcd3..23c0bf1 100644
20454--- a/arch/x86/include/asm/xen/page.h
20455+++ b/arch/x86/include/asm/xen/page.h
20456@@ -82,7 +82,7 @@ static inline int xen_safe_read_ulong(unsigned long *addr, unsigned long *val)
20457 * - get_phys_to_machine() is to be called by __pfn_to_mfn() only in special
20458 * cases needing an extended handling.
20459 */
20460-static inline unsigned long __pfn_to_mfn(unsigned long pfn)
20461+static inline unsigned long __intentional_overflow(-1) __pfn_to_mfn(unsigned long pfn)
20462 {
20463 unsigned long mfn;
20464
20465diff --git a/arch/x86/include/asm/xsave.h b/arch/x86/include/asm/xsave.h
20466index c9a6d68..cb57f42 100644
20467--- a/arch/x86/include/asm/xsave.h
20468+++ b/arch/x86/include/asm/xsave.h
20469@@ -223,12 +223,16 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20470 if (unlikely(err))
20471 return -EFAULT;
20472
20473+ pax_open_userland();
20474 __asm__ __volatile__(ASM_STAC "\n"
20475- "1:"XSAVE"\n"
20476+ "1:"
20477+ __copyuser_seg
20478+ XSAVE"\n"
20479 "2: " ASM_CLAC "\n"
20480 xstate_fault
20481 : "D" (buf), "a" (-1), "d" (-1), "0" (0)
20482 : "memory");
20483+ pax_close_userland();
20484 return err;
20485 }
20486
20487@@ -238,16 +242,20 @@ static inline int xsave_user(struct xsave_struct __user *buf)
20488 static inline int xrestore_user(struct xsave_struct __user *buf, u64 mask)
20489 {
20490 int err = 0;
20491- struct xsave_struct *xstate = ((__force struct xsave_struct *)buf);
20492+ struct xsave_struct *xstate = ((__force_kernel struct xsave_struct *)buf);
20493 u32 lmask = mask;
20494 u32 hmask = mask >> 32;
20495
20496+ pax_open_userland();
20497 __asm__ __volatile__(ASM_STAC "\n"
20498- "1:"XRSTOR"\n"
20499+ "1:"
20500+ __copyuser_seg
20501+ XRSTOR"\n"
20502 "2: " ASM_CLAC "\n"
20503 xstate_fault
20504 : "D" (xstate), "a" (lmask), "d" (hmask), "0" (0)
20505 : "memory"); /* memory required? */
20506+ pax_close_userland();
20507 return err;
20508 }
20509
20510diff --git a/arch/x86/include/uapi/asm/e820.h b/arch/x86/include/uapi/asm/e820.h
20511index d993e33..8db1b18 100644
20512--- a/arch/x86/include/uapi/asm/e820.h
20513+++ b/arch/x86/include/uapi/asm/e820.h
20514@@ -58,7 +58,7 @@ struct e820map {
20515 #define ISA_START_ADDRESS 0xa0000
20516 #define ISA_END_ADDRESS 0x100000
20517
20518-#define BIOS_BEGIN 0x000a0000
20519+#define BIOS_BEGIN 0x000c0000
20520 #define BIOS_END 0x00100000
20521
20522 #define BIOS_ROM_BASE 0xffe00000
20523diff --git a/arch/x86/include/uapi/asm/ptrace-abi.h b/arch/x86/include/uapi/asm/ptrace-abi.h
20524index 7b0a55a..ad115bf 100644
20525--- a/arch/x86/include/uapi/asm/ptrace-abi.h
20526+++ b/arch/x86/include/uapi/asm/ptrace-abi.h
20527@@ -49,7 +49,6 @@
20528 #define EFLAGS 144
20529 #define RSP 152
20530 #define SS 160
20531-#define ARGOFFSET R11
20532 #endif /* __ASSEMBLY__ */
20533
20534 /* top of stack page */
20535diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
20536index cdb1b70..426434c 100644
20537--- a/arch/x86/kernel/Makefile
20538+++ b/arch/x86/kernel/Makefile
20539@@ -28,7 +28,7 @@ obj-y += time.o ioport.o ldt.o dumpstack.o nmi.o
20540 obj-y += setup.o x86_init.o i8259.o irqinit.o jump_label.o
20541 obj-$(CONFIG_IRQ_WORK) += irq_work.o
20542 obj-y += probe_roms.o
20543-obj-$(CONFIG_X86_32) += i386_ksyms_32.o
20544+obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o
20545 obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o
20546 obj-$(CONFIG_X86_64) += mcount_64.o
20547 obj-y += syscall_$(BITS).o vsyscall_gtod.o
20548diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
20549index 803b684..68c64f1 100644
20550--- a/arch/x86/kernel/acpi/boot.c
20551+++ b/arch/x86/kernel/acpi/boot.c
20552@@ -1361,7 +1361,7 @@ static void __init acpi_reduced_hw_init(void)
20553 * If your system is blacklisted here, but you find that acpi=force
20554 * works for you, please contact linux-acpi@vger.kernel.org
20555 */
20556-static struct dmi_system_id __initdata acpi_dmi_table[] = {
20557+static const struct dmi_system_id __initconst acpi_dmi_table[] = {
20558 /*
20559 * Boxes that need ACPI disabled
20560 */
20561@@ -1436,7 +1436,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
20562 };
20563
20564 /* second table for DMI checks that should run after early-quirks */
20565-static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
20566+static const struct dmi_system_id __initconst acpi_dmi_table_late[] = {
20567 /*
20568 * HP laptops which use a DSDT reporting as HP/SB400/10000,
20569 * which includes some code which overrides all temperature
20570diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
20571index d1daead..acd77e2 100644
20572--- a/arch/x86/kernel/acpi/sleep.c
20573+++ b/arch/x86/kernel/acpi/sleep.c
20574@@ -99,8 +99,12 @@ int x86_acpi_suspend_lowlevel(void)
20575 #else /* CONFIG_64BIT */
20576 #ifdef CONFIG_SMP
20577 stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
20578+
20579+ pax_open_kernel();
20580 early_gdt_descr.address =
20581 (unsigned long)get_cpu_gdt_table(smp_processor_id());
20582+ pax_close_kernel();
20583+
20584 initial_gs = per_cpu_offset(smp_processor_id());
20585 #endif
20586 initial_code = (unsigned long)wakeup_long64;
20587diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S
20588index 665c6b7..eae4d56 100644
20589--- a/arch/x86/kernel/acpi/wakeup_32.S
20590+++ b/arch/x86/kernel/acpi/wakeup_32.S
20591@@ -29,13 +29,11 @@ wakeup_pmode_return:
20592 # and restore the stack ... but you need gdt for this to work
20593 movl saved_context_esp, %esp
20594
20595- movl %cs:saved_magic, %eax
20596- cmpl $0x12345678, %eax
20597+ cmpl $0x12345678, saved_magic
20598 jne bogus_magic
20599
20600 # jump to place where we left off
20601- movl saved_eip, %eax
20602- jmp *%eax
20603+ jmp *(saved_eip)
20604
20605 bogus_magic:
20606 jmp bogus_magic
20607diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
20608index 703130f..27a155d 100644
20609--- a/arch/x86/kernel/alternative.c
20610+++ b/arch/x86/kernel/alternative.c
20611@@ -268,6 +268,13 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20612 */
20613 for (a = start; a < end; a++) {
20614 instr = (u8 *)&a->instr_offset + a->instr_offset;
20615+
20616+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20617+ instr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20618+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20619+ instr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20620+#endif
20621+
20622 replacement = (u8 *)&a->repl_offset + a->repl_offset;
20623 BUG_ON(a->replacementlen > a->instrlen);
20624 BUG_ON(a->instrlen > sizeof(insnbuf));
20625@@ -284,6 +291,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start,
20626 add_nops(insnbuf + a->replacementlen,
20627 a->instrlen - a->replacementlen);
20628
20629+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20630+ if (instr < (u8 *)_text || (u8 *)_einittext <= instr)
20631+ instr = ktva_ktla(instr);
20632+#endif
20633+
20634 text_poke_early(instr, insnbuf, a->instrlen);
20635 }
20636 }
20637@@ -299,10 +311,16 @@ static void alternatives_smp_lock(const s32 *start, const s32 *end,
20638 for (poff = start; poff < end; poff++) {
20639 u8 *ptr = (u8 *)poff + *poff;
20640
20641+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20642+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20643+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20644+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20645+#endif
20646+
20647 if (!*poff || ptr < text || ptr >= text_end)
20648 continue;
20649 /* turn DS segment override prefix into lock prefix */
20650- if (*ptr == 0x3e)
20651+ if (*ktla_ktva(ptr) == 0x3e)
20652 text_poke(ptr, ((unsigned char []){0xf0}), 1);
20653 }
20654 mutex_unlock(&text_mutex);
20655@@ -317,10 +335,16 @@ static void alternatives_smp_unlock(const s32 *start, const s32 *end,
20656 for (poff = start; poff < end; poff++) {
20657 u8 *ptr = (u8 *)poff + *poff;
20658
20659+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
20660+ ptr += ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20661+ if (ptr < (u8 *)_text || (u8 *)_einittext <= ptr)
20662+ ptr -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
20663+#endif
20664+
20665 if (!*poff || ptr < text || ptr >= text_end)
20666 continue;
20667 /* turn lock prefix into DS segment override prefix */
20668- if (*ptr == 0xf0)
20669+ if (*ktla_ktva(ptr) == 0xf0)
20670 text_poke(ptr, ((unsigned char []){0x3E}), 1);
20671 }
20672 mutex_unlock(&text_mutex);
20673@@ -457,7 +481,7 @@ void __init_or_module apply_paravirt(struct paravirt_patch_site *start,
20674
20675 BUG_ON(p->len > MAX_PATCH_LEN);
20676 /* prep the buffer with the original instructions */
20677- memcpy(insnbuf, p->instr, p->len);
20678+ memcpy(insnbuf, ktla_ktva(p->instr), p->len);
20679 used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf,
20680 (unsigned long)p->instr, p->len);
20681
20682@@ -504,7 +528,7 @@ void __init alternative_instructions(void)
20683 if (!uniproc_patched || num_possible_cpus() == 1)
20684 free_init_pages("SMP alternatives",
20685 (unsigned long)__smp_locks,
20686- (unsigned long)__smp_locks_end);
20687+ PAGE_ALIGN((unsigned long)__smp_locks_end));
20688 #endif
20689
20690 apply_paravirt(__parainstructions, __parainstructions_end);
20691@@ -524,13 +548,17 @@ void __init alternative_instructions(void)
20692 * instructions. And on the local CPU you need to be protected again NMI or MCE
20693 * handlers seeing an inconsistent instruction while you patch.
20694 */
20695-void *__init_or_module text_poke_early(void *addr, const void *opcode,
20696+void *__kprobes text_poke_early(void *addr, const void *opcode,
20697 size_t len)
20698 {
20699 unsigned long flags;
20700 local_irq_save(flags);
20701- memcpy(addr, opcode, len);
20702+
20703+ pax_open_kernel();
20704+ memcpy(ktla_ktva(addr), opcode, len);
20705 sync_core();
20706+ pax_close_kernel();
20707+
20708 local_irq_restore(flags);
20709 /* Could also do a CLFLUSH here to speed up CPU recovery; but
20710 that causes hangs on some VIA CPUs. */
20711@@ -552,36 +580,22 @@ void *__init_or_module text_poke_early(void *addr, const void *opcode,
20712 */
20713 void *text_poke(void *addr, const void *opcode, size_t len)
20714 {
20715- unsigned long flags;
20716- char *vaddr;
20717+ unsigned char *vaddr = ktla_ktva(addr);
20718 struct page *pages[2];
20719- int i;
20720+ size_t i;
20721
20722 if (!core_kernel_text((unsigned long)addr)) {
20723- pages[0] = vmalloc_to_page(addr);
20724- pages[1] = vmalloc_to_page(addr + PAGE_SIZE);
20725+ pages[0] = vmalloc_to_page(vaddr);
20726+ pages[1] = vmalloc_to_page(vaddr + PAGE_SIZE);
20727 } else {
20728- pages[0] = virt_to_page(addr);
20729+ pages[0] = virt_to_page(vaddr);
20730 WARN_ON(!PageReserved(pages[0]));
20731- pages[1] = virt_to_page(addr + PAGE_SIZE);
20732+ pages[1] = virt_to_page(vaddr + PAGE_SIZE);
20733 }
20734 BUG_ON(!pages[0]);
20735- local_irq_save(flags);
20736- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0]));
20737- if (pages[1])
20738- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1]));
20739- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0);
20740- memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len);
20741- clear_fixmap(FIX_TEXT_POKE0);
20742- if (pages[1])
20743- clear_fixmap(FIX_TEXT_POKE1);
20744- local_flush_tlb();
20745- sync_core();
20746- /* Could also do a CLFLUSH here to speed up CPU recovery; but
20747- that causes hangs on some VIA CPUs. */
20748+ text_poke_early(addr, opcode, len);
20749 for (i = 0; i < len; i++)
20750- BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]);
20751- local_irq_restore(flags);
20752+ BUG_ON((vaddr)[i] != ((const unsigned char *)opcode)[i]);
20753 return addr;
20754 }
20755
20756@@ -601,7 +615,7 @@ int poke_int3_handler(struct pt_regs *regs)
20757 if (likely(!bp_patching_in_progress))
20758 return 0;
20759
20760- if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
20761+ if (user_mode(regs) || regs->ip != (unsigned long)bp_int3_addr)
20762 return 0;
20763
20764 /* set up the specified breakpoint handler */
20765@@ -635,7 +649,7 @@ int poke_int3_handler(struct pt_regs *regs)
20766 */
20767 void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
20768 {
20769- unsigned char int3 = 0xcc;
20770+ const unsigned char int3 = 0xcc;
20771
20772 bp_int3_handler = handler;
20773 bp_int3_addr = (u8 *)addr + sizeof(int3);
20774diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
20775index ad3639a..bd4253c 100644
20776--- a/arch/x86/kernel/apic/apic.c
20777+++ b/arch/x86/kernel/apic/apic.c
20778@@ -171,7 +171,7 @@ int first_system_vector = FIRST_SYSTEM_VECTOR;
20779 /*
20780 * Debug level, exported for io_apic.c
20781 */
20782-unsigned int apic_verbosity;
20783+int apic_verbosity;
20784
20785 int pic_mode;
20786
20787@@ -1918,7 +1918,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
20788 apic_write(APIC_ESR, 0);
20789 v = apic_read(APIC_ESR);
20790 ack_APIC_irq();
20791- atomic_inc(&irq_err_count);
20792+ atomic_inc_unchecked(&irq_err_count);
20793
20794 apic_printk(APIC_DEBUG, KERN_DEBUG "APIC error on CPU%d: %02x",
20795 smp_processor_id(), v);
20796diff --git a/arch/x86/kernel/apic/apic_flat_64.c b/arch/x86/kernel/apic/apic_flat_64.c
20797index de918c4..32eed23 100644
20798--- a/arch/x86/kernel/apic/apic_flat_64.c
20799+++ b/arch/x86/kernel/apic/apic_flat_64.c
20800@@ -154,7 +154,7 @@ static int flat_probe(void)
20801 return 1;
20802 }
20803
20804-static struct apic apic_flat = {
20805+static struct apic apic_flat __read_only = {
20806 .name = "flat",
20807 .probe = flat_probe,
20808 .acpi_madt_oem_check = flat_acpi_madt_oem_check,
20809@@ -260,7 +260,7 @@ static int physflat_probe(void)
20810 return 0;
20811 }
20812
20813-static struct apic apic_physflat = {
20814+static struct apic apic_physflat __read_only = {
20815
20816 .name = "physical flat",
20817 .probe = physflat_probe,
20818diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
20819index b205cdb..d8503ff 100644
20820--- a/arch/x86/kernel/apic/apic_noop.c
20821+++ b/arch/x86/kernel/apic/apic_noop.c
20822@@ -108,7 +108,7 @@ static void noop_apic_write(u32 reg, u32 v)
20823 WARN_ON_ONCE(cpu_has_apic && !disable_apic);
20824 }
20825
20826-struct apic apic_noop = {
20827+struct apic apic_noop __read_only = {
20828 .name = "noop",
20829 .probe = noop_probe,
20830 .acpi_madt_oem_check = NULL,
20831diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
20832index c4a8d63..fe893ac 100644
20833--- a/arch/x86/kernel/apic/bigsmp_32.c
20834+++ b/arch/x86/kernel/apic/bigsmp_32.c
20835@@ -147,7 +147,7 @@ static int probe_bigsmp(void)
20836 return dmi_bigsmp;
20837 }
20838
20839-static struct apic apic_bigsmp = {
20840+static struct apic apic_bigsmp __read_only = {
20841
20842 .name = "bigsmp",
20843 .probe = probe_bigsmp,
20844diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
20845index f4dc246..fbab133 100644
20846--- a/arch/x86/kernel/apic/io_apic.c
20847+++ b/arch/x86/kernel/apic/io_apic.c
20848@@ -1862,7 +1862,7 @@ int native_ioapic_set_affinity(struct irq_data *data,
20849 return ret;
20850 }
20851
20852-atomic_t irq_mis_count;
20853+atomic_unchecked_t irq_mis_count;
20854
20855 #ifdef CONFIG_GENERIC_PENDING_IRQ
20856 static bool io_apic_level_ack_pending(struct irq_cfg *cfg)
20857@@ -2003,7 +2003,7 @@ static void ack_ioapic_level(struct irq_data *data)
20858 * at the cpu.
20859 */
20860 if (!(v & (1 << (i & 0x1f)))) {
20861- atomic_inc(&irq_mis_count);
20862+ atomic_inc_unchecked(&irq_mis_count);
20863
20864 eoi_ioapic_irq(irq, cfg);
20865 }
20866@@ -2011,7 +2011,7 @@ static void ack_ioapic_level(struct irq_data *data)
20867 ioapic_irqd_unmask(data, cfg, masked);
20868 }
20869
20870-static struct irq_chip ioapic_chip __read_mostly = {
20871+static struct irq_chip ioapic_chip = {
20872 .name = "IO-APIC",
20873 .irq_startup = startup_ioapic_irq,
20874 .irq_mask = mask_ioapic_irq,
20875@@ -2070,7 +2070,7 @@ static void ack_lapic_irq(struct irq_data *data)
20876 ack_APIC_irq();
20877 }
20878
20879-static struct irq_chip lapic_chip __read_mostly = {
20880+static struct irq_chip lapic_chip = {
20881 .name = "local-APIC",
20882 .irq_mask = mask_lapic_irq,
20883 .irq_unmask = unmask_lapic_irq,
20884diff --git a/arch/x86/kernel/apic/probe_32.c b/arch/x86/kernel/apic/probe_32.c
20885index bda4886..f9c7195 100644
20886--- a/arch/x86/kernel/apic/probe_32.c
20887+++ b/arch/x86/kernel/apic/probe_32.c
20888@@ -72,7 +72,7 @@ static int probe_default(void)
20889 return 1;
20890 }
20891
20892-static struct apic apic_default = {
20893+static struct apic apic_default __read_only = {
20894
20895 .name = "default",
20896 .probe = probe_default,
20897diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
20898index 6cedd79..023ff8e 100644
20899--- a/arch/x86/kernel/apic/vector.c
20900+++ b/arch/x86/kernel/apic/vector.c
20901@@ -21,7 +21,7 @@
20902
20903 static DEFINE_RAW_SPINLOCK(vector_lock);
20904
20905-void lock_vector_lock(void)
20906+void lock_vector_lock(void) __acquires(vector_lock)
20907 {
20908 /* Used to the online set of cpus does not change
20909 * during assign_irq_vector.
20910@@ -29,7 +29,7 @@ void lock_vector_lock(void)
20911 raw_spin_lock(&vector_lock);
20912 }
20913
20914-void unlock_vector_lock(void)
20915+void unlock_vector_lock(void) __releases(vector_lock)
20916 {
20917 raw_spin_unlock(&vector_lock);
20918 }
20919diff --git a/arch/x86/kernel/apic/x2apic_cluster.c b/arch/x86/kernel/apic/x2apic_cluster.c
20920index e658f21..b695a1a 100644
20921--- a/arch/x86/kernel/apic/x2apic_cluster.c
20922+++ b/arch/x86/kernel/apic/x2apic_cluster.c
20923@@ -182,7 +182,7 @@ update_clusterinfo(struct notifier_block *nfb, unsigned long action, void *hcpu)
20924 return notifier_from_errno(err);
20925 }
20926
20927-static struct notifier_block __refdata x2apic_cpu_notifier = {
20928+static struct notifier_block x2apic_cpu_notifier = {
20929 .notifier_call = update_clusterinfo,
20930 };
20931
20932@@ -234,7 +234,7 @@ static void cluster_vector_allocation_domain(int cpu, struct cpumask *retmask,
20933 cpumask_and(retmask, mask, per_cpu(cpus_in_cluster, cpu));
20934 }
20935
20936-static struct apic apic_x2apic_cluster = {
20937+static struct apic apic_x2apic_cluster __read_only = {
20938
20939 .name = "cluster x2apic",
20940 .probe = x2apic_cluster_probe,
20941diff --git a/arch/x86/kernel/apic/x2apic_phys.c b/arch/x86/kernel/apic/x2apic_phys.c
20942index 6fae733..5ca17af 100644
20943--- a/arch/x86/kernel/apic/x2apic_phys.c
20944+++ b/arch/x86/kernel/apic/x2apic_phys.c
20945@@ -88,7 +88,7 @@ static int x2apic_phys_probe(void)
20946 return apic == &apic_x2apic_phys;
20947 }
20948
20949-static struct apic apic_x2apic_phys = {
20950+static struct apic apic_x2apic_phys __read_only = {
20951
20952 .name = "physical x2apic",
20953 .probe = x2apic_phys_probe,
20954diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
20955index 8e9dcfd..c61b3e4 100644
20956--- a/arch/x86/kernel/apic/x2apic_uv_x.c
20957+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
20958@@ -348,7 +348,7 @@ static int uv_probe(void)
20959 return apic == &apic_x2apic_uv_x;
20960 }
20961
20962-static struct apic __refdata apic_x2apic_uv_x = {
20963+static struct apic apic_x2apic_uv_x __read_only = {
20964
20965 .name = "UV large system",
20966 .probe = uv_probe,
20967diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
20968index 927ec92..de68f32 100644
20969--- a/arch/x86/kernel/apm_32.c
20970+++ b/arch/x86/kernel/apm_32.c
20971@@ -432,7 +432,7 @@ static DEFINE_MUTEX(apm_mutex);
20972 * This is for buggy BIOS's that refer to (real mode) segment 0x40
20973 * even though they are called in protected mode.
20974 */
20975-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
20976+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
20977 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
20978
20979 static const char driver_version[] = "1.16ac"; /* no spaces */
20980@@ -610,7 +610,10 @@ static long __apm_bios_call(void *_call)
20981 BUG_ON(cpu != 0);
20982 gdt = get_cpu_gdt_table(cpu);
20983 save_desc_40 = gdt[0x40 / 8];
20984+
20985+ pax_open_kernel();
20986 gdt[0x40 / 8] = bad_bios_desc;
20987+ pax_close_kernel();
20988
20989 apm_irq_save(flags);
20990 APM_DO_SAVE_SEGS;
20991@@ -619,7 +622,11 @@ static long __apm_bios_call(void *_call)
20992 &call->esi);
20993 APM_DO_RESTORE_SEGS;
20994 apm_irq_restore(flags);
20995+
20996+ pax_open_kernel();
20997 gdt[0x40 / 8] = save_desc_40;
20998+ pax_close_kernel();
20999+
21000 put_cpu();
21001
21002 return call->eax & 0xff;
21003@@ -686,7 +693,10 @@ static long __apm_bios_call_simple(void *_call)
21004 BUG_ON(cpu != 0);
21005 gdt = get_cpu_gdt_table(cpu);
21006 save_desc_40 = gdt[0x40 / 8];
21007+
21008+ pax_open_kernel();
21009 gdt[0x40 / 8] = bad_bios_desc;
21010+ pax_close_kernel();
21011
21012 apm_irq_save(flags);
21013 APM_DO_SAVE_SEGS;
21014@@ -694,7 +704,11 @@ static long __apm_bios_call_simple(void *_call)
21015 &call->eax);
21016 APM_DO_RESTORE_SEGS;
21017 apm_irq_restore(flags);
21018+
21019+ pax_open_kernel();
21020 gdt[0x40 / 8] = save_desc_40;
21021+ pax_close_kernel();
21022+
21023 put_cpu();
21024 return error;
21025 }
21026@@ -2039,7 +2053,7 @@ static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d)
21027 return 0;
21028 }
21029
21030-static struct dmi_system_id __initdata apm_dmi_table[] = {
21031+static const struct dmi_system_id __initconst apm_dmi_table[] = {
21032 {
21033 print_if_true,
21034 KERN_WARNING "IBM T23 - BIOS 1.03b+ and controller firmware 1.02+ may be needed for Linux APM.",
21035@@ -2349,12 +2363,15 @@ static int __init apm_init(void)
21036 * code to that CPU.
21037 */
21038 gdt = get_cpu_gdt_table(0);
21039+
21040+ pax_open_kernel();
21041 set_desc_base(&gdt[APM_CS >> 3],
21042 (unsigned long)__va((unsigned long)apm_info.bios.cseg << 4));
21043 set_desc_base(&gdt[APM_CS_16 >> 3],
21044 (unsigned long)__va((unsigned long)apm_info.bios.cseg_16 << 4));
21045 set_desc_base(&gdt[APM_DS >> 3],
21046 (unsigned long)__va((unsigned long)apm_info.bios.dseg << 4));
21047+ pax_close_kernel();
21048
21049 proc_create("apm", 0, NULL, &apm_file_ops);
21050
21051diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
21052index 9f6b934..cf5ffb3 100644
21053--- a/arch/x86/kernel/asm-offsets.c
21054+++ b/arch/x86/kernel/asm-offsets.c
21055@@ -32,6 +32,8 @@ void common(void) {
21056 OFFSET(TI_flags, thread_info, flags);
21057 OFFSET(TI_status, thread_info, status);
21058 OFFSET(TI_addr_limit, thread_info, addr_limit);
21059+ OFFSET(TI_lowest_stack, thread_info, lowest_stack);
21060+ DEFINE(TI_task_thread_sp0, offsetof(struct task_struct, thread.sp0) - offsetof(struct task_struct, tinfo));
21061
21062 BLANK();
21063 OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx);
21064@@ -52,8 +54,26 @@ void common(void) {
21065 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
21066 OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);
21067 OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);
21068+
21069+#ifdef CONFIG_PAX_KERNEXEC
21070+ OFFSET(PV_CPU_write_cr0, pv_cpu_ops, write_cr0);
21071 #endif
21072
21073+#ifdef CONFIG_PAX_MEMORY_UDEREF
21074+ OFFSET(PV_MMU_read_cr3, pv_mmu_ops, read_cr3);
21075+ OFFSET(PV_MMU_write_cr3, pv_mmu_ops, write_cr3);
21076+#ifdef CONFIG_X86_64
21077+ OFFSET(PV_MMU_set_pgd_batched, pv_mmu_ops, set_pgd_batched);
21078+#endif
21079+#endif
21080+
21081+#endif
21082+
21083+ BLANK();
21084+ DEFINE(PAGE_SIZE_asm, PAGE_SIZE);
21085+ DEFINE(PAGE_SHIFT_asm, PAGE_SHIFT);
21086+ DEFINE(THREAD_SIZE_asm, THREAD_SIZE);
21087+
21088 #ifdef CONFIG_XEN
21089 BLANK();
21090 OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
21091diff --git a/arch/x86/kernel/asm-offsets_64.c b/arch/x86/kernel/asm-offsets_64.c
21092index fdcbb4d..036dd93 100644
21093--- a/arch/x86/kernel/asm-offsets_64.c
21094+++ b/arch/x86/kernel/asm-offsets_64.c
21095@@ -80,6 +80,7 @@ int main(void)
21096 BLANK();
21097 #undef ENTRY
21098
21099+ DEFINE(TSS_size, sizeof(struct tss_struct));
21100 OFFSET(TSS_ist, tss_struct, x86_tss.ist);
21101 BLANK();
21102
21103diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
21104index 80091ae..0c5184f 100644
21105--- a/arch/x86/kernel/cpu/Makefile
21106+++ b/arch/x86/kernel/cpu/Makefile
21107@@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
21108 CFLAGS_REMOVE_perf_event.o = -pg
21109 endif
21110
21111-# Make sure load_percpu_segment has no stackprotector
21112-nostackp := $(call cc-option, -fno-stack-protector)
21113-CFLAGS_common.o := $(nostackp)
21114-
21115 obj-y := intel_cacheinfo.o scattered.o topology.o
21116 obj-y += common.o
21117 obj-y += rdrand.o
21118diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
21119index a220239..607fc38 100644
21120--- a/arch/x86/kernel/cpu/amd.c
21121+++ b/arch/x86/kernel/cpu/amd.c
21122@@ -717,7 +717,7 @@ static void init_amd(struct cpuinfo_x86 *c)
21123 static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
21124 {
21125 /* AMD errata T13 (order #21922) */
21126- if ((c->x86 == 6)) {
21127+ if (c->x86 == 6) {
21128 /* Duron Rev A0 */
21129 if (c->x86_model == 3 && c->x86_mask == 0)
21130 size = 64;
21131diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
21132index 2346c95..c061472 100644
21133--- a/arch/x86/kernel/cpu/common.c
21134+++ b/arch/x86/kernel/cpu/common.c
21135@@ -91,60 +91,6 @@ static const struct cpu_dev default_cpu = {
21136
21137 static const struct cpu_dev *this_cpu = &default_cpu;
21138
21139-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = {
21140-#ifdef CONFIG_X86_64
21141- /*
21142- * We need valid kernel segments for data and code in long mode too
21143- * IRET will check the segment types kkeil 2000/10/28
21144- * Also sysret mandates a special GDT layout
21145- *
21146- * TLS descriptors are currently at a different place compared to i386.
21147- * Hopefully nobody expects them at a fixed place (Wine?)
21148- */
21149- [GDT_ENTRY_KERNEL32_CS] = GDT_ENTRY_INIT(0xc09b, 0, 0xfffff),
21150- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xa09b, 0, 0xfffff),
21151- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc093, 0, 0xfffff),
21152- [GDT_ENTRY_DEFAULT_USER32_CS] = GDT_ENTRY_INIT(0xc0fb, 0, 0xfffff),
21153- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f3, 0, 0xfffff),
21154- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xa0fb, 0, 0xfffff),
21155-#else
21156- [GDT_ENTRY_KERNEL_CS] = GDT_ENTRY_INIT(0xc09a, 0, 0xfffff),
21157- [GDT_ENTRY_KERNEL_DS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21158- [GDT_ENTRY_DEFAULT_USER_CS] = GDT_ENTRY_INIT(0xc0fa, 0, 0xfffff),
21159- [GDT_ENTRY_DEFAULT_USER_DS] = GDT_ENTRY_INIT(0xc0f2, 0, 0xfffff),
21160- /*
21161- * Segments used for calling PnP BIOS have byte granularity.
21162- * They code segments and data segments have fixed 64k limits,
21163- * the transfer segment sizes are set at run time.
21164- */
21165- /* 32-bit code */
21166- [GDT_ENTRY_PNPBIOS_CS32] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21167- /* 16-bit code */
21168- [GDT_ENTRY_PNPBIOS_CS16] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21169- /* 16-bit data */
21170- [GDT_ENTRY_PNPBIOS_DS] = GDT_ENTRY_INIT(0x0092, 0, 0xffff),
21171- /* 16-bit data */
21172- [GDT_ENTRY_PNPBIOS_TS1] = GDT_ENTRY_INIT(0x0092, 0, 0),
21173- /* 16-bit data */
21174- [GDT_ENTRY_PNPBIOS_TS2] = GDT_ENTRY_INIT(0x0092, 0, 0),
21175- /*
21176- * The APM segments have byte granularity and their bases
21177- * are set at run time. All have 64k limits.
21178- */
21179- /* 32-bit code */
21180- [GDT_ENTRY_APMBIOS_BASE] = GDT_ENTRY_INIT(0x409a, 0, 0xffff),
21181- /* 16-bit code */
21182- [GDT_ENTRY_APMBIOS_BASE+1] = GDT_ENTRY_INIT(0x009a, 0, 0xffff),
21183- /* data */
21184- [GDT_ENTRY_APMBIOS_BASE+2] = GDT_ENTRY_INIT(0x4092, 0, 0xffff),
21185-
21186- [GDT_ENTRY_ESPFIX_SS] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21187- [GDT_ENTRY_PERCPU] = GDT_ENTRY_INIT(0xc092, 0, 0xfffff),
21188- GDT_STACK_CANARY_INIT
21189-#endif
21190-} };
21191-EXPORT_PER_CPU_SYMBOL_GPL(gdt_page);
21192-
21193 static int __init x86_xsave_setup(char *s)
21194 {
21195 if (strlen(s))
21196@@ -306,6 +252,59 @@ static __always_inline void setup_smap(struct cpuinfo_x86 *c)
21197 }
21198 }
21199
21200+#ifdef CONFIG_X86_64
21201+static __init int setup_disable_pcid(char *arg)
21202+{
21203+ setup_clear_cpu_cap(X86_FEATURE_PCID);
21204+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
21205+
21206+#ifdef CONFIG_PAX_MEMORY_UDEREF
21207+ if (clone_pgd_mask != ~(pgdval_t)0UL)
21208+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21209+#endif
21210+
21211+ return 1;
21212+}
21213+__setup("nopcid", setup_disable_pcid);
21214+
21215+static void setup_pcid(struct cpuinfo_x86 *c)
21216+{
21217+ if (!cpu_has(c, X86_FEATURE_PCID)) {
21218+ clear_cpu_cap(c, X86_FEATURE_INVPCID);
21219+
21220+#ifdef CONFIG_PAX_MEMORY_UDEREF
21221+ if (clone_pgd_mask != ~(pgdval_t)0UL) {
21222+ pax_open_kernel();
21223+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
21224+ pax_close_kernel();
21225+ printk("PAX: slow and weak UDEREF enabled\n");
21226+ } else
21227+ printk("PAX: UDEREF disabled\n");
21228+#endif
21229+
21230+ return;
21231+ }
21232+
21233+ printk("PAX: PCID detected\n");
21234+ cr4_set_bits(X86_CR4_PCIDE);
21235+
21236+#ifdef CONFIG_PAX_MEMORY_UDEREF
21237+ pax_open_kernel();
21238+ clone_pgd_mask = ~(pgdval_t)0UL;
21239+ pax_close_kernel();
21240+ if (pax_user_shadow_base)
21241+ printk("PAX: weak UDEREF enabled\n");
21242+ else {
21243+ set_cpu_cap(c, X86_FEATURE_STRONGUDEREF);
21244+ printk("PAX: strong UDEREF enabled\n");
21245+ }
21246+#endif
21247+
21248+ if (cpu_has(c, X86_FEATURE_INVPCID))
21249+ printk("PAX: INVPCID detected\n");
21250+}
21251+#endif
21252+
21253 /*
21254 * Some CPU features depend on higher CPUID levels, which may not always
21255 * be available due to CPUID level capping or broken virtualization
21256@@ -406,7 +405,7 @@ void switch_to_new_gdt(int cpu)
21257 {
21258 struct desc_ptr gdt_descr;
21259
21260- gdt_descr.address = (long)get_cpu_gdt_table(cpu);
21261+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
21262 gdt_descr.size = GDT_SIZE - 1;
21263 load_gdt(&gdt_descr);
21264 /* Reload the per-cpu base */
21265@@ -897,6 +896,20 @@ static void identify_cpu(struct cpuinfo_x86 *c)
21266 setup_smep(c);
21267 setup_smap(c);
21268
21269+#ifdef CONFIG_X86_32
21270+#ifdef CONFIG_PAX_PAGEEXEC
21271+ if (!(__supported_pte_mask & _PAGE_NX))
21272+ clear_cpu_cap(c, X86_FEATURE_PSE);
21273+#endif
21274+#if defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
21275+ clear_cpu_cap(c, X86_FEATURE_SEP);
21276+#endif
21277+#endif
21278+
21279+#ifdef CONFIG_X86_64
21280+ setup_pcid(c);
21281+#endif
21282+
21283 /*
21284 * The vendor-specific functions might have changed features.
21285 * Now we do "generic changes."
21286@@ -979,7 +992,7 @@ static void syscall32_cpu_init(void)
21287 void enable_sep_cpu(void)
21288 {
21289 int cpu = get_cpu();
21290- struct tss_struct *tss = &per_cpu(init_tss, cpu);
21291+ struct tss_struct *tss = init_tss + cpu;
21292
21293 if (!boot_cpu_has(X86_FEATURE_SEP)) {
21294 put_cpu();
21295@@ -1117,14 +1130,16 @@ static __init int setup_disablecpuid(char *arg)
21296 }
21297 __setup("clearcpuid=", setup_disablecpuid);
21298
21299+DEFINE_PER_CPU(struct thread_info *, current_tinfo) = &init_task.tinfo;
21300+EXPORT_PER_CPU_SYMBOL(current_tinfo);
21301+
21302 DEFINE_PER_CPU(unsigned long, kernel_stack) =
21303- (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE;
21304+ (unsigned long)&init_thread_union - 16 + THREAD_SIZE;
21305 EXPORT_PER_CPU_SYMBOL(kernel_stack);
21306
21307 #ifdef CONFIG_X86_64
21308-struct desc_ptr idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21309-struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
21310- (unsigned long) debug_idt_table };
21311+struct desc_ptr idt_descr __read_only = { NR_VECTORS * 16 - 1, (unsigned long) idt_table };
21312+const struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1, (unsigned long) debug_idt_table };
21313
21314 DEFINE_PER_CPU_FIRST(union irq_stack_union,
21315 irq_stack_union) __aligned(PAGE_SIZE) __visible;
21316@@ -1307,7 +1322,7 @@ void cpu_init(void)
21317 */
21318 load_ucode_ap();
21319
21320- t = &per_cpu(init_tss, cpu);
21321+ t = init_tss + cpu;
21322 oist = &per_cpu(orig_ist, cpu);
21323
21324 #ifdef CONFIG_NUMA
21325@@ -1339,7 +1354,6 @@ void cpu_init(void)
21326 wrmsrl(MSR_KERNEL_GS_BASE, 0);
21327 barrier();
21328
21329- x86_configure_nx();
21330 x2apic_setup();
21331
21332 /*
21333@@ -1391,7 +1405,7 @@ void cpu_init(void)
21334 {
21335 int cpu = smp_processor_id();
21336 struct task_struct *curr = current;
21337- struct tss_struct *t = &per_cpu(init_tss, cpu);
21338+ struct tss_struct *t = init_tss + cpu;
21339 struct thread_struct *thread = &curr->thread;
21340
21341 wait_for_master_cpu(cpu);
21342diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
21343index 6596433..1ad6eaf 100644
21344--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
21345+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
21346@@ -1024,6 +1024,22 @@ static struct attribute *default_attrs[] = {
21347 };
21348
21349 #ifdef CONFIG_AMD_NB
21350+static struct attribute *default_attrs_amd_nb[] = {
21351+ &type.attr,
21352+ &level.attr,
21353+ &coherency_line_size.attr,
21354+ &physical_line_partition.attr,
21355+ &ways_of_associativity.attr,
21356+ &number_of_sets.attr,
21357+ &size.attr,
21358+ &shared_cpu_map.attr,
21359+ &shared_cpu_list.attr,
21360+ NULL,
21361+ NULL,
21362+ NULL,
21363+ NULL
21364+};
21365+
21366 static struct attribute **amd_l3_attrs(void)
21367 {
21368 static struct attribute **attrs;
21369@@ -1034,18 +1050,7 @@ static struct attribute **amd_l3_attrs(void)
21370
21371 n = ARRAY_SIZE(default_attrs);
21372
21373- if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE))
21374- n += 2;
21375-
21376- if (amd_nb_has_feature(AMD_NB_L3_PARTITIONING))
21377- n += 1;
21378-
21379- attrs = kzalloc(n * sizeof (struct attribute *), GFP_KERNEL);
21380- if (attrs == NULL)
21381- return attrs = default_attrs;
21382-
21383- for (n = 0; default_attrs[n]; n++)
21384- attrs[n] = default_attrs[n];
21385+ attrs = default_attrs_amd_nb;
21386
21387 if (amd_nb_has_feature(AMD_NB_L3_INDEX_DISABLE)) {
21388 attrs[n++] = &cache_disable_0.attr;
21389@@ -1096,6 +1101,13 @@ static struct kobj_type ktype_cache = {
21390 .default_attrs = default_attrs,
21391 };
21392
21393+#ifdef CONFIG_AMD_NB
21394+static struct kobj_type ktype_cache_amd_nb = {
21395+ .sysfs_ops = &sysfs_ops,
21396+ .default_attrs = default_attrs_amd_nb,
21397+};
21398+#endif
21399+
21400 static struct kobj_type ktype_percpu_entry = {
21401 .sysfs_ops = &sysfs_ops,
21402 };
21403@@ -1161,20 +1173,26 @@ static int cache_add_dev(struct device *dev)
21404 return retval;
21405 }
21406
21407+#ifdef CONFIG_AMD_NB
21408+ amd_l3_attrs();
21409+#endif
21410+
21411 for (i = 0; i < num_cache_leaves; i++) {
21412+ struct kobj_type *ktype;
21413+
21414 this_object = INDEX_KOBJECT_PTR(cpu, i);
21415 this_object->cpu = cpu;
21416 this_object->index = i;
21417
21418 this_leaf = CPUID4_INFO_IDX(cpu, i);
21419
21420- ktype_cache.default_attrs = default_attrs;
21421+ ktype = &ktype_cache;
21422 #ifdef CONFIG_AMD_NB
21423 if (this_leaf->base.nb)
21424- ktype_cache.default_attrs = amd_l3_attrs();
21425+ ktype = &ktype_cache_amd_nb;
21426 #endif
21427 retval = kobject_init_and_add(&(this_object->kobj),
21428- &ktype_cache,
21429+ ktype,
21430 per_cpu(ici_cache_kobject, cpu),
21431 "index%1lu", i);
21432 if (unlikely(retval)) {
21433diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
21434index 3c036cb..3b5677d 100644
21435--- a/arch/x86/kernel/cpu/mcheck/mce.c
21436+++ b/arch/x86/kernel/cpu/mcheck/mce.c
21437@@ -47,6 +47,7 @@
21438 #include <asm/tlbflush.h>
21439 #include <asm/mce.h>
21440 #include <asm/msr.h>
21441+#include <asm/local.h>
21442
21443 #include "mce-internal.h"
21444
21445@@ -258,7 +259,7 @@ static void print_mce(struct mce *m)
21446 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
21447 m->cs, m->ip);
21448
21449- if (m->cs == __KERNEL_CS)
21450+ if (m->cs == __KERNEL_CS || m->cs == __KERNEXEC_KERNEL_CS)
21451 print_symbol("{%s}", m->ip);
21452 pr_cont("\n");
21453 }
21454@@ -291,10 +292,10 @@ static void print_mce(struct mce *m)
21455
21456 #define PANIC_TIMEOUT 5 /* 5 seconds */
21457
21458-static atomic_t mce_panicked;
21459+static atomic_unchecked_t mce_panicked;
21460
21461 static int fake_panic;
21462-static atomic_t mce_fake_panicked;
21463+static atomic_unchecked_t mce_fake_panicked;
21464
21465 /* Panic in progress. Enable interrupts and wait for final IPI */
21466 static void wait_for_panic(void)
21467@@ -318,7 +319,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21468 /*
21469 * Make sure only one CPU runs in machine check panic
21470 */
21471- if (atomic_inc_return(&mce_panicked) > 1)
21472+ if (atomic_inc_return_unchecked(&mce_panicked) > 1)
21473 wait_for_panic();
21474 barrier();
21475
21476@@ -326,7 +327,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21477 console_verbose();
21478 } else {
21479 /* Don't log too much for fake panic */
21480- if (atomic_inc_return(&mce_fake_panicked) > 1)
21481+ if (atomic_inc_return_unchecked(&mce_fake_panicked) > 1)
21482 return;
21483 }
21484 /* First print corrected ones that are still unlogged */
21485@@ -365,7 +366,7 @@ static void mce_panic(const char *msg, struct mce *final, char *exp)
21486 if (!fake_panic) {
21487 if (panic_timeout == 0)
21488 panic_timeout = mca_cfg.panic_timeout;
21489- panic(msg);
21490+ panic("%s", msg);
21491 } else
21492 pr_emerg(HW_ERR "Fake kernel panic: %s\n", msg);
21493 }
21494@@ -743,7 +744,7 @@ static int mce_timed_out(u64 *t, const char *msg)
21495 * might have been modified by someone else.
21496 */
21497 rmb();
21498- if (atomic_read(&mce_panicked))
21499+ if (atomic_read_unchecked(&mce_panicked))
21500 wait_for_panic();
21501 if (!mca_cfg.monarch_timeout)
21502 goto out;
21503@@ -1669,7 +1670,7 @@ static void unexpected_machine_check(struct pt_regs *regs, long error_code)
21504 }
21505
21506 /* Call the installed machine check handler for this CPU setup. */
21507-void (*machine_check_vector)(struct pt_regs *, long error_code) =
21508+void (*machine_check_vector)(struct pt_regs *, long error_code) __read_only =
21509 unexpected_machine_check;
21510
21511 /*
21512@@ -1692,7 +1693,9 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21513 return;
21514 }
21515
21516+ pax_open_kernel();
21517 machine_check_vector = do_machine_check;
21518+ pax_close_kernel();
21519
21520 __mcheck_cpu_init_generic();
21521 __mcheck_cpu_init_vendor(c);
21522@@ -1706,7 +1709,7 @@ void mcheck_cpu_init(struct cpuinfo_x86 *c)
21523 */
21524
21525 static DEFINE_SPINLOCK(mce_chrdev_state_lock);
21526-static int mce_chrdev_open_count; /* #times opened */
21527+static local_t mce_chrdev_open_count; /* #times opened */
21528 static int mce_chrdev_open_exclu; /* already open exclusive? */
21529
21530 static int mce_chrdev_open(struct inode *inode, struct file *file)
21531@@ -1714,7 +1717,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21532 spin_lock(&mce_chrdev_state_lock);
21533
21534 if (mce_chrdev_open_exclu ||
21535- (mce_chrdev_open_count && (file->f_flags & O_EXCL))) {
21536+ (local_read(&mce_chrdev_open_count) && (file->f_flags & O_EXCL))) {
21537 spin_unlock(&mce_chrdev_state_lock);
21538
21539 return -EBUSY;
21540@@ -1722,7 +1725,7 @@ static int mce_chrdev_open(struct inode *inode, struct file *file)
21541
21542 if (file->f_flags & O_EXCL)
21543 mce_chrdev_open_exclu = 1;
21544- mce_chrdev_open_count++;
21545+ local_inc(&mce_chrdev_open_count);
21546
21547 spin_unlock(&mce_chrdev_state_lock);
21548
21549@@ -1733,7 +1736,7 @@ static int mce_chrdev_release(struct inode *inode, struct file *file)
21550 {
21551 spin_lock(&mce_chrdev_state_lock);
21552
21553- mce_chrdev_open_count--;
21554+ local_dec(&mce_chrdev_open_count);
21555 mce_chrdev_open_exclu = 0;
21556
21557 spin_unlock(&mce_chrdev_state_lock);
21558@@ -2408,7 +2411,7 @@ static __init void mce_init_banks(void)
21559
21560 for (i = 0; i < mca_cfg.banks; i++) {
21561 struct mce_bank *b = &mce_banks[i];
21562- struct device_attribute *a = &b->attr;
21563+ device_attribute_no_const *a = &b->attr;
21564
21565 sysfs_attr_init(&a->attr);
21566 a->attr.name = b->attrname;
21567@@ -2515,7 +2518,7 @@ struct dentry *mce_get_debugfs_dir(void)
21568 static void mce_reset(void)
21569 {
21570 cpu_missing = 0;
21571- atomic_set(&mce_fake_panicked, 0);
21572+ atomic_set_unchecked(&mce_fake_panicked, 0);
21573 atomic_set(&mce_executing, 0);
21574 atomic_set(&mce_callin, 0);
21575 atomic_set(&global_nwo, 0);
21576diff --git a/arch/x86/kernel/cpu/mcheck/p5.c b/arch/x86/kernel/cpu/mcheck/p5.c
21577index 737b0ad..09ec66e 100644
21578--- a/arch/x86/kernel/cpu/mcheck/p5.c
21579+++ b/arch/x86/kernel/cpu/mcheck/p5.c
21580@@ -12,6 +12,7 @@
21581 #include <asm/tlbflush.h>
21582 #include <asm/mce.h>
21583 #include <asm/msr.h>
21584+#include <asm/pgtable.h>
21585
21586 /* By default disabled */
21587 int mce_p5_enabled __read_mostly;
21588@@ -55,7 +56,9 @@ void intel_p5_mcheck_init(struct cpuinfo_x86 *c)
21589 if (!cpu_has(c, X86_FEATURE_MCE))
21590 return;
21591
21592+ pax_open_kernel();
21593 machine_check_vector = pentium_machine_check;
21594+ pax_close_kernel();
21595 /* Make sure the vector pointer is visible before we enable MCEs: */
21596 wmb();
21597
21598diff --git a/arch/x86/kernel/cpu/mcheck/winchip.c b/arch/x86/kernel/cpu/mcheck/winchip.c
21599index 44f1382..315b292 100644
21600--- a/arch/x86/kernel/cpu/mcheck/winchip.c
21601+++ b/arch/x86/kernel/cpu/mcheck/winchip.c
21602@@ -11,6 +11,7 @@
21603 #include <asm/tlbflush.h>
21604 #include <asm/mce.h>
21605 #include <asm/msr.h>
21606+#include <asm/pgtable.h>
21607
21608 /* Machine check handler for WinChip C6: */
21609 static void winchip_machine_check(struct pt_regs *regs, long error_code)
21610@@ -28,7 +29,9 @@ void winchip_mcheck_init(struct cpuinfo_x86 *c)
21611 {
21612 u32 lo, hi;
21613
21614+ pax_open_kernel();
21615 machine_check_vector = winchip_machine_check;
21616+ pax_close_kernel();
21617 /* Make sure the vector pointer is visible before we enable MCEs: */
21618 wmb();
21619
21620diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
21621index 36a8361..e7058c2 100644
21622--- a/arch/x86/kernel/cpu/microcode/core.c
21623+++ b/arch/x86/kernel/cpu/microcode/core.c
21624@@ -518,7 +518,7 @@ mc_cpu_callback(struct notifier_block *nb, unsigned long action, void *hcpu)
21625 return NOTIFY_OK;
21626 }
21627
21628-static struct notifier_block __refdata mc_cpu_notifier = {
21629+static struct notifier_block mc_cpu_notifier = {
21630 .notifier_call = mc_cpu_callback,
21631 };
21632
21633diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c
21634index 746e7fd..8dc677e 100644
21635--- a/arch/x86/kernel/cpu/microcode/intel.c
21636+++ b/arch/x86/kernel/cpu/microcode/intel.c
21637@@ -298,13 +298,13 @@ static enum ucode_state request_microcode_fw(int cpu, struct device *device,
21638
21639 static int get_ucode_user(void *to, const void *from, size_t n)
21640 {
21641- return copy_from_user(to, from, n);
21642+ return copy_from_user(to, (const void __force_user *)from, n);
21643 }
21644
21645 static enum ucode_state
21646 request_microcode_user(int cpu, const void __user *buf, size_t size)
21647 {
21648- return generic_load_microcode(cpu, (void *)buf, size, &get_ucode_user);
21649+ return generic_load_microcode(cpu, (__force_kernel void *)buf, size, &get_ucode_user);
21650 }
21651
21652 static void microcode_fini_cpu(int cpu)
21653diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
21654index ea5f363..cb0e905 100644
21655--- a/arch/x86/kernel/cpu/mtrr/main.c
21656+++ b/arch/x86/kernel/cpu/mtrr/main.c
21657@@ -66,7 +66,7 @@ static DEFINE_MUTEX(mtrr_mutex);
21658 u64 size_or_mask, size_and_mask;
21659 static bool mtrr_aps_delayed_init;
21660
21661-static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM];
21662+static const struct mtrr_ops *mtrr_ops[X86_VENDOR_NUM] __read_only;
21663
21664 const struct mtrr_ops *mtrr_if;
21665
21666diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.h b/arch/x86/kernel/cpu/mtrr/mtrr.h
21667index df5e41f..816c719 100644
21668--- a/arch/x86/kernel/cpu/mtrr/mtrr.h
21669+++ b/arch/x86/kernel/cpu/mtrr/mtrr.h
21670@@ -25,7 +25,7 @@ struct mtrr_ops {
21671 int (*validate_add_page)(unsigned long base, unsigned long size,
21672 unsigned int type);
21673 int (*have_wrcomb)(void);
21674-};
21675+} __do_const;
21676
21677 extern int generic_get_free_region(unsigned long base, unsigned long size,
21678 int replace_reg);
21679diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
21680index b71a7f8..534af0e 100644
21681--- a/arch/x86/kernel/cpu/perf_event.c
21682+++ b/arch/x86/kernel/cpu/perf_event.c
21683@@ -1376,7 +1376,7 @@ static void __init pmu_check_apic(void)
21684
21685 }
21686
21687-static struct attribute_group x86_pmu_format_group = {
21688+static attribute_group_no_const x86_pmu_format_group = {
21689 .name = "format",
21690 .attrs = NULL,
21691 };
21692@@ -1475,7 +1475,7 @@ static struct attribute *events_attr[] = {
21693 NULL,
21694 };
21695
21696-static struct attribute_group x86_pmu_events_group = {
21697+static attribute_group_no_const x86_pmu_events_group = {
21698 .name = "events",
21699 .attrs = events_attr,
21700 };
21701@@ -2037,7 +2037,7 @@ static unsigned long get_segment_base(unsigned int segment)
21702 if (idx > GDT_ENTRIES)
21703 return 0;
21704
21705- desc = raw_cpu_ptr(gdt_page.gdt);
21706+ desc = get_cpu_gdt_table(smp_processor_id());
21707 }
21708
21709 return get_desc_base(desc + idx);
21710@@ -2127,7 +2127,7 @@ perf_callchain_user(struct perf_callchain_entry *entry, struct pt_regs *regs)
21711 break;
21712
21713 perf_callchain_store(entry, frame.return_address);
21714- fp = frame.next_frame;
21715+ fp = (const void __force_user *)frame.next_frame;
21716 }
21717 }
21718
21719diff --git a/arch/x86/kernel/cpu/perf_event_amd_iommu.c b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21720index 97242a9..cf9c30e 100644
21721--- a/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21722+++ b/arch/x86/kernel/cpu/perf_event_amd_iommu.c
21723@@ -402,7 +402,7 @@ static void perf_iommu_del(struct perf_event *event, int flags)
21724 static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
21725 {
21726 struct attribute **attrs;
21727- struct attribute_group *attr_group;
21728+ attribute_group_no_const *attr_group;
21729 int i = 0, j;
21730
21731 while (amd_iommu_v2_event_descs[i].attr.attr.name)
21732diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
21733index 2589906..1ca1000 100644
21734--- a/arch/x86/kernel/cpu/perf_event_intel.c
21735+++ b/arch/x86/kernel/cpu/perf_event_intel.c
21736@@ -2353,10 +2353,10 @@ __init int intel_pmu_init(void)
21737 x86_pmu.num_counters_fixed = max((int)edx.split.num_counters_fixed, 3);
21738
21739 if (boot_cpu_has(X86_FEATURE_PDCM)) {
21740- u64 capabilities;
21741+ u64 capabilities = x86_pmu.intel_cap.capabilities;
21742
21743- rdmsrl(MSR_IA32_PERF_CAPABILITIES, capabilities);
21744- x86_pmu.intel_cap.capabilities = capabilities;
21745+ if (rdmsrl_safe(MSR_IA32_PERF_CAPABILITIES, &x86_pmu.intel_cap.capabilities))
21746+ x86_pmu.intel_cap.capabilities = capabilities;
21747 }
21748
21749 intel_ds_init();
21750diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21751index c4bb8b8..9f7384d 100644
21752--- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21753+++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c
21754@@ -465,7 +465,7 @@ static struct attribute *rapl_events_hsw_attr[] = {
21755 NULL,
21756 };
21757
21758-static struct attribute_group rapl_pmu_events_group = {
21759+static attribute_group_no_const rapl_pmu_events_group __read_only = {
21760 .name = "events",
21761 .attrs = NULL, /* patched at runtime */
21762 };
21763diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21764index c635b8b..b78835e 100644
21765--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21766+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
21767@@ -733,7 +733,7 @@ static void __init uncore_types_exit(struct intel_uncore_type **types)
21768 static int __init uncore_type_init(struct intel_uncore_type *type)
21769 {
21770 struct intel_uncore_pmu *pmus;
21771- struct attribute_group *attr_group;
21772+ attribute_group_no_const *attr_group;
21773 struct attribute **attrs;
21774 int i, j;
21775
21776diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21777index 6c8c1e7..515b98a 100644
21778--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21779+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
21780@@ -114,7 +114,7 @@ struct intel_uncore_box {
21781 struct uncore_event_desc {
21782 struct kobj_attribute attr;
21783 const char *config;
21784-};
21785+} __do_const;
21786
21787 ssize_t uncore_event_show(struct kobject *kobj,
21788 struct kobj_attribute *attr, char *buf);
21789diff --git a/arch/x86/kernel/cpuid.c b/arch/x86/kernel/cpuid.c
21790index 83741a7..bd3507d 100644
21791--- a/arch/x86/kernel/cpuid.c
21792+++ b/arch/x86/kernel/cpuid.c
21793@@ -170,7 +170,7 @@ static int cpuid_class_cpu_callback(struct notifier_block *nfb,
21794 return notifier_from_errno(err);
21795 }
21796
21797-static struct notifier_block __refdata cpuid_class_cpu_notifier =
21798+static struct notifier_block cpuid_class_cpu_notifier =
21799 {
21800 .notifier_call = cpuid_class_cpu_callback,
21801 };
21802diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
21803index aceb2f9..c76d3e3 100644
21804--- a/arch/x86/kernel/crash.c
21805+++ b/arch/x86/kernel/crash.c
21806@@ -105,7 +105,7 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
21807 #ifdef CONFIG_X86_32
21808 struct pt_regs fixed_regs;
21809
21810- if (!user_mode_vm(regs)) {
21811+ if (!user_mode(regs)) {
21812 crash_fixup_ss_esp(&fixed_regs, regs);
21813 regs = &fixed_regs;
21814 }
21815diff --git a/arch/x86/kernel/crash_dump_64.c b/arch/x86/kernel/crash_dump_64.c
21816index afa64ad..dce67dd 100644
21817--- a/arch/x86/kernel/crash_dump_64.c
21818+++ b/arch/x86/kernel/crash_dump_64.c
21819@@ -36,7 +36,7 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
21820 return -ENOMEM;
21821
21822 if (userbuf) {
21823- if (copy_to_user(buf, vaddr + offset, csize)) {
21824+ if (copy_to_user((char __force_user *)buf, vaddr + offset, csize)) {
21825 iounmap(vaddr);
21826 return -EFAULT;
21827 }
21828diff --git a/arch/x86/kernel/doublefault.c b/arch/x86/kernel/doublefault.c
21829index f6dfd93..892ade4 100644
21830--- a/arch/x86/kernel/doublefault.c
21831+++ b/arch/x86/kernel/doublefault.c
21832@@ -12,7 +12,7 @@
21833
21834 #define DOUBLEFAULT_STACKSIZE (1024)
21835 static unsigned long doublefault_stack[DOUBLEFAULT_STACKSIZE];
21836-#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE)
21837+#define STACK_START (unsigned long)(doublefault_stack+DOUBLEFAULT_STACKSIZE-2)
21838
21839 #define ptr_ok(x) ((x) > PAGE_OFFSET && (x) < PAGE_OFFSET + MAXMEM)
21840
21841@@ -22,7 +22,7 @@ static void doublefault_fn(void)
21842 unsigned long gdt, tss;
21843
21844 native_store_gdt(&gdt_desc);
21845- gdt = gdt_desc.address;
21846+ gdt = (unsigned long)gdt_desc.address;
21847
21848 printk(KERN_EMERG "PANIC: double fault, gdt at %08lx [%d bytes]\n", gdt, gdt_desc.size);
21849
21850@@ -59,10 +59,10 @@ struct tss_struct doublefault_tss __cacheline_aligned = {
21851 /* 0x2 bit is always set */
21852 .flags = X86_EFLAGS_SF | 0x2,
21853 .sp = STACK_START,
21854- .es = __USER_DS,
21855+ .es = __KERNEL_DS,
21856 .cs = __KERNEL_CS,
21857 .ss = __KERNEL_DS,
21858- .ds = __USER_DS,
21859+ .ds = __KERNEL_DS,
21860 .fs = __KERNEL_PERCPU,
21861
21862 .__cr3 = __pa_nodebug(swapper_pg_dir),
21863diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c
21864index cf3df1d..b637d9a 100644
21865--- a/arch/x86/kernel/dumpstack.c
21866+++ b/arch/x86/kernel/dumpstack.c
21867@@ -2,6 +2,9 @@
21868 * Copyright (C) 1991, 1992 Linus Torvalds
21869 * Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
21870 */
21871+#ifdef CONFIG_GRKERNSEC_HIDESYM
21872+#define __INCLUDED_BY_HIDESYM 1
21873+#endif
21874 #include <linux/kallsyms.h>
21875 #include <linux/kprobes.h>
21876 #include <linux/uaccess.h>
21877@@ -33,23 +36,21 @@ static void printk_stack_address(unsigned long address, int reliable)
21878
21879 void printk_address(unsigned long address)
21880 {
21881- pr_cont(" [<%p>] %pS\n", (void *)address, (void *)address);
21882+ pr_cont(" [<%p>] %pA\n", (void *)address, (void *)address);
21883 }
21884
21885 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
21886 static void
21887 print_ftrace_graph_addr(unsigned long addr, void *data,
21888 const struct stacktrace_ops *ops,
21889- struct thread_info *tinfo, int *graph)
21890+ struct task_struct *task, int *graph)
21891 {
21892- struct task_struct *task;
21893 unsigned long ret_addr;
21894 int index;
21895
21896 if (addr != (unsigned long)return_to_handler)
21897 return;
21898
21899- task = tinfo->task;
21900 index = task->curr_ret_stack;
21901
21902 if (!task->ret_stack || index < *graph)
21903@@ -66,7 +67,7 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21904 static inline void
21905 print_ftrace_graph_addr(unsigned long addr, void *data,
21906 const struct stacktrace_ops *ops,
21907- struct thread_info *tinfo, int *graph)
21908+ struct task_struct *task, int *graph)
21909 { }
21910 #endif
21911
21912@@ -77,10 +78,8 @@ print_ftrace_graph_addr(unsigned long addr, void *data,
21913 * severe exception (double fault, nmi, stack fault, debug, mce) hardware stack
21914 */
21915
21916-static inline int valid_stack_ptr(struct thread_info *tinfo,
21917- void *p, unsigned int size, void *end)
21918+static inline int valid_stack_ptr(void *t, void *p, unsigned int size, void *end)
21919 {
21920- void *t = tinfo;
21921 if (end) {
21922 if (p < end && p >= (end-THREAD_SIZE))
21923 return 1;
21924@@ -91,14 +90,14 @@ static inline int valid_stack_ptr(struct thread_info *tinfo,
21925 }
21926
21927 unsigned long
21928-print_context_stack(struct thread_info *tinfo,
21929+print_context_stack(struct task_struct *task, void *stack_start,
21930 unsigned long *stack, unsigned long bp,
21931 const struct stacktrace_ops *ops, void *data,
21932 unsigned long *end, int *graph)
21933 {
21934 struct stack_frame *frame = (struct stack_frame *)bp;
21935
21936- while (valid_stack_ptr(tinfo, stack, sizeof(*stack), end)) {
21937+ while (valid_stack_ptr(stack_start, stack, sizeof(*stack), end)) {
21938 unsigned long addr;
21939
21940 addr = *stack;
21941@@ -110,7 +109,7 @@ print_context_stack(struct thread_info *tinfo,
21942 } else {
21943 ops->address(data, addr, 0);
21944 }
21945- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21946+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21947 }
21948 stack++;
21949 }
21950@@ -119,7 +118,7 @@ print_context_stack(struct thread_info *tinfo,
21951 EXPORT_SYMBOL_GPL(print_context_stack);
21952
21953 unsigned long
21954-print_context_stack_bp(struct thread_info *tinfo,
21955+print_context_stack_bp(struct task_struct *task, void *stack_start,
21956 unsigned long *stack, unsigned long bp,
21957 const struct stacktrace_ops *ops, void *data,
21958 unsigned long *end, int *graph)
21959@@ -127,7 +126,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21960 struct stack_frame *frame = (struct stack_frame *)bp;
21961 unsigned long *ret_addr = &frame->return_address;
21962
21963- while (valid_stack_ptr(tinfo, ret_addr, sizeof(*ret_addr), end)) {
21964+ while (valid_stack_ptr(stack_start, ret_addr, sizeof(*ret_addr), end)) {
21965 unsigned long addr = *ret_addr;
21966
21967 if (!__kernel_text_address(addr))
21968@@ -136,7 +135,7 @@ print_context_stack_bp(struct thread_info *tinfo,
21969 ops->address(data, addr, 1);
21970 frame = frame->next_frame;
21971 ret_addr = &frame->return_address;
21972- print_ftrace_graph_addr(addr, data, ops, tinfo, graph);
21973+ print_ftrace_graph_addr(addr, data, ops, task, graph);
21974 }
21975
21976 return (unsigned long)frame;
21977@@ -155,7 +154,7 @@ static int print_trace_stack(void *data, char *name)
21978 static void print_trace_address(void *data, unsigned long addr, int reliable)
21979 {
21980 touch_nmi_watchdog();
21981- printk(data);
21982+ printk("%s", (char *)data);
21983 printk_stack_address(addr, reliable);
21984 }
21985
21986@@ -225,6 +224,8 @@ unsigned long oops_begin(void)
21987 EXPORT_SYMBOL_GPL(oops_begin);
21988 NOKPROBE_SYMBOL(oops_begin);
21989
21990+extern void gr_handle_kernel_exploit(void);
21991+
21992 void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
21993 {
21994 if (regs && kexec_should_crash(current))
21995@@ -246,7 +247,10 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr)
21996 panic("Fatal exception in interrupt");
21997 if (panic_on_oops)
21998 panic("Fatal exception");
21999- do_exit(signr);
22000+
22001+ gr_handle_kernel_exploit();
22002+
22003+ do_group_exit(signr);
22004 }
22005 NOKPROBE_SYMBOL(oops_end);
22006
22007@@ -278,7 +282,7 @@ int __die(const char *str, struct pt_regs *regs, long err)
22008 print_modules();
22009 show_regs(regs);
22010 #ifdef CONFIG_X86_32
22011- if (user_mode_vm(regs)) {
22012+ if (user_mode(regs)) {
22013 sp = regs->sp;
22014 ss = regs->ss & 0xffff;
22015 } else {
22016@@ -307,7 +311,7 @@ void die(const char *str, struct pt_regs *regs, long err)
22017 unsigned long flags = oops_begin();
22018 int sig = SIGSEGV;
22019
22020- if (!user_mode_vm(regs))
22021+ if (!user_mode(regs))
22022 report_bug(regs->ip, regs);
22023
22024 if (__die(str, regs, err))
22025diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
22026index 5abd4cd..c65733b 100644
22027--- a/arch/x86/kernel/dumpstack_32.c
22028+++ b/arch/x86/kernel/dumpstack_32.c
22029@@ -61,15 +61,14 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22030 bp = stack_frame(task, regs);
22031
22032 for (;;) {
22033- struct thread_info *context;
22034+ void *stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22035 void *end_stack;
22036
22037 end_stack = is_hardirq_stack(stack, cpu);
22038 if (!end_stack)
22039 end_stack = is_softirq_stack(stack, cpu);
22040
22041- context = task_thread_info(task);
22042- bp = ops->walk_stack(context, stack, bp, ops, data,
22043+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data,
22044 end_stack, &graph);
22045
22046 /* Stop if not on irq stack */
22047@@ -123,27 +122,28 @@ void show_regs(struct pt_regs *regs)
22048 int i;
22049
22050 show_regs_print_info(KERN_EMERG);
22051- __show_regs(regs, !user_mode_vm(regs));
22052+ __show_regs(regs, !user_mode(regs));
22053
22054 /*
22055 * When in-kernel, we also print out the stack and code at the
22056 * time of the fault..
22057 */
22058- if (!user_mode_vm(regs)) {
22059+ if (!user_mode(regs)) {
22060 unsigned int code_prologue = code_bytes * 43 / 64;
22061 unsigned int code_len = code_bytes;
22062 unsigned char c;
22063 u8 *ip;
22064+ unsigned long cs_base = get_desc_base(&get_cpu_gdt_table(0)[(0xffff & regs->cs) >> 3]);
22065
22066 pr_emerg("Stack:\n");
22067 show_stack_log_lvl(NULL, regs, &regs->sp, 0, KERN_EMERG);
22068
22069 pr_emerg("Code:");
22070
22071- ip = (u8 *)regs->ip - code_prologue;
22072+ ip = (u8 *)regs->ip - code_prologue + cs_base;
22073 if (ip < (u8 *)PAGE_OFFSET || probe_kernel_address(ip, c)) {
22074 /* try starting at IP */
22075- ip = (u8 *)regs->ip;
22076+ ip = (u8 *)regs->ip + cs_base;
22077 code_len = code_len - code_prologue + 1;
22078 }
22079 for (i = 0; i < code_len; i++, ip++) {
22080@@ -152,7 +152,7 @@ void show_regs(struct pt_regs *regs)
22081 pr_cont(" Bad EIP value.");
22082 break;
22083 }
22084- if (ip == (u8 *)regs->ip)
22085+ if (ip == (u8 *)regs->ip + cs_base)
22086 pr_cont(" <%02x>", c);
22087 else
22088 pr_cont(" %02x", c);
22089@@ -165,6 +165,7 @@ int is_valid_bugaddr(unsigned long ip)
22090 {
22091 unsigned short ud2;
22092
22093+ ip = ktla_ktva(ip);
22094 if (ip < PAGE_OFFSET)
22095 return 0;
22096 if (probe_kernel_address((unsigned short *)ip, ud2))
22097@@ -172,3 +173,15 @@ int is_valid_bugaddr(unsigned long ip)
22098
22099 return ud2 == 0x0b0f;
22100 }
22101+
22102+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22103+void pax_check_alloca(unsigned long size)
22104+{
22105+ unsigned long sp = (unsigned long)&sp, stack_left;
22106+
22107+ /* all kernel stacks are of the same size */
22108+ stack_left = sp & (THREAD_SIZE - 1);
22109+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22110+}
22111+EXPORT_SYMBOL(pax_check_alloca);
22112+#endif
22113diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
22114index ff86f19..73eabf4 100644
22115--- a/arch/x86/kernel/dumpstack_64.c
22116+++ b/arch/x86/kernel/dumpstack_64.c
22117@@ -153,12 +153,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22118 const struct stacktrace_ops *ops, void *data)
22119 {
22120 const unsigned cpu = get_cpu();
22121- struct thread_info *tinfo;
22122 unsigned long *irq_stack = (unsigned long *)per_cpu(irq_stack_ptr, cpu);
22123 unsigned long dummy;
22124 unsigned used = 0;
22125 int graph = 0;
22126 int done = 0;
22127+ void *stack_start;
22128
22129 if (!task)
22130 task = current;
22131@@ -179,7 +179,6 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22132 * current stack address. If the stacks consist of nested
22133 * exceptions
22134 */
22135- tinfo = task_thread_info(task);
22136 while (!done) {
22137 unsigned long *stack_end;
22138 enum stack_type stype;
22139@@ -202,7 +201,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22140 if (ops->stack(data, id) < 0)
22141 break;
22142
22143- bp = ops->walk_stack(tinfo, stack, bp, ops,
22144+ bp = ops->walk_stack(task, stack_end - EXCEPTION_STKSZ, stack, bp, ops,
22145 data, stack_end, &graph);
22146 ops->stack(data, "<EOE>");
22147 /*
22148@@ -210,6 +209,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22149 * second-to-last pointer (index -2 to end) in the
22150 * exception stack:
22151 */
22152+ if ((u16)stack_end[-1] != __KERNEL_DS)
22153+ goto out;
22154 stack = (unsigned long *) stack_end[-2];
22155 done = 0;
22156 break;
22157@@ -218,7 +219,7 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22158
22159 if (ops->stack(data, "IRQ") < 0)
22160 break;
22161- bp = ops->walk_stack(tinfo, stack, bp,
22162+ bp = ops->walk_stack(task, irq_stack, stack, bp,
22163 ops, data, stack_end, &graph);
22164 /*
22165 * We link to the next stack (which would be
22166@@ -240,7 +241,9 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
22167 /*
22168 * This handles the process stack:
22169 */
22170- bp = ops->walk_stack(tinfo, stack, bp, ops, data, NULL, &graph);
22171+ stack_start = (void *)((unsigned long)stack & ~(THREAD_SIZE-1));
22172+ bp = ops->walk_stack(task, stack_start, stack, bp, ops, data, NULL, &graph);
22173+out:
22174 put_cpu();
22175 }
22176 EXPORT_SYMBOL(dump_trace);
22177@@ -344,8 +347,55 @@ int is_valid_bugaddr(unsigned long ip)
22178 {
22179 unsigned short ud2;
22180
22181- if (__copy_from_user(&ud2, (const void __user *) ip, sizeof(ud2)))
22182+ if (probe_kernel_address((unsigned short *)ip, ud2))
22183 return 0;
22184
22185 return ud2 == 0x0b0f;
22186 }
22187+
22188+#if defined(CONFIG_PAX_MEMORY_STACKLEAK) || defined(CONFIG_PAX_USERCOPY)
22189+void pax_check_alloca(unsigned long size)
22190+{
22191+ unsigned long sp = (unsigned long)&sp, stack_start, stack_end;
22192+ unsigned cpu, used;
22193+ char *id;
22194+
22195+ /* check the process stack first */
22196+ stack_start = (unsigned long)task_stack_page(current);
22197+ stack_end = stack_start + THREAD_SIZE;
22198+ if (likely(stack_start <= sp && sp < stack_end)) {
22199+ unsigned long stack_left = sp & (THREAD_SIZE - 1);
22200+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22201+ return;
22202+ }
22203+
22204+ cpu = get_cpu();
22205+
22206+ /* check the irq stacks */
22207+ stack_end = (unsigned long)per_cpu(irq_stack_ptr, cpu);
22208+ stack_start = stack_end - IRQ_STACK_SIZE;
22209+ if (stack_start <= sp && sp < stack_end) {
22210+ unsigned long stack_left = sp & (IRQ_STACK_SIZE - 1);
22211+ put_cpu();
22212+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22213+ return;
22214+ }
22215+
22216+ /* check the exception stacks */
22217+ used = 0;
22218+ stack_end = (unsigned long)in_exception_stack(cpu, sp, &used, &id);
22219+ stack_start = stack_end - EXCEPTION_STKSZ;
22220+ if (stack_end && stack_start <= sp && sp < stack_end) {
22221+ unsigned long stack_left = sp & (EXCEPTION_STKSZ - 1);
22222+ put_cpu();
22223+ BUG_ON(stack_left < 256 || size >= stack_left - 256);
22224+ return;
22225+ }
22226+
22227+ put_cpu();
22228+
22229+ /* unknown stack */
22230+ BUG();
22231+}
22232+EXPORT_SYMBOL(pax_check_alloca);
22233+#endif
22234diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
22235index 46201de..ebffabf 100644
22236--- a/arch/x86/kernel/e820.c
22237+++ b/arch/x86/kernel/e820.c
22238@@ -794,8 +794,8 @@ unsigned long __init e820_end_of_low_ram_pfn(void)
22239
22240 static void early_panic(char *msg)
22241 {
22242- early_printk(msg);
22243- panic(msg);
22244+ early_printk("%s", msg);
22245+ panic("%s", msg);
22246 }
22247
22248 static int userdef __initdata;
22249diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c
22250index a62536a..8444df4 100644
22251--- a/arch/x86/kernel/early_printk.c
22252+++ b/arch/x86/kernel/early_printk.c
22253@@ -7,6 +7,7 @@
22254 #include <linux/pci_regs.h>
22255 #include <linux/pci_ids.h>
22256 #include <linux/errno.h>
22257+#include <linux/sched.h>
22258 #include <asm/io.h>
22259 #include <asm/processor.h>
22260 #include <asm/fcntl.h>
22261diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
22262index 31e2d5b..b31c76d 100644
22263--- a/arch/x86/kernel/entry_32.S
22264+++ b/arch/x86/kernel/entry_32.S
22265@@ -177,13 +177,154 @@
22266 /*CFI_REL_OFFSET gs, PT_GS*/
22267 .endm
22268 .macro SET_KERNEL_GS reg
22269+
22270+#ifdef CONFIG_CC_STACKPROTECTOR
22271 movl $(__KERNEL_STACK_CANARY), \reg
22272+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
22273+ movl $(__USER_DS), \reg
22274+#else
22275+ xorl \reg, \reg
22276+#endif
22277+
22278 movl \reg, %gs
22279 .endm
22280
22281 #endif /* CONFIG_X86_32_LAZY_GS */
22282
22283-.macro SAVE_ALL
22284+.macro pax_enter_kernel
22285+#ifdef CONFIG_PAX_KERNEXEC
22286+ call pax_enter_kernel
22287+#endif
22288+.endm
22289+
22290+.macro pax_exit_kernel
22291+#ifdef CONFIG_PAX_KERNEXEC
22292+ call pax_exit_kernel
22293+#endif
22294+.endm
22295+
22296+#ifdef CONFIG_PAX_KERNEXEC
22297+ENTRY(pax_enter_kernel)
22298+#ifdef CONFIG_PARAVIRT
22299+ pushl %eax
22300+ pushl %ecx
22301+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0)
22302+ mov %eax, %esi
22303+#else
22304+ mov %cr0, %esi
22305+#endif
22306+ bts $16, %esi
22307+ jnc 1f
22308+ mov %cs, %esi
22309+ cmp $__KERNEL_CS, %esi
22310+ jz 3f
22311+ ljmp $__KERNEL_CS, $3f
22312+1: ljmp $__KERNEXEC_KERNEL_CS, $2f
22313+2:
22314+#ifdef CONFIG_PARAVIRT
22315+ mov %esi, %eax
22316+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0)
22317+#else
22318+ mov %esi, %cr0
22319+#endif
22320+3:
22321+#ifdef CONFIG_PARAVIRT
22322+ popl %ecx
22323+ popl %eax
22324+#endif
22325+ ret
22326+ENDPROC(pax_enter_kernel)
22327+
22328+ENTRY(pax_exit_kernel)
22329+#ifdef CONFIG_PARAVIRT
22330+ pushl %eax
22331+ pushl %ecx
22332+#endif
22333+ mov %cs, %esi
22334+ cmp $__KERNEXEC_KERNEL_CS, %esi
22335+ jnz 2f
22336+#ifdef CONFIG_PARAVIRT
22337+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);
22338+ mov %eax, %esi
22339+#else
22340+ mov %cr0, %esi
22341+#endif
22342+ btr $16, %esi
22343+ ljmp $__KERNEL_CS, $1f
22344+1:
22345+#ifdef CONFIG_PARAVIRT
22346+ mov %esi, %eax
22347+ call PARA_INDIRECT(pv_cpu_ops+PV_CPU_write_cr0);
22348+#else
22349+ mov %esi, %cr0
22350+#endif
22351+2:
22352+#ifdef CONFIG_PARAVIRT
22353+ popl %ecx
22354+ popl %eax
22355+#endif
22356+ ret
22357+ENDPROC(pax_exit_kernel)
22358+#endif
22359+
22360+ .macro pax_erase_kstack
22361+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22362+ call pax_erase_kstack
22363+#endif
22364+ .endm
22365+
22366+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
22367+/*
22368+ * ebp: thread_info
22369+ */
22370+ENTRY(pax_erase_kstack)
22371+ pushl %edi
22372+ pushl %ecx
22373+ pushl %eax
22374+
22375+ mov TI_lowest_stack(%ebp), %edi
22376+ mov $-0xBEEF, %eax
22377+ std
22378+
22379+1: mov %edi, %ecx
22380+ and $THREAD_SIZE_asm - 1, %ecx
22381+ shr $2, %ecx
22382+ repne scasl
22383+ jecxz 2f
22384+
22385+ cmp $2*16, %ecx
22386+ jc 2f
22387+
22388+ mov $2*16, %ecx
22389+ repe scasl
22390+ jecxz 2f
22391+ jne 1b
22392+
22393+2: cld
22394+ or $2*4, %edi
22395+ mov %esp, %ecx
22396+ sub %edi, %ecx
22397+
22398+ cmp $THREAD_SIZE_asm, %ecx
22399+ jb 3f
22400+ ud2
22401+3:
22402+
22403+ shr $2, %ecx
22404+ rep stosl
22405+
22406+ mov TI_task_thread_sp0(%ebp), %edi
22407+ sub $128, %edi
22408+ mov %edi, TI_lowest_stack(%ebp)
22409+
22410+ popl %eax
22411+ popl %ecx
22412+ popl %edi
22413+ ret
22414+ENDPROC(pax_erase_kstack)
22415+#endif
22416+
22417+.macro __SAVE_ALL _DS
22418 cld
22419 PUSH_GS
22420 pushl_cfi %fs
22421@@ -206,7 +347,7 @@
22422 CFI_REL_OFFSET ecx, 0
22423 pushl_cfi %ebx
22424 CFI_REL_OFFSET ebx, 0
22425- movl $(__USER_DS), %edx
22426+ movl $\_DS, %edx
22427 movl %edx, %ds
22428 movl %edx, %es
22429 movl $(__KERNEL_PERCPU), %edx
22430@@ -214,6 +355,15 @@
22431 SET_KERNEL_GS %edx
22432 .endm
22433
22434+.macro SAVE_ALL
22435+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
22436+ __SAVE_ALL __KERNEL_DS
22437+ pax_enter_kernel
22438+#else
22439+ __SAVE_ALL __USER_DS
22440+#endif
22441+.endm
22442+
22443 .macro RESTORE_INT_REGS
22444 popl_cfi %ebx
22445 CFI_RESTORE ebx
22446@@ -297,7 +447,7 @@ ENTRY(ret_from_fork)
22447 popfl_cfi
22448 jmp syscall_exit
22449 CFI_ENDPROC
22450-END(ret_from_fork)
22451+ENDPROC(ret_from_fork)
22452
22453 ENTRY(ret_from_kernel_thread)
22454 CFI_STARTPROC
22455@@ -340,7 +490,15 @@ ret_from_intr:
22456 andl $SEGMENT_RPL_MASK, %eax
22457 #endif
22458 cmpl $USER_RPL, %eax
22459+
22460+#ifdef CONFIG_PAX_KERNEXEC
22461+ jae resume_userspace
22462+
22463+ pax_exit_kernel
22464+ jmp resume_kernel
22465+#else
22466 jb resume_kernel # not returning to v8086 or userspace
22467+#endif
22468
22469 ENTRY(resume_userspace)
22470 LOCKDEP_SYS_EXIT
22471@@ -352,8 +510,8 @@ ENTRY(resume_userspace)
22472 andl $_TIF_WORK_MASK, %ecx # is there any work to be done on
22473 # int/exception return?
22474 jne work_pending
22475- jmp restore_all
22476-END(ret_from_exception)
22477+ jmp restore_all_pax
22478+ENDPROC(ret_from_exception)
22479
22480 #ifdef CONFIG_PREEMPT
22481 ENTRY(resume_kernel)
22482@@ -365,7 +523,7 @@ need_resched:
22483 jz restore_all
22484 call preempt_schedule_irq
22485 jmp need_resched
22486-END(resume_kernel)
22487+ENDPROC(resume_kernel)
22488 #endif
22489 CFI_ENDPROC
22490
22491@@ -395,30 +553,45 @@ sysenter_past_esp:
22492 /*CFI_REL_OFFSET cs, 0*/
22493 /*
22494 * Push current_thread_info()->sysenter_return to the stack.
22495- * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
22496- * pushed above; +8 corresponds to copy_thread's esp0 setting.
22497 */
22498- pushl_cfi ((TI_sysenter_return)-THREAD_SIZE+8+4*4)(%esp)
22499+ pushl_cfi $0
22500 CFI_REL_OFFSET eip, 0
22501
22502 pushl_cfi %eax
22503 SAVE_ALL
22504+ GET_THREAD_INFO(%ebp)
22505+ movl TI_sysenter_return(%ebp),%ebp
22506+ movl %ebp,PT_EIP(%esp)
22507 ENABLE_INTERRUPTS(CLBR_NONE)
22508
22509 /*
22510 * Load the potential sixth argument from user stack.
22511 * Careful about security.
22512 */
22513+ movl PT_OLDESP(%esp),%ebp
22514+
22515+#ifdef CONFIG_PAX_MEMORY_UDEREF
22516+ mov PT_OLDSS(%esp),%ds
22517+1: movl %ds:(%ebp),%ebp
22518+ push %ss
22519+ pop %ds
22520+#else
22521 cmpl $__PAGE_OFFSET-3,%ebp
22522 jae syscall_fault
22523 ASM_STAC
22524 1: movl (%ebp),%ebp
22525 ASM_CLAC
22526+#endif
22527+
22528 movl %ebp,PT_EBP(%esp)
22529 _ASM_EXTABLE(1b,syscall_fault)
22530
22531 GET_THREAD_INFO(%ebp)
22532
22533+#ifdef CONFIG_PAX_RANDKSTACK
22534+ pax_erase_kstack
22535+#endif
22536+
22537 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22538 jnz sysenter_audit
22539 sysenter_do_call:
22540@@ -434,12 +607,24 @@ sysenter_after_call:
22541 testl $_TIF_ALLWORK_MASK, %ecx
22542 jne sysexit_audit
22543 sysenter_exit:
22544+
22545+#ifdef CONFIG_PAX_RANDKSTACK
22546+ pushl_cfi %eax
22547+ movl %esp, %eax
22548+ call pax_randomize_kstack
22549+ popl_cfi %eax
22550+#endif
22551+
22552+ pax_erase_kstack
22553+
22554 /* if something modifies registers it must also disable sysexit */
22555 movl PT_EIP(%esp), %edx
22556 movl PT_OLDESP(%esp), %ecx
22557 xorl %ebp,%ebp
22558 TRACE_IRQS_ON
22559 1: mov PT_FS(%esp), %fs
22560+2: mov PT_DS(%esp), %ds
22561+3: mov PT_ES(%esp), %es
22562 PTGS_TO_GS
22563 ENABLE_INTERRUPTS_SYSEXIT
22564
22565@@ -453,6 +638,9 @@ sysenter_audit:
22566 pushl_cfi PT_ESI(%esp) /* a3: 5th arg */
22567 pushl_cfi PT_EDX+4(%esp) /* a2: 4th arg */
22568 call __audit_syscall_entry
22569+
22570+ pax_erase_kstack
22571+
22572 popl_cfi %ecx /* get that remapped edx off the stack */
22573 popl_cfi %ecx /* get that remapped esi off the stack */
22574 movl PT_EAX(%esp),%eax /* reload syscall number */
22575@@ -479,10 +667,16 @@ sysexit_audit:
22576
22577 CFI_ENDPROC
22578 .pushsection .fixup,"ax"
22579-2: movl $0,PT_FS(%esp)
22580+4: movl $0,PT_FS(%esp)
22581+ jmp 1b
22582+5: movl $0,PT_DS(%esp)
22583+ jmp 1b
22584+6: movl $0,PT_ES(%esp)
22585 jmp 1b
22586 .popsection
22587- _ASM_EXTABLE(1b,2b)
22588+ _ASM_EXTABLE(1b,4b)
22589+ _ASM_EXTABLE(2b,5b)
22590+ _ASM_EXTABLE(3b,6b)
22591 PTGS_TO_GS_EX
22592 ENDPROC(ia32_sysenter_target)
22593
22594@@ -493,6 +687,11 @@ ENTRY(system_call)
22595 pushl_cfi %eax # save orig_eax
22596 SAVE_ALL
22597 GET_THREAD_INFO(%ebp)
22598+
22599+#ifdef CONFIG_PAX_RANDKSTACK
22600+ pax_erase_kstack
22601+#endif
22602+
22603 # system call tracing in operation / emulation
22604 testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%ebp)
22605 jnz syscall_trace_entry
22606@@ -512,6 +711,15 @@ syscall_exit:
22607 testl $_TIF_ALLWORK_MASK, %ecx # current->work
22608 jne syscall_exit_work
22609
22610+restore_all_pax:
22611+
22612+#ifdef CONFIG_PAX_RANDKSTACK
22613+ movl %esp, %eax
22614+ call pax_randomize_kstack
22615+#endif
22616+
22617+ pax_erase_kstack
22618+
22619 restore_all:
22620 TRACE_IRQS_IRET
22621 restore_all_notrace:
22622@@ -566,14 +774,34 @@ ldt_ss:
22623 * compensating for the offset by changing to the ESPFIX segment with
22624 * a base address that matches for the difference.
22625 */
22626-#define GDT_ESPFIX_SS PER_CPU_VAR(gdt_page) + (GDT_ENTRY_ESPFIX_SS * 8)
22627+#define GDT_ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8)(%ebx)
22628 mov %esp, %edx /* load kernel esp */
22629 mov PT_OLDESP(%esp), %eax /* load userspace esp */
22630 mov %dx, %ax /* eax: new kernel esp */
22631 sub %eax, %edx /* offset (low word is 0) */
22632+#ifdef CONFIG_SMP
22633+ movl PER_CPU_VAR(cpu_number), %ebx
22634+ shll $PAGE_SHIFT_asm, %ebx
22635+ addl $cpu_gdt_table, %ebx
22636+#else
22637+ movl $cpu_gdt_table, %ebx
22638+#endif
22639 shr $16, %edx
22640- mov %dl, GDT_ESPFIX_SS + 4 /* bits 16..23 */
22641- mov %dh, GDT_ESPFIX_SS + 7 /* bits 24..31 */
22642+
22643+#ifdef CONFIG_PAX_KERNEXEC
22644+ mov %cr0, %esi
22645+ btr $16, %esi
22646+ mov %esi, %cr0
22647+#endif
22648+
22649+ mov %dl, 4 + GDT_ESPFIX_SS /* bits 16..23 */
22650+ mov %dh, 7 + GDT_ESPFIX_SS /* bits 24..31 */
22651+
22652+#ifdef CONFIG_PAX_KERNEXEC
22653+ bts $16, %esi
22654+ mov %esi, %cr0
22655+#endif
22656+
22657 pushl_cfi $__ESPFIX_SS
22658 pushl_cfi %eax /* new kernel esp */
22659 /* Disable interrupts, but do not irqtrace this section: we
22660@@ -603,20 +831,18 @@ work_resched:
22661 movl TI_flags(%ebp), %ecx
22662 andl $_TIF_WORK_MASK, %ecx # is there any work to be done other
22663 # than syscall tracing?
22664- jz restore_all
22665+ jz restore_all_pax
22666 testb $_TIF_NEED_RESCHED, %cl
22667 jnz work_resched
22668
22669 work_notifysig: # deal with pending signals and
22670 # notify-resume requests
22671+ movl %esp, %eax
22672 #ifdef CONFIG_VM86
22673 testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)
22674- movl %esp, %eax
22675 jne work_notifysig_v86 # returning to kernel-space or
22676 # vm86-space
22677 1:
22678-#else
22679- movl %esp, %eax
22680 #endif
22681 TRACE_IRQS_ON
22682 ENABLE_INTERRUPTS(CLBR_NONE)
22683@@ -637,7 +863,7 @@ work_notifysig_v86:
22684 movl %eax, %esp
22685 jmp 1b
22686 #endif
22687-END(work_pending)
22688+ENDPROC(work_pending)
22689
22690 # perform syscall exit tracing
22691 ALIGN
22692@@ -645,11 +871,14 @@ syscall_trace_entry:
22693 movl $-ENOSYS,PT_EAX(%esp)
22694 movl %esp, %eax
22695 call syscall_trace_enter
22696+
22697+ pax_erase_kstack
22698+
22699 /* What it returned is what we'll actually use. */
22700 cmpl $(NR_syscalls), %eax
22701 jnae syscall_call
22702 jmp syscall_exit
22703-END(syscall_trace_entry)
22704+ENDPROC(syscall_trace_entry)
22705
22706 # perform syscall exit tracing
22707 ALIGN
22708@@ -662,26 +891,30 @@ syscall_exit_work:
22709 movl %esp, %eax
22710 call syscall_trace_leave
22711 jmp resume_userspace
22712-END(syscall_exit_work)
22713+ENDPROC(syscall_exit_work)
22714 CFI_ENDPROC
22715
22716 RING0_INT_FRAME # can't unwind into user space anyway
22717 syscall_fault:
22718+#ifdef CONFIG_PAX_MEMORY_UDEREF
22719+ push %ss
22720+ pop %ds
22721+#endif
22722 ASM_CLAC
22723 GET_THREAD_INFO(%ebp)
22724 movl $-EFAULT,PT_EAX(%esp)
22725 jmp resume_userspace
22726-END(syscall_fault)
22727+ENDPROC(syscall_fault)
22728
22729 syscall_badsys:
22730 movl $-ENOSYS,%eax
22731 jmp syscall_after_call
22732-END(syscall_badsys)
22733+ENDPROC(syscall_badsys)
22734
22735 sysenter_badsys:
22736 movl $-ENOSYS,%eax
22737 jmp sysenter_after_call
22738-END(sysenter_badsys)
22739+ENDPROC(sysenter_badsys)
22740 CFI_ENDPROC
22741
22742 .macro FIXUP_ESPFIX_STACK
22743@@ -694,8 +927,15 @@ END(sysenter_badsys)
22744 */
22745 #ifdef CONFIG_X86_ESPFIX32
22746 /* fixup the stack */
22747- mov GDT_ESPFIX_SS + 4, %al /* bits 16..23 */
22748- mov GDT_ESPFIX_SS + 7, %ah /* bits 24..31 */
22749+#ifdef CONFIG_SMP
22750+ movl PER_CPU_VAR(cpu_number), %ebx
22751+ shll $PAGE_SHIFT_asm, %ebx
22752+ addl $cpu_gdt_table, %ebx
22753+#else
22754+ movl $cpu_gdt_table, %ebx
22755+#endif
22756+ mov 4 + GDT_ESPFIX_SS, %al /* bits 16..23 */
22757+ mov 7 + GDT_ESPFIX_SS, %ah /* bits 24..31 */
22758 shl $16, %eax
22759 addl %esp, %eax /* the adjusted stack pointer */
22760 pushl_cfi $__KERNEL_DS
22761@@ -751,7 +991,7 @@ vector=vector+1
22762 .endr
22763 2: jmp common_interrupt
22764 .endr
22765-END(irq_entries_start)
22766+ENDPROC(irq_entries_start)
22767
22768 .previous
22769 END(interrupt)
22770@@ -808,7 +1048,7 @@ ENTRY(coprocessor_error)
22771 pushl_cfi $do_coprocessor_error
22772 jmp error_code
22773 CFI_ENDPROC
22774-END(coprocessor_error)
22775+ENDPROC(coprocessor_error)
22776
22777 ENTRY(simd_coprocessor_error)
22778 RING0_INT_FRAME
22779@@ -821,7 +1061,7 @@ ENTRY(simd_coprocessor_error)
22780 .section .altinstructions,"a"
22781 altinstruction_entry 661b, 663f, X86_FEATURE_XMM, 662b-661b, 664f-663f
22782 .previous
22783-.section .altinstr_replacement,"ax"
22784+.section .altinstr_replacement,"a"
22785 663: pushl $do_simd_coprocessor_error
22786 664:
22787 .previous
22788@@ -830,7 +1070,7 @@ ENTRY(simd_coprocessor_error)
22789 #endif
22790 jmp error_code
22791 CFI_ENDPROC
22792-END(simd_coprocessor_error)
22793+ENDPROC(simd_coprocessor_error)
22794
22795 ENTRY(device_not_available)
22796 RING0_INT_FRAME
22797@@ -839,18 +1079,18 @@ ENTRY(device_not_available)
22798 pushl_cfi $do_device_not_available
22799 jmp error_code
22800 CFI_ENDPROC
22801-END(device_not_available)
22802+ENDPROC(device_not_available)
22803
22804 #ifdef CONFIG_PARAVIRT
22805 ENTRY(native_iret)
22806 iret
22807 _ASM_EXTABLE(native_iret, iret_exc)
22808-END(native_iret)
22809+ENDPROC(native_iret)
22810
22811 ENTRY(native_irq_enable_sysexit)
22812 sti
22813 sysexit
22814-END(native_irq_enable_sysexit)
22815+ENDPROC(native_irq_enable_sysexit)
22816 #endif
22817
22818 ENTRY(overflow)
22819@@ -860,7 +1100,7 @@ ENTRY(overflow)
22820 pushl_cfi $do_overflow
22821 jmp error_code
22822 CFI_ENDPROC
22823-END(overflow)
22824+ENDPROC(overflow)
22825
22826 ENTRY(bounds)
22827 RING0_INT_FRAME
22828@@ -869,7 +1109,7 @@ ENTRY(bounds)
22829 pushl_cfi $do_bounds
22830 jmp error_code
22831 CFI_ENDPROC
22832-END(bounds)
22833+ENDPROC(bounds)
22834
22835 ENTRY(invalid_op)
22836 RING0_INT_FRAME
22837@@ -878,7 +1118,7 @@ ENTRY(invalid_op)
22838 pushl_cfi $do_invalid_op
22839 jmp error_code
22840 CFI_ENDPROC
22841-END(invalid_op)
22842+ENDPROC(invalid_op)
22843
22844 ENTRY(coprocessor_segment_overrun)
22845 RING0_INT_FRAME
22846@@ -887,7 +1127,7 @@ ENTRY(coprocessor_segment_overrun)
22847 pushl_cfi $do_coprocessor_segment_overrun
22848 jmp error_code
22849 CFI_ENDPROC
22850-END(coprocessor_segment_overrun)
22851+ENDPROC(coprocessor_segment_overrun)
22852
22853 ENTRY(invalid_TSS)
22854 RING0_EC_FRAME
22855@@ -895,7 +1135,7 @@ ENTRY(invalid_TSS)
22856 pushl_cfi $do_invalid_TSS
22857 jmp error_code
22858 CFI_ENDPROC
22859-END(invalid_TSS)
22860+ENDPROC(invalid_TSS)
22861
22862 ENTRY(segment_not_present)
22863 RING0_EC_FRAME
22864@@ -903,7 +1143,7 @@ ENTRY(segment_not_present)
22865 pushl_cfi $do_segment_not_present
22866 jmp error_code
22867 CFI_ENDPROC
22868-END(segment_not_present)
22869+ENDPROC(segment_not_present)
22870
22871 ENTRY(stack_segment)
22872 RING0_EC_FRAME
22873@@ -911,7 +1151,7 @@ ENTRY(stack_segment)
22874 pushl_cfi $do_stack_segment
22875 jmp error_code
22876 CFI_ENDPROC
22877-END(stack_segment)
22878+ENDPROC(stack_segment)
22879
22880 ENTRY(alignment_check)
22881 RING0_EC_FRAME
22882@@ -919,7 +1159,7 @@ ENTRY(alignment_check)
22883 pushl_cfi $do_alignment_check
22884 jmp error_code
22885 CFI_ENDPROC
22886-END(alignment_check)
22887+ENDPROC(alignment_check)
22888
22889 ENTRY(divide_error)
22890 RING0_INT_FRAME
22891@@ -928,7 +1168,7 @@ ENTRY(divide_error)
22892 pushl_cfi $do_divide_error
22893 jmp error_code
22894 CFI_ENDPROC
22895-END(divide_error)
22896+ENDPROC(divide_error)
22897
22898 #ifdef CONFIG_X86_MCE
22899 ENTRY(machine_check)
22900@@ -938,7 +1178,7 @@ ENTRY(machine_check)
22901 pushl_cfi machine_check_vector
22902 jmp error_code
22903 CFI_ENDPROC
22904-END(machine_check)
22905+ENDPROC(machine_check)
22906 #endif
22907
22908 ENTRY(spurious_interrupt_bug)
22909@@ -948,7 +1188,7 @@ ENTRY(spurious_interrupt_bug)
22910 pushl_cfi $do_spurious_interrupt_bug
22911 jmp error_code
22912 CFI_ENDPROC
22913-END(spurious_interrupt_bug)
22914+ENDPROC(spurious_interrupt_bug)
22915
22916 #ifdef CONFIG_XEN
22917 /* Xen doesn't set %esp to be precisely what the normal sysenter
22918@@ -1057,7 +1297,7 @@ BUILD_INTERRUPT3(hyperv_callback_vector, HYPERVISOR_CALLBACK_VECTOR,
22919
22920 ENTRY(mcount)
22921 ret
22922-END(mcount)
22923+ENDPROC(mcount)
22924
22925 ENTRY(ftrace_caller)
22926 pushl %eax
22927@@ -1087,7 +1327,7 @@ ftrace_graph_call:
22928 .globl ftrace_stub
22929 ftrace_stub:
22930 ret
22931-END(ftrace_caller)
22932+ENDPROC(ftrace_caller)
22933
22934 ENTRY(ftrace_regs_caller)
22935 pushf /* push flags before compare (in cs location) */
22936@@ -1185,7 +1425,7 @@ trace:
22937 popl %ecx
22938 popl %eax
22939 jmp ftrace_stub
22940-END(mcount)
22941+ENDPROC(mcount)
22942 #endif /* CONFIG_DYNAMIC_FTRACE */
22943 #endif /* CONFIG_FUNCTION_TRACER */
22944
22945@@ -1203,7 +1443,7 @@ ENTRY(ftrace_graph_caller)
22946 popl %ecx
22947 popl %eax
22948 ret
22949-END(ftrace_graph_caller)
22950+ENDPROC(ftrace_graph_caller)
22951
22952 .globl return_to_handler
22953 return_to_handler:
22954@@ -1264,15 +1504,18 @@ error_code:
22955 movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart
22956 REG_TO_PTGS %ecx
22957 SET_KERNEL_GS %ecx
22958- movl $(__USER_DS), %ecx
22959+ movl $(__KERNEL_DS), %ecx
22960 movl %ecx, %ds
22961 movl %ecx, %es
22962+
22963+ pax_enter_kernel
22964+
22965 TRACE_IRQS_OFF
22966 movl %esp,%eax # pt_regs pointer
22967 call *%edi
22968 jmp ret_from_exception
22969 CFI_ENDPROC
22970-END(page_fault)
22971+ENDPROC(page_fault)
22972
22973 /*
22974 * Debug traps and NMI can happen at the one SYSENTER instruction
22975@@ -1315,7 +1558,7 @@ debug_stack_correct:
22976 call do_debug
22977 jmp ret_from_exception
22978 CFI_ENDPROC
22979-END(debug)
22980+ENDPROC(debug)
22981
22982 /*
22983 * NMI is doubly nasty. It can happen _while_ we're handling
22984@@ -1355,6 +1598,9 @@ nmi_stack_correct:
22985 xorl %edx,%edx # zero error code
22986 movl %esp,%eax # pt_regs pointer
22987 call do_nmi
22988+
22989+ pax_exit_kernel
22990+
22991 jmp restore_all_notrace
22992 CFI_ENDPROC
22993
22994@@ -1392,13 +1638,16 @@ nmi_espfix_stack:
22995 FIXUP_ESPFIX_STACK # %eax == %esp
22996 xorl %edx,%edx # zero error code
22997 call do_nmi
22998+
22999+ pax_exit_kernel
23000+
23001 RESTORE_REGS
23002 lss 12+4(%esp), %esp # back to espfix stack
23003 CFI_ADJUST_CFA_OFFSET -24
23004 jmp irq_return
23005 #endif
23006 CFI_ENDPROC
23007-END(nmi)
23008+ENDPROC(nmi)
23009
23010 ENTRY(int3)
23011 RING0_INT_FRAME
23012@@ -1411,14 +1660,14 @@ ENTRY(int3)
23013 call do_int3
23014 jmp ret_from_exception
23015 CFI_ENDPROC
23016-END(int3)
23017+ENDPROC(int3)
23018
23019 ENTRY(general_protection)
23020 RING0_EC_FRAME
23021 pushl_cfi $do_general_protection
23022 jmp error_code
23023 CFI_ENDPROC
23024-END(general_protection)
23025+ENDPROC(general_protection)
23026
23027 #ifdef CONFIG_KVM_GUEST
23028 ENTRY(async_page_fault)
23029@@ -1427,6 +1676,6 @@ ENTRY(async_page_fault)
23030 pushl_cfi $do_async_page_fault
23031 jmp error_code
23032 CFI_ENDPROC
23033-END(async_page_fault)
23034+ENDPROC(async_page_fault)
23035 #endif
23036
23037diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
23038index f0095a7..ec77893 100644
23039--- a/arch/x86/kernel/entry_64.S
23040+++ b/arch/x86/kernel/entry_64.S
23041@@ -59,6 +59,8 @@
23042 #include <asm/smap.h>
23043 #include <asm/pgtable_types.h>
23044 #include <linux/err.h>
23045+#include <asm/pgtable.h>
23046+#include <asm/alternative-asm.h>
23047
23048 /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this. */
23049 #include <linux/elf-em.h>
23050@@ -81,6 +83,431 @@ ENTRY(native_usergs_sysret64)
23051 ENDPROC(native_usergs_sysret64)
23052 #endif /* CONFIG_PARAVIRT */
23053
23054+ .macro ljmpq sel, off
23055+#if defined(CONFIG_MPSC) || defined(CONFIG_MCORE2) || defined (CONFIG_MATOM)
23056+ .byte 0x48; ljmp *1234f(%rip)
23057+ .pushsection .rodata
23058+ .align 16
23059+ 1234: .quad \off; .word \sel
23060+ .popsection
23061+#else
23062+ pushq $\sel
23063+ pushq $\off
23064+ lretq
23065+#endif
23066+ .endm
23067+
23068+ .macro pax_enter_kernel
23069+ pax_set_fptr_mask
23070+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23071+ call pax_enter_kernel
23072+#endif
23073+ .endm
23074+
23075+ .macro pax_exit_kernel
23076+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23077+ call pax_exit_kernel
23078+#endif
23079+
23080+ .endm
23081+
23082+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
23083+ENTRY(pax_enter_kernel)
23084+ pushq %rdi
23085+
23086+#ifdef CONFIG_PARAVIRT
23087+ PV_SAVE_REGS(CLBR_RDI)
23088+#endif
23089+
23090+#ifdef CONFIG_PAX_KERNEXEC
23091+ GET_CR0_INTO_RDI
23092+ bts $16,%rdi
23093+ jnc 3f
23094+ mov %cs,%edi
23095+ cmp $__KERNEL_CS,%edi
23096+ jnz 2f
23097+1:
23098+#endif
23099+
23100+#ifdef CONFIG_PAX_MEMORY_UDEREF
23101+ 661: jmp 111f
23102+ .pushsection .altinstr_replacement, "a"
23103+ 662: ASM_NOP2
23104+ .popsection
23105+ .pushsection .altinstructions, "a"
23106+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23107+ .popsection
23108+ GET_CR3_INTO_RDI
23109+ cmp $0,%dil
23110+ jnz 112f
23111+ mov $__KERNEL_DS,%edi
23112+ mov %edi,%ss
23113+ jmp 111f
23114+112: cmp $1,%dil
23115+ jz 113f
23116+ ud2
23117+113: sub $4097,%rdi
23118+ bts $63,%rdi
23119+ SET_RDI_INTO_CR3
23120+ mov $__UDEREF_KERNEL_DS,%edi
23121+ mov %edi,%ss
23122+111:
23123+#endif
23124+
23125+#ifdef CONFIG_PARAVIRT
23126+ PV_RESTORE_REGS(CLBR_RDI)
23127+#endif
23128+
23129+ popq %rdi
23130+ pax_force_retaddr
23131+ retq
23132+
23133+#ifdef CONFIG_PAX_KERNEXEC
23134+2: ljmpq __KERNEL_CS,1b
23135+3: ljmpq __KERNEXEC_KERNEL_CS,4f
23136+4: SET_RDI_INTO_CR0
23137+ jmp 1b
23138+#endif
23139+ENDPROC(pax_enter_kernel)
23140+
23141+ENTRY(pax_exit_kernel)
23142+ pushq %rdi
23143+
23144+#ifdef CONFIG_PARAVIRT
23145+ PV_SAVE_REGS(CLBR_RDI)
23146+#endif
23147+
23148+#ifdef CONFIG_PAX_KERNEXEC
23149+ mov %cs,%rdi
23150+ cmp $__KERNEXEC_KERNEL_CS,%edi
23151+ jz 2f
23152+ GET_CR0_INTO_RDI
23153+ bts $16,%rdi
23154+ jnc 4f
23155+1:
23156+#endif
23157+
23158+#ifdef CONFIG_PAX_MEMORY_UDEREF
23159+ 661: jmp 111f
23160+ .pushsection .altinstr_replacement, "a"
23161+ 662: ASM_NOP2
23162+ .popsection
23163+ .pushsection .altinstructions, "a"
23164+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23165+ .popsection
23166+ mov %ss,%edi
23167+ cmp $__UDEREF_KERNEL_DS,%edi
23168+ jnz 111f
23169+ GET_CR3_INTO_RDI
23170+ cmp $0,%dil
23171+ jz 112f
23172+ ud2
23173+112: add $4097,%rdi
23174+ bts $63,%rdi
23175+ SET_RDI_INTO_CR3
23176+ mov $__KERNEL_DS,%edi
23177+ mov %edi,%ss
23178+111:
23179+#endif
23180+
23181+#ifdef CONFIG_PARAVIRT
23182+ PV_RESTORE_REGS(CLBR_RDI);
23183+#endif
23184+
23185+ popq %rdi
23186+ pax_force_retaddr
23187+ retq
23188+
23189+#ifdef CONFIG_PAX_KERNEXEC
23190+2: GET_CR0_INTO_RDI
23191+ btr $16,%rdi
23192+ jnc 4f
23193+ ljmpq __KERNEL_CS,3f
23194+3: SET_RDI_INTO_CR0
23195+ jmp 1b
23196+4: ud2
23197+ jmp 4b
23198+#endif
23199+ENDPROC(pax_exit_kernel)
23200+#endif
23201+
23202+ .macro pax_enter_kernel_user
23203+ pax_set_fptr_mask
23204+#ifdef CONFIG_PAX_MEMORY_UDEREF
23205+ call pax_enter_kernel_user
23206+#endif
23207+ .endm
23208+
23209+ .macro pax_exit_kernel_user
23210+#ifdef CONFIG_PAX_MEMORY_UDEREF
23211+ call pax_exit_kernel_user
23212+#endif
23213+#ifdef CONFIG_PAX_RANDKSTACK
23214+ pushq %rax
23215+ pushq %r11
23216+ call pax_randomize_kstack
23217+ popq %r11
23218+ popq %rax
23219+#endif
23220+ .endm
23221+
23222+#ifdef CONFIG_PAX_MEMORY_UDEREF
23223+ENTRY(pax_enter_kernel_user)
23224+ pushq %rdi
23225+ pushq %rbx
23226+
23227+#ifdef CONFIG_PARAVIRT
23228+ PV_SAVE_REGS(CLBR_RDI)
23229+#endif
23230+
23231+ 661: jmp 111f
23232+ .pushsection .altinstr_replacement, "a"
23233+ 662: ASM_NOP2
23234+ .popsection
23235+ .pushsection .altinstructions, "a"
23236+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23237+ .popsection
23238+ GET_CR3_INTO_RDI
23239+ cmp $1,%dil
23240+ jnz 4f
23241+ sub $4097,%rdi
23242+ bts $63,%rdi
23243+ SET_RDI_INTO_CR3
23244+ jmp 3f
23245+111:
23246+
23247+ GET_CR3_INTO_RDI
23248+ mov %rdi,%rbx
23249+ add $__START_KERNEL_map,%rbx
23250+ sub phys_base(%rip),%rbx
23251+
23252+#ifdef CONFIG_PARAVIRT
23253+ cmpl $0, pv_info+PARAVIRT_enabled
23254+ jz 1f
23255+ pushq %rdi
23256+ i = 0
23257+ .rept USER_PGD_PTRS
23258+ mov i*8(%rbx),%rsi
23259+ mov $0,%sil
23260+ lea i*8(%rbx),%rdi
23261+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23262+ i = i + 1
23263+ .endr
23264+ popq %rdi
23265+ jmp 2f
23266+1:
23267+#endif
23268+
23269+ i = 0
23270+ .rept USER_PGD_PTRS
23271+ movb $0,i*8(%rbx)
23272+ i = i + 1
23273+ .endr
23274+
23275+2: SET_RDI_INTO_CR3
23276+
23277+#ifdef CONFIG_PAX_KERNEXEC
23278+ GET_CR0_INTO_RDI
23279+ bts $16,%rdi
23280+ SET_RDI_INTO_CR0
23281+#endif
23282+
23283+3:
23284+
23285+#ifdef CONFIG_PARAVIRT
23286+ PV_RESTORE_REGS(CLBR_RDI)
23287+#endif
23288+
23289+ popq %rbx
23290+ popq %rdi
23291+ pax_force_retaddr
23292+ retq
23293+4: ud2
23294+ENDPROC(pax_enter_kernel_user)
23295+
23296+ENTRY(pax_exit_kernel_user)
23297+ pushq %rdi
23298+ pushq %rbx
23299+
23300+#ifdef CONFIG_PARAVIRT
23301+ PV_SAVE_REGS(CLBR_RDI)
23302+#endif
23303+
23304+ GET_CR3_INTO_RDI
23305+ 661: jmp 1f
23306+ .pushsection .altinstr_replacement, "a"
23307+ 662: ASM_NOP2
23308+ .popsection
23309+ .pushsection .altinstructions, "a"
23310+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23311+ .popsection
23312+ cmp $0,%dil
23313+ jnz 3f
23314+ add $4097,%rdi
23315+ bts $63,%rdi
23316+ SET_RDI_INTO_CR3
23317+ jmp 2f
23318+1:
23319+
23320+ mov %rdi,%rbx
23321+
23322+#ifdef CONFIG_PAX_KERNEXEC
23323+ GET_CR0_INTO_RDI
23324+ btr $16,%rdi
23325+ jnc 3f
23326+ SET_RDI_INTO_CR0
23327+#endif
23328+
23329+ add $__START_KERNEL_map,%rbx
23330+ sub phys_base(%rip),%rbx
23331+
23332+#ifdef CONFIG_PARAVIRT
23333+ cmpl $0, pv_info+PARAVIRT_enabled
23334+ jz 1f
23335+ i = 0
23336+ .rept USER_PGD_PTRS
23337+ mov i*8(%rbx),%rsi
23338+ mov $0x67,%sil
23339+ lea i*8(%rbx),%rdi
23340+ call PARA_INDIRECT(pv_mmu_ops+PV_MMU_set_pgd_batched)
23341+ i = i + 1
23342+ .endr
23343+ jmp 2f
23344+1:
23345+#endif
23346+
23347+ i = 0
23348+ .rept USER_PGD_PTRS
23349+ movb $0x67,i*8(%rbx)
23350+ i = i + 1
23351+ .endr
23352+2:
23353+
23354+#ifdef CONFIG_PARAVIRT
23355+ PV_RESTORE_REGS(CLBR_RDI)
23356+#endif
23357+
23358+ popq %rbx
23359+ popq %rdi
23360+ pax_force_retaddr
23361+ retq
23362+3: ud2
23363+ENDPROC(pax_exit_kernel_user)
23364+#endif
23365+
23366+ .macro pax_enter_kernel_nmi
23367+ pax_set_fptr_mask
23368+
23369+#ifdef CONFIG_PAX_KERNEXEC
23370+ GET_CR0_INTO_RDI
23371+ bts $16,%rdi
23372+ jc 110f
23373+ SET_RDI_INTO_CR0
23374+ or $2,%ebx
23375+110:
23376+#endif
23377+
23378+#ifdef CONFIG_PAX_MEMORY_UDEREF
23379+ 661: jmp 111f
23380+ .pushsection .altinstr_replacement, "a"
23381+ 662: ASM_NOP2
23382+ .popsection
23383+ .pushsection .altinstructions, "a"
23384+ altinstruction_entry 661b, 662b, X86_FEATURE_PCID, 2, 2
23385+ .popsection
23386+ GET_CR3_INTO_RDI
23387+ cmp $0,%dil
23388+ jz 111f
23389+ sub $4097,%rdi
23390+ or $4,%ebx
23391+ bts $63,%rdi
23392+ SET_RDI_INTO_CR3
23393+ mov $__UDEREF_KERNEL_DS,%edi
23394+ mov %edi,%ss
23395+111:
23396+#endif
23397+ .endm
23398+
23399+ .macro pax_exit_kernel_nmi
23400+#ifdef CONFIG_PAX_KERNEXEC
23401+ btr $1,%ebx
23402+ jnc 110f
23403+ GET_CR0_INTO_RDI
23404+ btr $16,%rdi
23405+ SET_RDI_INTO_CR0
23406+110:
23407+#endif
23408+
23409+#ifdef CONFIG_PAX_MEMORY_UDEREF
23410+ btr $2,%ebx
23411+ jnc 111f
23412+ GET_CR3_INTO_RDI
23413+ add $4097,%rdi
23414+ bts $63,%rdi
23415+ SET_RDI_INTO_CR3
23416+ mov $__KERNEL_DS,%edi
23417+ mov %edi,%ss
23418+111:
23419+#endif
23420+ .endm
23421+
23422+ .macro pax_erase_kstack
23423+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23424+ call pax_erase_kstack
23425+#endif
23426+ .endm
23427+
23428+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
23429+ENTRY(pax_erase_kstack)
23430+ pushq %rdi
23431+ pushq %rcx
23432+ pushq %rax
23433+ pushq %r11
23434+
23435+ GET_THREAD_INFO(%r11)
23436+ mov TI_lowest_stack(%r11), %rdi
23437+ mov $-0xBEEF, %rax
23438+ std
23439+
23440+1: mov %edi, %ecx
23441+ and $THREAD_SIZE_asm - 1, %ecx
23442+ shr $3, %ecx
23443+ repne scasq
23444+ jecxz 2f
23445+
23446+ cmp $2*8, %ecx
23447+ jc 2f
23448+
23449+ mov $2*8, %ecx
23450+ repe scasq
23451+ jecxz 2f
23452+ jne 1b
23453+
23454+2: cld
23455+ or $2*8, %rdi
23456+ mov %esp, %ecx
23457+ sub %edi, %ecx
23458+
23459+ cmp $THREAD_SIZE_asm, %rcx
23460+ jb 3f
23461+ ud2
23462+3:
23463+
23464+ shr $3, %ecx
23465+ rep stosq
23466+
23467+ mov TI_task_thread_sp0(%r11), %rdi
23468+ sub $256, %rdi
23469+ mov %rdi, TI_lowest_stack(%r11)
23470+
23471+ popq %r11
23472+ popq %rax
23473+ popq %rcx
23474+ popq %rdi
23475+ pax_force_retaddr
23476+ ret
23477+ENDPROC(pax_erase_kstack)
23478+#endif
23479
23480 .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
23481 #ifdef CONFIG_TRACE_IRQFLAGS
23482@@ -117,7 +544,7 @@ ENDPROC(native_usergs_sysret64)
23483 .endm
23484
23485 .macro TRACE_IRQS_IRETQ_DEBUG offset=ARGOFFSET
23486- bt $9,EFLAGS-\offset(%rsp) /* interrupts off? */
23487+ bt $X86_EFLAGS_IF_BIT,EFLAGS-\offset(%rsp) /* interrupts off? */
23488 jnc 1f
23489 TRACE_IRQS_ON_DEBUG
23490 1:
23491@@ -243,9 +670,52 @@ ENTRY(save_paranoid)
23492 js 1f /* negative -> in kernel */
23493 SWAPGS
23494 xorl %ebx,%ebx
23495-1: ret
23496+1:
23497+#ifdef CONFIG_PAX_MEMORY_UDEREF
23498+ testb $3, CS+8(%rsp)
23499+ jnz 1f
23500+ pax_enter_kernel
23501+ jmp 2f
23502+1: pax_enter_kernel_user
23503+2:
23504+#else
23505+ pax_enter_kernel
23506+#endif
23507+ pax_force_retaddr
23508+ ret
23509 CFI_ENDPROC
23510-END(save_paranoid)
23511+ENDPROC(save_paranoid)
23512+
23513+ENTRY(save_paranoid_nmi)
23514+ XCPT_FRAME 1 RDI+8
23515+ cld
23516+ movq_cfi rdi, RDI+8
23517+ movq_cfi rsi, RSI+8
23518+ movq_cfi rdx, RDX+8
23519+ movq_cfi rcx, RCX+8
23520+ movq_cfi rax, RAX+8
23521+ movq_cfi r8, R8+8
23522+ movq_cfi r9, R9+8
23523+ movq_cfi r10, R10+8
23524+ movq_cfi r11, R11+8
23525+ movq_cfi rbx, RBX+8
23526+ movq_cfi rbp, RBP+8
23527+ movq_cfi r12, R12+8
23528+ movq_cfi r13, R13+8
23529+ movq_cfi r14, R14+8
23530+ movq_cfi r15, R15+8
23531+ movl $1,%ebx
23532+ movl $MSR_GS_BASE,%ecx
23533+ rdmsr
23534+ testl %edx,%edx
23535+ js 1f /* negative -> in kernel */
23536+ SWAPGS
23537+ xorl %ebx,%ebx
23538+1: pax_enter_kernel_nmi
23539+ pax_force_retaddr
23540+ ret
23541+ CFI_ENDPROC
23542+ENDPROC(save_paranoid_nmi)
23543
23544 /*
23545 * A newly forked process directly context switches into this address.
23546@@ -266,7 +736,7 @@ ENTRY(ret_from_fork)
23547
23548 RESTORE_REST
23549
23550- testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23551+ testb $3, CS-ARGOFFSET(%rsp) # from kernel_thread?
23552 jz 1f
23553
23554 /*
23555@@ -279,15 +749,13 @@ ENTRY(ret_from_fork)
23556 jmp int_ret_from_sys_call
23557
23558 1:
23559- subq $REST_SKIP, %rsp # leave space for volatiles
23560- CFI_ADJUST_CFA_OFFSET REST_SKIP
23561 movq %rbp, %rdi
23562 call *%rbx
23563 movl $0, RAX(%rsp)
23564 RESTORE_REST
23565 jmp int_ret_from_sys_call
23566 CFI_ENDPROC
23567-END(ret_from_fork)
23568+ENDPROC(ret_from_fork)
23569
23570 /*
23571 * System call entry. Up to 6 arguments in registers are supported.
23572@@ -324,7 +792,7 @@ END(ret_from_fork)
23573 ENTRY(system_call)
23574 CFI_STARTPROC simple
23575 CFI_SIGNAL_FRAME
23576- CFI_DEF_CFA rsp,KERNEL_STACK_OFFSET
23577+ CFI_DEF_CFA rsp,0
23578 CFI_REGISTER rip,rcx
23579 /*CFI_REGISTER rflags,r11*/
23580 SWAPGS_UNSAFE_STACK
23581@@ -337,16 +805,23 @@ GLOBAL(system_call_after_swapgs)
23582
23583 movq %rsp,PER_CPU_VAR(old_rsp)
23584 movq PER_CPU_VAR(kernel_stack),%rsp
23585+ SAVE_ARGS 8*6, 0, rax_enosys=1
23586+ pax_enter_kernel_user
23587+
23588+#ifdef CONFIG_PAX_RANDKSTACK
23589+ pax_erase_kstack
23590+#endif
23591+
23592 /*
23593 * No need to follow this irqs off/on section - it's straight
23594 * and short:
23595 */
23596 ENABLE_INTERRUPTS(CLBR_NONE)
23597- SAVE_ARGS 8, 0, rax_enosys=1
23598 movq_cfi rax,(ORIG_RAX-ARGOFFSET)
23599 movq %rcx,RIP-ARGOFFSET(%rsp)
23600 CFI_REL_OFFSET rip,RIP-ARGOFFSET
23601- testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23602+ GET_THREAD_INFO(%rcx)
23603+ testl $_TIF_WORK_SYSCALL_ENTRY,TI_flags(%rcx)
23604 jnz tracesys
23605 system_call_fastpath:
23606 #if __SYSCALL_MASK == ~0
23607@@ -376,10 +851,13 @@ ret_from_sys_call:
23608 * flags (TIF_NOTIFY_RESUME, TIF_USER_RETURN_NOTIFY, etc) set is
23609 * very bad.
23610 */
23611- testl $_TIF_ALLWORK_MASK,TI_flags+THREAD_INFO(%rsp,RIP-ARGOFFSET)
23612+ GET_THREAD_INFO(%rcx)
23613+ testl $_TIF_ALLWORK_MASK,TI_flags(%rcx)
23614 jnz int_ret_from_sys_call_fixup /* Go the the slow path */
23615
23616 CFI_REMEMBER_STATE
23617+ pax_exit_kernel_user
23618+ pax_erase_kstack
23619 /*
23620 * sysretq will re-enable interrupts:
23621 */
23622@@ -399,12 +877,15 @@ int_ret_from_sys_call_fixup:
23623
23624 /* Do syscall tracing */
23625 tracesys:
23626- leaq -REST_SKIP(%rsp), %rdi
23627+ movq %rsp, %rdi
23628 movq $AUDIT_ARCH_X86_64, %rsi
23629 call syscall_trace_enter_phase1
23630 test %rax, %rax
23631 jnz tracesys_phase2 /* if needed, run the slow path */
23632- LOAD_ARGS 0 /* else restore clobbered regs */
23633+
23634+ pax_erase_kstack
23635+
23636+ LOAD_ARGS /* else restore clobbered regs */
23637 jmp system_call_fastpath /* and return to the fast path */
23638
23639 tracesys_phase2:
23640@@ -415,12 +896,14 @@ tracesys_phase2:
23641 movq %rax,%rdx
23642 call syscall_trace_enter_phase2
23643
23644+ pax_erase_kstack
23645+
23646 /*
23647 * Reload arg registers from stack in case ptrace changed them.
23648 * We don't reload %rax because syscall_trace_entry_phase2() returned
23649 * the value it wants us to use in the table lookup.
23650 */
23651- LOAD_ARGS ARGOFFSET, 1
23652+ LOAD_ARGS 1
23653 RESTORE_REST
23654 #if __SYSCALL_MASK == ~0
23655 cmpq $__NR_syscall_max,%rax
23656@@ -451,7 +934,9 @@ GLOBAL(int_with_check)
23657 andl %edi,%edx
23658 jnz int_careful
23659 andl $~TS_COMPAT,TI_status(%rcx)
23660- jmp retint_swapgs
23661+ pax_exit_kernel_user
23662+ pax_erase_kstack
23663+ jmp retint_swapgs_pax
23664
23665 /* Either reschedule or signal or syscall exit tracking needed. */
23666 /* First do a reschedule test. */
23667@@ -497,7 +982,7 @@ int_restore_rest:
23668 TRACE_IRQS_OFF
23669 jmp int_with_check
23670 CFI_ENDPROC
23671-END(system_call)
23672+ENDPROC(system_call)
23673
23674 .macro FORK_LIKE func
23675 ENTRY(stub_\func)
23676@@ -510,9 +995,10 @@ ENTRY(stub_\func)
23677 DEFAULT_FRAME 0 8 /* offset 8: return address */
23678 call sys_\func
23679 RESTORE_TOP_OF_STACK %r11, 8
23680- ret $REST_SKIP /* pop extended registers */
23681+ pax_force_retaddr
23682+ ret
23683 CFI_ENDPROC
23684-END(stub_\func)
23685+ENDPROC(stub_\func)
23686 .endm
23687
23688 .macro FIXED_FRAME label,func
23689@@ -522,9 +1008,10 @@ ENTRY(\label)
23690 FIXUP_TOP_OF_STACK %r11, 8-ARGOFFSET
23691 call \func
23692 RESTORE_TOP_OF_STACK %r11, 8-ARGOFFSET
23693+ pax_force_retaddr
23694 ret
23695 CFI_ENDPROC
23696-END(\label)
23697+ENDPROC(\label)
23698 .endm
23699
23700 FORK_LIKE clone
23701@@ -543,7 +1030,7 @@ ENTRY(stub_execve)
23702 RESTORE_REST
23703 jmp int_ret_from_sys_call
23704 CFI_ENDPROC
23705-END(stub_execve)
23706+ENDPROC(stub_execve)
23707
23708 ENTRY(stub_execveat)
23709 CFI_STARTPROC
23710@@ -557,7 +1044,7 @@ ENTRY(stub_execveat)
23711 RESTORE_REST
23712 jmp int_ret_from_sys_call
23713 CFI_ENDPROC
23714-END(stub_execveat)
23715+ENDPROC(stub_execveat)
23716
23717 /*
23718 * sigreturn is special because it needs to restore all registers on return.
23719@@ -574,7 +1061,7 @@ ENTRY(stub_rt_sigreturn)
23720 RESTORE_REST
23721 jmp int_ret_from_sys_call
23722 CFI_ENDPROC
23723-END(stub_rt_sigreturn)
23724+ENDPROC(stub_rt_sigreturn)
23725
23726 #ifdef CONFIG_X86_X32_ABI
23727 ENTRY(stub_x32_rt_sigreturn)
23728@@ -588,7 +1075,7 @@ ENTRY(stub_x32_rt_sigreturn)
23729 RESTORE_REST
23730 jmp int_ret_from_sys_call
23731 CFI_ENDPROC
23732-END(stub_x32_rt_sigreturn)
23733+ENDPROC(stub_x32_rt_sigreturn)
23734
23735 ENTRY(stub_x32_execve)
23736 CFI_STARTPROC
23737@@ -602,7 +1089,7 @@ ENTRY(stub_x32_execve)
23738 RESTORE_REST
23739 jmp int_ret_from_sys_call
23740 CFI_ENDPROC
23741-END(stub_x32_execve)
23742+ENDPROC(stub_x32_execve)
23743
23744 ENTRY(stub_x32_execveat)
23745 CFI_STARTPROC
23746@@ -616,7 +1103,7 @@ ENTRY(stub_x32_execveat)
23747 RESTORE_REST
23748 jmp int_ret_from_sys_call
23749 CFI_ENDPROC
23750-END(stub_x32_execveat)
23751+ENDPROC(stub_x32_execveat)
23752
23753 #endif
23754
23755@@ -653,7 +1140,7 @@ vector=vector+1
23756 2: jmp common_interrupt
23757 .endr
23758 CFI_ENDPROC
23759-END(irq_entries_start)
23760+ENDPROC(irq_entries_start)
23761
23762 .previous
23763 END(interrupt)
23764@@ -670,28 +1157,29 @@ END(interrupt)
23765 /* 0(%rsp): ~(interrupt number) */
23766 .macro interrupt func
23767 /* reserve pt_regs for scratch regs and rbp */
23768- subq $ORIG_RAX-RBP, %rsp
23769- CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
23770+ subq $ORIG_RAX, %rsp
23771+ CFI_ADJUST_CFA_OFFSET ORIG_RAX
23772 cld
23773- /* start from rbp in pt_regs and jump over */
23774- movq_cfi rdi, (RDI-RBP)
23775- movq_cfi rsi, (RSI-RBP)
23776- movq_cfi rdx, (RDX-RBP)
23777- movq_cfi rcx, (RCX-RBP)
23778- movq_cfi rax, (RAX-RBP)
23779- movq_cfi r8, (R8-RBP)
23780- movq_cfi r9, (R9-RBP)
23781- movq_cfi r10, (R10-RBP)
23782- movq_cfi r11, (R11-RBP)
23783+ /* start from r15 in pt_regs and jump over */
23784+ movq_cfi rdi, RDI
23785+ movq_cfi rsi, RSI
23786+ movq_cfi rdx, RDX
23787+ movq_cfi rcx, RCX
23788+ movq_cfi rax, RAX
23789+ movq_cfi r8, R8
23790+ movq_cfi r9, R9
23791+ movq_cfi r10, R10
23792+ movq_cfi r11, R11
23793+ movq_cfi r12, R12
23794
23795 /* Save rbp so that we can unwind from get_irq_regs() */
23796- movq_cfi rbp, 0
23797+ movq_cfi rbp, RBP
23798
23799 /* Save previous stack value */
23800 movq %rsp, %rsi
23801
23802- leaq -RBP(%rsp),%rdi /* arg1 for handler */
23803- testl $3, CS-RBP(%rsi)
23804+ movq %rsp,%rdi /* arg1 for handler */
23805+ testb $3, CS(%rsi)
23806 je 1f
23807 SWAPGS
23808 /*
23809@@ -711,6 +1199,18 @@ END(interrupt)
23810 0x06 /* DW_OP_deref */, \
23811 0x08 /* DW_OP_const1u */, SS+8-RBP, \
23812 0x22 /* DW_OP_plus */
23813+
23814+#ifdef CONFIG_PAX_MEMORY_UDEREF
23815+ testb $3, CS(%rdi)
23816+ jnz 1f
23817+ pax_enter_kernel
23818+ jmp 2f
23819+1: pax_enter_kernel_user
23820+2:
23821+#else
23822+ pax_enter_kernel
23823+#endif
23824+
23825 /* We entered an interrupt context - irqs are off: */
23826 TRACE_IRQS_OFF
23827
23828@@ -735,14 +1235,14 @@ ret_from_intr:
23829
23830 /* Restore saved previous stack */
23831 popq %rsi
23832- CFI_DEF_CFA rsi,SS+8-RBP /* reg/off reset after def_cfa_expr */
23833- leaq ARGOFFSET-RBP(%rsi), %rsp
23834+ CFI_DEF_CFA rsi,SS+8 /* reg/off reset after def_cfa_expr */
23835+ movq %rsi, %rsp
23836 CFI_DEF_CFA_REGISTER rsp
23837- CFI_ADJUST_CFA_OFFSET RBP-ARGOFFSET
23838+ CFI_ADJUST_CFA_OFFSET -ARGOFFSET
23839
23840 exit_intr:
23841 GET_THREAD_INFO(%rcx)
23842- testl $3,CS-ARGOFFSET(%rsp)
23843+ testb $3,CS-ARGOFFSET(%rsp)
23844 je retint_kernel
23845
23846 /* Interrupt came from user space */
23847@@ -764,14 +1264,16 @@ retint_swapgs: /* return to user-space */
23848 * The iretq could re-enable interrupts:
23849 */
23850 DISABLE_INTERRUPTS(CLBR_ANY)
23851+ pax_exit_kernel_user
23852+retint_swapgs_pax:
23853 TRACE_IRQS_IRETQ
23854
23855 /*
23856 * Try to use SYSRET instead of IRET if we're returning to
23857 * a completely clean 64-bit userspace context.
23858 */
23859- movq (RCX-R11)(%rsp), %rcx
23860- cmpq %rcx,(RIP-R11)(%rsp) /* RCX == RIP */
23861+ movq (RCX-ARGOFFSET)(%rsp), %rcx
23862+ cmpq %rcx,(RIP-ARGOFFSET)(%rsp) /* RCX == RIP */
23863 jne opportunistic_sysret_failed
23864
23865 /*
23866@@ -792,7 +1294,7 @@ retint_swapgs: /* return to user-space */
23867 shr $__VIRTUAL_MASK_SHIFT, %rcx
23868 jnz opportunistic_sysret_failed
23869
23870- cmpq $__USER_CS,(CS-R11)(%rsp) /* CS must match SYSRET */
23871+ cmpq $__USER_CS,(CS-ARGOFFSET)(%rsp) /* CS must match SYSRET */
23872 jne opportunistic_sysret_failed
23873
23874 movq (R11-ARGOFFSET)(%rsp), %r11
23875@@ -838,6 +1340,27 @@ opportunistic_sysret_failed:
23876
23877 retint_restore_args: /* return to kernel space */
23878 DISABLE_INTERRUPTS(CLBR_ANY)
23879+ pax_exit_kernel
23880+
23881+#if defined(CONFIG_EFI) && defined(CONFIG_PAX_KERNEXEC)
23882+ /* This is a quirk to allow IRQs/NMIs/MCEs during early EFI setup,
23883+ * namely calling EFI runtime services with a phys mapping. We're
23884+ * starting off with NOPs and patch in the real instrumentation
23885+ * (BTS/OR) before starting any userland process; even before starting
23886+ * up the APs.
23887+ */
23888+ .pushsection .altinstr_replacement, "a"
23889+ 601: pax_force_retaddr (RIP-ARGOFFSET)
23890+ 602:
23891+ .popsection
23892+ 603: .fill 602b-601b, 1, 0x90
23893+ .pushsection .altinstructions, "a"
23894+ altinstruction_entry 603b, 601b, X86_FEATURE_ALWAYS, 602b-601b, 602b-601b
23895+ .popsection
23896+#else
23897+ pax_force_retaddr (RIP-ARGOFFSET)
23898+#endif
23899+
23900 /*
23901 * The iretq could re-enable interrupts:
23902 */
23903@@ -875,15 +1398,15 @@ native_irq_return_ldt:
23904 SWAPGS
23905 movq PER_CPU_VAR(espfix_waddr),%rdi
23906 movq %rax,(0*8)(%rdi) /* RAX */
23907- movq (2*8)(%rsp),%rax /* RIP */
23908+ movq (2*8 + RIP-RIP)(%rsp),%rax /* RIP */
23909 movq %rax,(1*8)(%rdi)
23910- movq (3*8)(%rsp),%rax /* CS */
23911+ movq (2*8 + CS-RIP)(%rsp),%rax /* CS */
23912 movq %rax,(2*8)(%rdi)
23913- movq (4*8)(%rsp),%rax /* RFLAGS */
23914+ movq (2*8 + EFLAGS-RIP)(%rsp),%rax /* RFLAGS */
23915 movq %rax,(3*8)(%rdi)
23916- movq (6*8)(%rsp),%rax /* SS */
23917+ movq (2*8 + SS-RIP)(%rsp),%rax /* SS */
23918 movq %rax,(5*8)(%rdi)
23919- movq (5*8)(%rsp),%rax /* RSP */
23920+ movq (2*8 + RSP-RIP)(%rsp),%rax /* RSP */
23921 movq %rax,(4*8)(%rdi)
23922 andl $0xffff0000,%eax
23923 popq_cfi %rdi
23924@@ -937,7 +1460,7 @@ ENTRY(retint_kernel)
23925 jmp exit_intr
23926 #endif
23927 CFI_ENDPROC
23928-END(common_interrupt)
23929+ENDPROC(common_interrupt)
23930
23931 /*
23932 * APIC interrupts.
23933@@ -951,7 +1474,7 @@ ENTRY(\sym)
23934 interrupt \do_sym
23935 jmp ret_from_intr
23936 CFI_ENDPROC
23937-END(\sym)
23938+ENDPROC(\sym)
23939 .endm
23940
23941 #ifdef CONFIG_TRACING
23942@@ -1024,7 +1547,7 @@ apicinterrupt IRQ_WORK_VECTOR \
23943 /*
23944 * Exception entry points.
23945 */
23946-#define INIT_TSS_IST(x) PER_CPU_VAR(init_tss) + (TSS_ist + ((x) - 1) * 8)
23947+#define INIT_TSS_IST(x) (TSS_ist + ((x) - 1) * 8)(%r13)
23948
23949 .macro idtentry sym do_sym has_error_code:req paranoid=0 shift_ist=-1
23950 ENTRY(\sym)
23951@@ -1080,6 +1603,12 @@ ENTRY(\sym)
23952 .endif
23953
23954 .if \shift_ist != -1
23955+#ifdef CONFIG_SMP
23956+ imul $TSS_size, PER_CPU_VAR(cpu_number), %r13d
23957+ lea init_tss(%r13), %r13
23958+#else
23959+ lea init_tss(%rip), %r13
23960+#endif
23961 subq $EXCEPTION_STKSZ, INIT_TSS_IST(\shift_ist)
23962 .endif
23963
23964@@ -1126,7 +1655,7 @@ ENTRY(\sym)
23965 .endif
23966
23967 CFI_ENDPROC
23968-END(\sym)
23969+ENDPROC(\sym)
23970 .endm
23971
23972 #ifdef CONFIG_TRACING
23973@@ -1167,9 +1696,10 @@ gs_change:
23974 2: mfence /* workaround */
23975 SWAPGS
23976 popfq_cfi
23977+ pax_force_retaddr
23978 ret
23979 CFI_ENDPROC
23980-END(native_load_gs_index)
23981+ENDPROC(native_load_gs_index)
23982
23983 _ASM_EXTABLE(gs_change,bad_gs)
23984 .section .fixup,"ax"
23985@@ -1197,9 +1727,10 @@ ENTRY(do_softirq_own_stack)
23986 CFI_DEF_CFA_REGISTER rsp
23987 CFI_ADJUST_CFA_OFFSET -8
23988 decl PER_CPU_VAR(irq_count)
23989+ pax_force_retaddr
23990 ret
23991 CFI_ENDPROC
23992-END(do_softirq_own_stack)
23993+ENDPROC(do_softirq_own_stack)
23994
23995 #ifdef CONFIG_XEN
23996 idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
23997@@ -1240,7 +1771,7 @@ ENTRY(xen_do_hypervisor_callback) # do_hypervisor_callback(struct *pt_regs)
23998 #endif
23999 jmp error_exit
24000 CFI_ENDPROC
24001-END(xen_do_hypervisor_callback)
24002+ENDPROC(xen_do_hypervisor_callback)
24003
24004 /*
24005 * Hypervisor uses this for application faults while it executes.
24006@@ -1299,7 +1830,7 @@ ENTRY(xen_failsafe_callback)
24007 SAVE_ALL
24008 jmp error_exit
24009 CFI_ENDPROC
24010-END(xen_failsafe_callback)
24011+ENDPROC(xen_failsafe_callback)
24012
24013 apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \
24014 xen_hvm_callback_vector xen_evtchn_do_upcall
24015@@ -1344,18 +1875,25 @@ ENTRY(paranoid_exit)
24016 DEFAULT_FRAME
24017 DISABLE_INTERRUPTS(CLBR_NONE)
24018 TRACE_IRQS_OFF_DEBUG
24019- testl %ebx,%ebx /* swapgs needed? */
24020+ testl $1,%ebx /* swapgs needed? */
24021 jnz paranoid_restore
24022+#ifdef CONFIG_PAX_MEMORY_UDEREF
24023+ pax_exit_kernel_user
24024+#else
24025+ pax_exit_kernel
24026+#endif
24027 TRACE_IRQS_IRETQ 0
24028 SWAPGS_UNSAFE_STACK
24029 RESTORE_ALL 8
24030 INTERRUPT_RETURN
24031 paranoid_restore:
24032+ pax_exit_kernel
24033 TRACE_IRQS_IRETQ_DEBUG 0
24034 RESTORE_ALL 8
24035+ pax_force_retaddr_bts
24036 INTERRUPT_RETURN
24037 CFI_ENDPROC
24038-END(paranoid_exit)
24039+ENDPROC(paranoid_exit)
24040
24041 /*
24042 * Exception entry point. This expects an error code/orig_rax on the stack.
24043@@ -1382,12 +1920,23 @@ ENTRY(error_entry)
24044 movq %r14, R14+8(%rsp)
24045 movq %r15, R15+8(%rsp)
24046 xorl %ebx,%ebx
24047- testl $3,CS+8(%rsp)
24048+ testb $3,CS+8(%rsp)
24049 je error_kernelspace
24050 error_swapgs:
24051 SWAPGS
24052 error_sti:
24053+#ifdef CONFIG_PAX_MEMORY_UDEREF
24054+ testb $3, CS+8(%rsp)
24055+ jnz 1f
24056+ pax_enter_kernel
24057+ jmp 2f
24058+1: pax_enter_kernel_user
24059+2:
24060+#else
24061+ pax_enter_kernel
24062+#endif
24063 TRACE_IRQS_OFF
24064+ pax_force_retaddr
24065 ret
24066
24067 /*
24068@@ -1422,7 +1971,7 @@ error_bad_iret:
24069 decl %ebx /* Return to usergs */
24070 jmp error_sti
24071 CFI_ENDPROC
24072-END(error_entry)
24073+ENDPROC(error_entry)
24074
24075
24076 /* ebx: no swapgs flag (1: don't need swapgs, 0: need it) */
24077@@ -1433,7 +1982,7 @@ ENTRY(error_exit)
24078 DISABLE_INTERRUPTS(CLBR_NONE)
24079 TRACE_IRQS_OFF
24080 GET_THREAD_INFO(%rcx)
24081- testl %eax,%eax
24082+ testl $1,%eax
24083 jne retint_kernel
24084 LOCKDEP_SYS_EXIT_IRQ
24085 movl TI_flags(%rcx),%edx
24086@@ -1442,7 +1991,7 @@ ENTRY(error_exit)
24087 jnz retint_careful
24088 jmp retint_swapgs
24089 CFI_ENDPROC
24090-END(error_exit)
24091+ENDPROC(error_exit)
24092
24093 /*
24094 * Test if a given stack is an NMI stack or not.
24095@@ -1500,9 +2049,11 @@ ENTRY(nmi)
24096 * If %cs was not the kernel segment, then the NMI triggered in user
24097 * space, which means it is definitely not nested.
24098 */
24099+ cmpl $__KERNEXEC_KERNEL_CS, 16(%rsp)
24100+ je 1f
24101 cmpl $__KERNEL_CS, 16(%rsp)
24102 jne first_nmi
24103-
24104+1:
24105 /*
24106 * Check the special variable on the stack to see if NMIs are
24107 * executing.
24108@@ -1536,8 +2087,7 @@ nested_nmi:
24109
24110 1:
24111 /* Set up the interrupted NMIs stack to jump to repeat_nmi */
24112- leaq -1*8(%rsp), %rdx
24113- movq %rdx, %rsp
24114+ subq $8, %rsp
24115 CFI_ADJUST_CFA_OFFSET 1*8
24116 leaq -10*8(%rsp), %rdx
24117 pushq_cfi $__KERNEL_DS
24118@@ -1555,6 +2105,7 @@ nested_nmi_out:
24119 CFI_RESTORE rdx
24120
24121 /* No need to check faults here */
24122+# pax_force_retaddr_bts
24123 INTERRUPT_RETURN
24124
24125 CFI_RESTORE_STATE
24126@@ -1651,13 +2202,13 @@ end_repeat_nmi:
24127 subq $ORIG_RAX-R15, %rsp
24128 CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
24129 /*
24130- * Use save_paranoid to handle SWAPGS, but no need to use paranoid_exit
24131+ * Use save_paranoid_nmi to handle SWAPGS, but no need to use paranoid_exit
24132 * as we should not be calling schedule in NMI context.
24133 * Even with normal interrupts enabled. An NMI should not be
24134 * setting NEED_RESCHED or anything that normal interrupts and
24135 * exceptions might do.
24136 */
24137- call save_paranoid
24138+ call save_paranoid_nmi
24139 DEFAULT_FRAME 0
24140
24141 /*
24142@@ -1667,9 +2218,9 @@ end_repeat_nmi:
24143 * NMI itself takes a page fault, the page fault that was preempted
24144 * will read the information from the NMI page fault and not the
24145 * origin fault. Save it off and restore it if it changes.
24146- * Use the r12 callee-saved register.
24147+ * Use the r13 callee-saved register.
24148 */
24149- movq %cr2, %r12
24150+ movq %cr2, %r13
24151
24152 /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
24153 movq %rsp,%rdi
24154@@ -1678,29 +2229,34 @@ end_repeat_nmi:
24155
24156 /* Did the NMI take a page fault? Restore cr2 if it did */
24157 movq %cr2, %rcx
24158- cmpq %rcx, %r12
24159+ cmpq %rcx, %r13
24160 je 1f
24161- movq %r12, %cr2
24162+ movq %r13, %cr2
24163 1:
24164
24165- testl %ebx,%ebx /* swapgs needed? */
24166+ testl $1,%ebx /* swapgs needed? */
24167 jnz nmi_restore
24168 nmi_swapgs:
24169 SWAPGS_UNSAFE_STACK
24170 nmi_restore:
24171+ pax_exit_kernel_nmi
24172 /* Pop the extra iret frame at once */
24173 RESTORE_ALL 6*8
24174+ testb $3, 8(%rsp)
24175+ jnz 1f
24176+ pax_force_retaddr_bts
24177+1:
24178
24179 /* Clear the NMI executing stack variable */
24180 movq $0, 5*8(%rsp)
24181 jmp irq_return
24182 CFI_ENDPROC
24183-END(nmi)
24184+ENDPROC(nmi)
24185
24186 ENTRY(ignore_sysret)
24187 CFI_STARTPROC
24188 mov $-ENOSYS,%eax
24189 sysret
24190 CFI_ENDPROC
24191-END(ignore_sysret)
24192+ENDPROC(ignore_sysret)
24193
24194diff --git a/arch/x86/kernel/espfix_64.c b/arch/x86/kernel/espfix_64.c
24195index f5d0730..5bce89c 100644
24196--- a/arch/x86/kernel/espfix_64.c
24197+++ b/arch/x86/kernel/espfix_64.c
24198@@ -70,8 +70,7 @@ static DEFINE_MUTEX(espfix_init_mutex);
24199 #define ESPFIX_MAX_PAGES DIV_ROUND_UP(CONFIG_NR_CPUS, ESPFIX_STACKS_PER_PAGE)
24200 static void *espfix_pages[ESPFIX_MAX_PAGES];
24201
24202-static __page_aligned_bss pud_t espfix_pud_page[PTRS_PER_PUD]
24203- __aligned(PAGE_SIZE);
24204+static pud_t espfix_pud_page[PTRS_PER_PUD] __page_aligned_rodata;
24205
24206 static unsigned int page_random, slot_random;
24207
24208@@ -122,11 +121,17 @@ static void init_espfix_random(void)
24209 void __init init_espfix_bsp(void)
24210 {
24211 pgd_t *pgd_p;
24212+ unsigned long index = pgd_index(ESPFIX_BASE_ADDR);
24213
24214 /* Install the espfix pud into the kernel page directory */
24215- pgd_p = &init_level4_pgt[pgd_index(ESPFIX_BASE_ADDR)];
24216+ pgd_p = &init_level4_pgt[index];
24217 pgd_populate(&init_mm, pgd_p, (pud_t *)espfix_pud_page);
24218
24219+#ifdef CONFIG_PAX_PER_CPU_PGD
24220+ clone_pgd_range(get_cpu_pgd(0, kernel) + index, swapper_pg_dir + index, 1);
24221+ clone_pgd_range(get_cpu_pgd(0, user) + index, swapper_pg_dir + index, 1);
24222+#endif
24223+
24224 /* Randomize the locations */
24225 init_espfix_random();
24226
24227@@ -194,7 +199,7 @@ void init_espfix_ap(void)
24228 set_pte(&pte_p[n*PTE_STRIDE], pte);
24229
24230 /* Job is done for this CPU and any CPU which shares this page */
24231- ACCESS_ONCE(espfix_pages[page]) = stack_page;
24232+ ACCESS_ONCE_RW(espfix_pages[page]) = stack_page;
24233
24234 unlock_done:
24235 mutex_unlock(&espfix_init_mutex);
24236diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
24237index 8b7b0a5..2395f29 100644
24238--- a/arch/x86/kernel/ftrace.c
24239+++ b/arch/x86/kernel/ftrace.c
24240@@ -89,7 +89,7 @@ static unsigned long text_ip_addr(unsigned long ip)
24241 * kernel identity mapping to modify code.
24242 */
24243 if (within(ip, (unsigned long)_text, (unsigned long)_etext))
24244- ip = (unsigned long)__va(__pa_symbol(ip));
24245+ ip = (unsigned long)__va(__pa_symbol(ktla_ktva(ip)));
24246
24247 return ip;
24248 }
24249@@ -105,6 +105,8 @@ ftrace_modify_code_direct(unsigned long ip, unsigned const char *old_code,
24250 {
24251 unsigned char replaced[MCOUNT_INSN_SIZE];
24252
24253+ ip = ktla_ktva(ip);
24254+
24255 /*
24256 * Note: Due to modules and __init, code can
24257 * disappear and change, we need to protect against faulting
24258@@ -230,7 +232,7 @@ static int update_ftrace_func(unsigned long ip, void *new)
24259 unsigned char old[MCOUNT_INSN_SIZE];
24260 int ret;
24261
24262- memcpy(old, (void *)ip, MCOUNT_INSN_SIZE);
24263+ memcpy(old, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE);
24264
24265 ftrace_update_func = ip;
24266 /* Make sure the breakpoints see the ftrace_update_func update */
24267@@ -311,7 +313,7 @@ static int add_break(unsigned long ip, const char *old)
24268 unsigned char replaced[MCOUNT_INSN_SIZE];
24269 unsigned char brk = BREAKPOINT_INSTRUCTION;
24270
24271- if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
24272+ if (probe_kernel_read(replaced, (void *)ktla_ktva(ip), MCOUNT_INSN_SIZE))
24273 return -EFAULT;
24274
24275 /* Make sure it is what we expect it to be */
24276diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
24277index c4f8d46..2d63ae2 100644
24278--- a/arch/x86/kernel/head64.c
24279+++ b/arch/x86/kernel/head64.c
24280@@ -68,12 +68,12 @@ again:
24281 pgd = *pgd_p;
24282
24283 /*
24284- * The use of __START_KERNEL_map rather than __PAGE_OFFSET here is
24285- * critical -- __PAGE_OFFSET would point us back into the dynamic
24286+ * The use of __early_va rather than __va here is critical:
24287+ * __va would point us back into the dynamic
24288 * range and we might end up looping forever...
24289 */
24290 if (pgd)
24291- pud_p = (pudval_t *)((pgd & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24292+ pud_p = (pudval_t *)(__early_va(pgd & PTE_PFN_MASK));
24293 else {
24294 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24295 reset_early_page_tables();
24296@@ -83,13 +83,13 @@ again:
24297 pud_p = (pudval_t *)early_dynamic_pgts[next_early_pgt++];
24298 for (i = 0; i < PTRS_PER_PUD; i++)
24299 pud_p[i] = 0;
24300- *pgd_p = (pgdval_t)pud_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24301+ *pgd_p = (pgdval_t)__pa(pud_p) + _KERNPG_TABLE;
24302 }
24303 pud_p += pud_index(address);
24304 pud = *pud_p;
24305
24306 if (pud)
24307- pmd_p = (pmdval_t *)((pud & PTE_PFN_MASK) + __START_KERNEL_map - phys_base);
24308+ pmd_p = (pmdval_t *)(__early_va(pud & PTE_PFN_MASK));
24309 else {
24310 if (next_early_pgt >= EARLY_DYNAMIC_PAGE_TABLES) {
24311 reset_early_page_tables();
24312@@ -99,7 +99,7 @@ again:
24313 pmd_p = (pmdval_t *)early_dynamic_pgts[next_early_pgt++];
24314 for (i = 0; i < PTRS_PER_PMD; i++)
24315 pmd_p[i] = 0;
24316- *pud_p = (pudval_t)pmd_p - __START_KERNEL_map + phys_base + _KERNPG_TABLE;
24317+ *pud_p = (pudval_t)__pa(pmd_p) + _KERNPG_TABLE;
24318 }
24319 pmd = (physaddr & PMD_MASK) + early_pmd_flags;
24320 pmd_p[pmd_index(address)] = pmd;
24321@@ -180,7 +180,6 @@ asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data)
24322 if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
24323 early_printk("Kernel alive\n");
24324
24325- clear_page(init_level4_pgt);
24326 /* set init_level4_pgt kernel high mapping*/
24327 init_level4_pgt[511] = early_level4_pgt[511];
24328
24329diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
24330index f36bd42..0ab4474 100644
24331--- a/arch/x86/kernel/head_32.S
24332+++ b/arch/x86/kernel/head_32.S
24333@@ -26,6 +26,12 @@
24334 /* Physical address */
24335 #define pa(X) ((X) - __PAGE_OFFSET)
24336
24337+#ifdef CONFIG_PAX_KERNEXEC
24338+#define ta(X) (X)
24339+#else
24340+#define ta(X) ((X) - __PAGE_OFFSET)
24341+#endif
24342+
24343 /*
24344 * References to members of the new_cpu_data structure.
24345 */
24346@@ -55,11 +61,7 @@
24347 * and small than max_low_pfn, otherwise will waste some page table entries
24348 */
24349
24350-#if PTRS_PER_PMD > 1
24351-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD)
24352-#else
24353-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD)
24354-#endif
24355+#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE)
24356
24357 /* Number of possible pages in the lowmem region */
24358 LOWMEM_PAGES = (((1<<32) - __PAGE_OFFSET) >> PAGE_SHIFT)
24359@@ -78,6 +80,12 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_PAGES) * PAGE_SIZE
24360 RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24361
24362 /*
24363+ * Real beginning of normal "text" segment
24364+ */
24365+ENTRY(stext)
24366+ENTRY(_stext)
24367+
24368+/*
24369 * 32-bit kernel entrypoint; only used by the boot CPU. On entry,
24370 * %esi points to the real-mode code as a 32-bit pointer.
24371 * CS and DS must be 4 GB flat segments, but we don't depend on
24372@@ -85,6 +93,13 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE)
24373 * can.
24374 */
24375 __HEAD
24376+
24377+#ifdef CONFIG_PAX_KERNEXEC
24378+ jmp startup_32
24379+/* PaX: fill first page in .text with int3 to catch NULL derefs in kernel mode */
24380+.fill PAGE_SIZE-5,1,0xcc
24381+#endif
24382+
24383 ENTRY(startup_32)
24384 movl pa(stack_start),%ecx
24385
24386@@ -106,6 +121,59 @@ ENTRY(startup_32)
24387 2:
24388 leal -__PAGE_OFFSET(%ecx),%esp
24389
24390+#ifdef CONFIG_SMP
24391+ movl $pa(cpu_gdt_table),%edi
24392+ movl $__per_cpu_load,%eax
24393+ movw %ax,GDT_ENTRY_PERCPU * 8 + 2(%edi)
24394+ rorl $16,%eax
24395+ movb %al,GDT_ENTRY_PERCPU * 8 + 4(%edi)
24396+ movb %ah,GDT_ENTRY_PERCPU * 8 + 7(%edi)
24397+ movl $__per_cpu_end - 1,%eax
24398+ subl $__per_cpu_start,%eax
24399+ movw %ax,GDT_ENTRY_PERCPU * 8 + 0(%edi)
24400+#endif
24401+
24402+#ifdef CONFIG_PAX_MEMORY_UDEREF
24403+ movl $NR_CPUS,%ecx
24404+ movl $pa(cpu_gdt_table),%edi
24405+1:
24406+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c09700),GDT_ENTRY_KERNEL_DS * 8 + 4(%edi)
24407+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0fb00),GDT_ENTRY_DEFAULT_USER_CS * 8 + 4(%edi)
24408+ movl $((((__PAGE_OFFSET-1) & 0xf0000000) >> 12) | 0x00c0f300),GDT_ENTRY_DEFAULT_USER_DS * 8 + 4(%edi)
24409+ addl $PAGE_SIZE_asm,%edi
24410+ loop 1b
24411+#endif
24412+
24413+#ifdef CONFIG_PAX_KERNEXEC
24414+ movl $pa(boot_gdt),%edi
24415+ movl $__LOAD_PHYSICAL_ADDR,%eax
24416+ movw %ax,GDT_ENTRY_BOOT_CS * 8 + 2(%edi)
24417+ rorl $16,%eax
24418+ movb %al,GDT_ENTRY_BOOT_CS * 8 + 4(%edi)
24419+ movb %ah,GDT_ENTRY_BOOT_CS * 8 + 7(%edi)
24420+ rorl $16,%eax
24421+
24422+ ljmp $(__BOOT_CS),$1f
24423+1:
24424+
24425+ movl $NR_CPUS,%ecx
24426+ movl $pa(cpu_gdt_table),%edi
24427+ addl $__PAGE_OFFSET,%eax
24428+1:
24429+ movb $0xc0,GDT_ENTRY_KERNEL_CS * 8 + 6(%edi)
24430+ movb $0xc0,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 6(%edi)
24431+ movw %ax,GDT_ENTRY_KERNEL_CS * 8 + 2(%edi)
24432+ movw %ax,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 2(%edi)
24433+ rorl $16,%eax
24434+ movb %al,GDT_ENTRY_KERNEL_CS * 8 + 4(%edi)
24435+ movb %al,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 4(%edi)
24436+ movb %ah,GDT_ENTRY_KERNEL_CS * 8 + 7(%edi)
24437+ movb %ah,GDT_ENTRY_KERNEXEC_KERNEL_CS * 8 + 7(%edi)
24438+ rorl $16,%eax
24439+ addl $PAGE_SIZE_asm,%edi
24440+ loop 1b
24441+#endif
24442+
24443 /*
24444 * Clear BSS first so that there are no surprises...
24445 */
24446@@ -201,8 +269,11 @@ ENTRY(startup_32)
24447 movl %eax, pa(max_pfn_mapped)
24448
24449 /* Do early initialization of the fixmap area */
24450- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24451- movl %eax,pa(initial_pg_pmd+0x1000*KPMDS-8)
24452+#ifdef CONFIG_COMPAT_VDSO
24453+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_pg_pmd+0x1000*KPMDS-8)
24454+#else
24455+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_pg_pmd+0x1000*KPMDS-8)
24456+#endif
24457 #else /* Not PAE */
24458
24459 page_pde_offset = (__PAGE_OFFSET >> 20);
24460@@ -232,8 +303,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24461 movl %eax, pa(max_pfn_mapped)
24462
24463 /* Do early initialization of the fixmap area */
24464- movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,%eax
24465- movl %eax,pa(initial_page_table+0xffc)
24466+#ifdef CONFIG_COMPAT_VDSO
24467+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(initial_page_table+0xffc)
24468+#else
24469+ movl $pa(initial_pg_fixmap)+PDE_IDENT_ATTR,pa(initial_page_table+0xffc)
24470+#endif
24471 #endif
24472
24473 #ifdef CONFIG_PARAVIRT
24474@@ -247,9 +321,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
24475 cmpl $num_subarch_entries, %eax
24476 jae bad_subarch
24477
24478- movl pa(subarch_entries)(,%eax,4), %eax
24479- subl $__PAGE_OFFSET, %eax
24480- jmp *%eax
24481+ jmp *pa(subarch_entries)(,%eax,4)
24482
24483 bad_subarch:
24484 WEAK(lguest_entry)
24485@@ -261,10 +333,10 @@ WEAK(xen_entry)
24486 __INITDATA
24487
24488 subarch_entries:
24489- .long default_entry /* normal x86/PC */
24490- .long lguest_entry /* lguest hypervisor */
24491- .long xen_entry /* Xen hypervisor */
24492- .long default_entry /* Moorestown MID */
24493+ .long ta(default_entry) /* normal x86/PC */
24494+ .long ta(lguest_entry) /* lguest hypervisor */
24495+ .long ta(xen_entry) /* Xen hypervisor */
24496+ .long ta(default_entry) /* Moorestown MID */
24497 num_subarch_entries = (. - subarch_entries) / 4
24498 .previous
24499 #else
24500@@ -354,6 +426,7 @@ default_entry:
24501 movl pa(mmu_cr4_features),%eax
24502 movl %eax,%cr4
24503
24504+#ifdef CONFIG_X86_PAE
24505 testb $X86_CR4_PAE, %al # check if PAE is enabled
24506 jz enable_paging
24507
24508@@ -382,6 +455,9 @@ default_entry:
24509 /* Make changes effective */
24510 wrmsr
24511
24512+ btsl $_PAGE_BIT_NX-32,pa(__supported_pte_mask+4)
24513+#endif
24514+
24515 enable_paging:
24516
24517 /*
24518@@ -449,14 +525,20 @@ is486:
24519 1: movl $(__KERNEL_DS),%eax # reload all the segment registers
24520 movl %eax,%ss # after changing gdt.
24521
24522- movl $(__USER_DS),%eax # DS/ES contains default USER segment
24523+# movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment
24524 movl %eax,%ds
24525 movl %eax,%es
24526
24527 movl $(__KERNEL_PERCPU), %eax
24528 movl %eax,%fs # set this cpu's percpu
24529
24530+#ifdef CONFIG_CC_STACKPROTECTOR
24531 movl $(__KERNEL_STACK_CANARY),%eax
24532+#elif defined(CONFIG_PAX_MEMORY_UDEREF)
24533+ movl $(__USER_DS),%eax
24534+#else
24535+ xorl %eax,%eax
24536+#endif
24537 movl %eax,%gs
24538
24539 xorl %eax,%eax # Clear LDT
24540@@ -512,8 +594,11 @@ setup_once:
24541 * relocation. Manually set base address in stack canary
24542 * segment descriptor.
24543 */
24544- movl $gdt_page,%eax
24545+ movl $cpu_gdt_table,%eax
24546 movl $stack_canary,%ecx
24547+#ifdef CONFIG_SMP
24548+ addl $__per_cpu_load,%ecx
24549+#endif
24550 movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax)
24551 shrl $16, %ecx
24552 movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax)
24553@@ -548,7 +633,7 @@ ENTRY(early_idt_handler)
24554 cmpl $2,(%esp) # X86_TRAP_NMI
24555 je is_nmi # Ignore NMI
24556
24557- cmpl $2,%ss:early_recursion_flag
24558+ cmpl $1,%ss:early_recursion_flag
24559 je hlt_loop
24560 incl %ss:early_recursion_flag
24561
24562@@ -586,8 +671,8 @@ ENTRY(early_idt_handler)
24563 pushl (20+6*4)(%esp) /* trapno */
24564 pushl $fault_msg
24565 call printk
24566-#endif
24567 call dump_stack
24568+#endif
24569 hlt_loop:
24570 hlt
24571 jmp hlt_loop
24572@@ -607,8 +692,11 @@ ENDPROC(early_idt_handler)
24573 /* This is the default interrupt "handler" :-) */
24574 ALIGN
24575 ignore_int:
24576- cld
24577 #ifdef CONFIG_PRINTK
24578+ cmpl $2,%ss:early_recursion_flag
24579+ je hlt_loop
24580+ incl %ss:early_recursion_flag
24581+ cld
24582 pushl %eax
24583 pushl %ecx
24584 pushl %edx
24585@@ -617,9 +705,6 @@ ignore_int:
24586 movl $(__KERNEL_DS),%eax
24587 movl %eax,%ds
24588 movl %eax,%es
24589- cmpl $2,early_recursion_flag
24590- je hlt_loop
24591- incl early_recursion_flag
24592 pushl 16(%esp)
24593 pushl 24(%esp)
24594 pushl 32(%esp)
24595@@ -653,29 +738,34 @@ ENTRY(setup_once_ref)
24596 /*
24597 * BSS section
24598 */
24599-__PAGE_ALIGNED_BSS
24600- .align PAGE_SIZE
24601 #ifdef CONFIG_X86_PAE
24602+.section .initial_pg_pmd,"a",@progbits
24603 initial_pg_pmd:
24604 .fill 1024*KPMDS,4,0
24605 #else
24606+.section .initial_page_table,"a",@progbits
24607 ENTRY(initial_page_table)
24608 .fill 1024,4,0
24609 #endif
24610+.section .initial_pg_fixmap,"a",@progbits
24611 initial_pg_fixmap:
24612 .fill 1024,4,0
24613+.section .empty_zero_page,"a",@progbits
24614 ENTRY(empty_zero_page)
24615 .fill 4096,1,0
24616+.section .swapper_pg_dir,"a",@progbits
24617 ENTRY(swapper_pg_dir)
24618+#ifdef CONFIG_X86_PAE
24619+ .fill 4,8,0
24620+#else
24621 .fill 1024,4,0
24622+#endif
24623
24624 /*
24625 * This starts the data section.
24626 */
24627 #ifdef CONFIG_X86_PAE
24628-__PAGE_ALIGNED_DATA
24629- /* Page-aligned for the benefit of paravirt? */
24630- .align PAGE_SIZE
24631+.section .initial_page_table,"a",@progbits
24632 ENTRY(initial_page_table)
24633 .long pa(initial_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */
24634 # if KPMDS == 3
24635@@ -694,12 +784,20 @@ ENTRY(initial_page_table)
24636 # error "Kernel PMDs should be 1, 2 or 3"
24637 # endif
24638 .align PAGE_SIZE /* needs to be page-sized too */
24639+
24640+#ifdef CONFIG_PAX_PER_CPU_PGD
24641+ENTRY(cpu_pgd)
24642+ .rept 2*NR_CPUS
24643+ .fill 4,8,0
24644+ .endr
24645+#endif
24646+
24647 #endif
24648
24649 .data
24650 .balign 4
24651 ENTRY(stack_start)
24652- .long init_thread_union+THREAD_SIZE
24653+ .long init_thread_union+THREAD_SIZE-8
24654
24655 __INITRODATA
24656 int_msg:
24657@@ -727,7 +825,7 @@ fault_msg:
24658 * segment size, and 32-bit linear address value:
24659 */
24660
24661- .data
24662+.section .rodata,"a",@progbits
24663 .globl boot_gdt_descr
24664 .globl idt_descr
24665
24666@@ -736,7 +834,7 @@ fault_msg:
24667 .word 0 # 32 bit align gdt_desc.address
24668 boot_gdt_descr:
24669 .word __BOOT_DS+7
24670- .long boot_gdt - __PAGE_OFFSET
24671+ .long pa(boot_gdt)
24672
24673 .word 0 # 32-bit align idt_desc.address
24674 idt_descr:
24675@@ -747,7 +845,7 @@ idt_descr:
24676 .word 0 # 32 bit align gdt_desc.address
24677 ENTRY(early_gdt_descr)
24678 .word GDT_ENTRIES*8-1
24679- .long gdt_page /* Overwritten for secondary CPUs */
24680+ .long cpu_gdt_table /* Overwritten for secondary CPUs */
24681
24682 /*
24683 * The boot_gdt must mirror the equivalent in setup.S and is
24684@@ -756,5 +854,65 @@ ENTRY(early_gdt_descr)
24685 .align L1_CACHE_BYTES
24686 ENTRY(boot_gdt)
24687 .fill GDT_ENTRY_BOOT_CS,8,0
24688- .quad 0x00cf9a000000ffff /* kernel 4GB code at 0x00000000 */
24689- .quad 0x00cf92000000ffff /* kernel 4GB data at 0x00000000 */
24690+ .quad 0x00cf9b000000ffff /* kernel 4GB code at 0x00000000 */
24691+ .quad 0x00cf93000000ffff /* kernel 4GB data at 0x00000000 */
24692+
24693+ .align PAGE_SIZE_asm
24694+ENTRY(cpu_gdt_table)
24695+ .rept NR_CPUS
24696+ .quad 0x0000000000000000 /* NULL descriptor */
24697+ .quad 0x0000000000000000 /* 0x0b reserved */
24698+ .quad 0x0000000000000000 /* 0x13 reserved */
24699+ .quad 0x0000000000000000 /* 0x1b reserved */
24700+
24701+#ifdef CONFIG_PAX_KERNEXEC
24702+ .quad 0x00cf9b000000ffff /* 0x20 alternate kernel 4GB code at 0x00000000 */
24703+#else
24704+ .quad 0x0000000000000000 /* 0x20 unused */
24705+#endif
24706+
24707+ .quad 0x0000000000000000 /* 0x28 unused */
24708+ .quad 0x0000000000000000 /* 0x33 TLS entry 1 */
24709+ .quad 0x0000000000000000 /* 0x3b TLS entry 2 */
24710+ .quad 0x0000000000000000 /* 0x43 TLS entry 3 */
24711+ .quad 0x0000000000000000 /* 0x4b reserved */
24712+ .quad 0x0000000000000000 /* 0x53 reserved */
24713+ .quad 0x0000000000000000 /* 0x5b reserved */
24714+
24715+ .quad 0x00cf9b000000ffff /* 0x60 kernel 4GB code at 0x00000000 */
24716+ .quad 0x00cf93000000ffff /* 0x68 kernel 4GB data at 0x00000000 */
24717+ .quad 0x00cffb000000ffff /* 0x73 user 4GB code at 0x00000000 */
24718+ .quad 0x00cff3000000ffff /* 0x7b user 4GB data at 0x00000000 */
24719+
24720+ .quad 0x0000000000000000 /* 0x80 TSS descriptor */
24721+ .quad 0x0000000000000000 /* 0x88 LDT descriptor */
24722+
24723+ /*
24724+ * Segments used for calling PnP BIOS have byte granularity.
24725+ * The code segments and data segments have fixed 64k limits,
24726+ * the transfer segment sizes are set at run time.
24727+ */
24728+ .quad 0x00409b000000ffff /* 0x90 32-bit code */
24729+ .quad 0x00009b000000ffff /* 0x98 16-bit code */
24730+ .quad 0x000093000000ffff /* 0xa0 16-bit data */
24731+ .quad 0x0000930000000000 /* 0xa8 16-bit data */
24732+ .quad 0x0000930000000000 /* 0xb0 16-bit data */
24733+
24734+ /*
24735+ * The APM segments have byte granularity and their bases
24736+ * are set at run time. All have 64k limits.
24737+ */
24738+ .quad 0x00409b000000ffff /* 0xb8 APM CS code */
24739+ .quad 0x00009b000000ffff /* 0xc0 APM CS 16 code (16 bit) */
24740+ .quad 0x004093000000ffff /* 0xc8 APM DS data */
24741+
24742+ .quad 0x00c093000000ffff /* 0xd0 - ESPFIX SS */
24743+ .quad 0x0040930000000000 /* 0xd8 - PERCPU */
24744+ .quad 0x0040910000000017 /* 0xe0 - STACK_CANARY */
24745+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */
24746+ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */
24747+ .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */
24748+
24749+ /* Be sure this is zeroed to avoid false validations in Xen */
24750+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
24751+ .endr
24752diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
24753index 6fd514d9..55fd355 100644
24754--- a/arch/x86/kernel/head_64.S
24755+++ b/arch/x86/kernel/head_64.S
24756@@ -20,6 +20,8 @@
24757 #include <asm/processor-flags.h>
24758 #include <asm/percpu.h>
24759 #include <asm/nops.h>
24760+#include <asm/cpufeature.h>
24761+#include <asm/alternative-asm.h>
24762
24763 #ifdef CONFIG_PARAVIRT
24764 #include <asm/asm-offsets.h>
24765@@ -41,6 +43,12 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET)
24766 L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET)
24767 L4_START_KERNEL = pgd_index(__START_KERNEL_map)
24768 L3_START_KERNEL = pud_index(__START_KERNEL_map)
24769+L4_VMALLOC_START = pgd_index(VMALLOC_START)
24770+L3_VMALLOC_START = pud_index(VMALLOC_START)
24771+L4_VMALLOC_END = pgd_index(VMALLOC_END)
24772+L3_VMALLOC_END = pud_index(VMALLOC_END)
24773+L4_VMEMMAP_START = pgd_index(VMEMMAP_START)
24774+L3_VMEMMAP_START = pud_index(VMEMMAP_START)
24775
24776 .text
24777 __HEAD
24778@@ -89,11 +97,26 @@ startup_64:
24779 * Fixup the physical addresses in the page table
24780 */
24781 addq %rbp, early_level4_pgt + (L4_START_KERNEL*8)(%rip)
24782+ addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip)
24783+ addq %rbp, init_level4_pgt + (L4_VMALLOC_START*8)(%rip)
24784+ addq %rbp, init_level4_pgt + (L4_VMALLOC_END*8)(%rip)
24785+ addq %rbp, init_level4_pgt + (L4_VMEMMAP_START*8)(%rip)
24786+ addq %rbp, init_level4_pgt + (L4_START_KERNEL*8)(%rip)
24787
24788- addq %rbp, level3_kernel_pgt + (510*8)(%rip)
24789- addq %rbp, level3_kernel_pgt + (511*8)(%rip)
24790+ addq %rbp, level3_ident_pgt + (0*8)(%rip)
24791+#ifndef CONFIG_XEN
24792+ addq %rbp, level3_ident_pgt + (1*8)(%rip)
24793+#endif
24794
24795+ addq %rbp, level3_vmemmap_pgt + (L3_VMEMMAP_START*8)(%rip)
24796+
24797+ addq %rbp, level3_kernel_pgt + (L3_START_KERNEL*8)(%rip)
24798+ addq %rbp, level3_kernel_pgt + ((L3_START_KERNEL+1)*8)(%rip)
24799+
24800+ addq %rbp, level2_fixmap_pgt + (504*8)(%rip)
24801+ addq %rbp, level2_fixmap_pgt + (505*8)(%rip)
24802 addq %rbp, level2_fixmap_pgt + (506*8)(%rip)
24803+ addq %rbp, level2_fixmap_pgt + (507*8)(%rip)
24804
24805 /*
24806 * Set up the identity mapping for the switchover. These
24807@@ -174,11 +197,12 @@ ENTRY(secondary_startup_64)
24808 * after the boot processor executes this code.
24809 */
24810
24811+ orq $-1, %rbp
24812 movq $(init_level4_pgt - __START_KERNEL_map), %rax
24813 1:
24814
24815- /* Enable PAE mode and PGE */
24816- movl $(X86_CR4_PAE | X86_CR4_PGE), %ecx
24817+ /* Enable PAE mode and PSE/PGE */
24818+ movl $(X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE), %ecx
24819 movq %rcx, %cr4
24820
24821 /* Setup early boot stage 4 level pagetables. */
24822@@ -199,10 +223,21 @@ ENTRY(secondary_startup_64)
24823 movl $MSR_EFER, %ecx
24824 rdmsr
24825 btsl $_EFER_SCE, %eax /* Enable System Call */
24826- btl $20,%edi /* No Execute supported? */
24827+ btl $(X86_FEATURE_NX & 31),%edi /* No Execute supported? */
24828 jnc 1f
24829 btsl $_EFER_NX, %eax
24830+ cmpq $-1, %rbp
24831+ je 1f
24832 btsq $_PAGE_BIT_NX,early_pmd_flags(%rip)
24833+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_PAGE_OFFSET(%rip)
24834+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_START(%rip)
24835+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMALLOC_END(%rip)
24836+ btsq $_PAGE_BIT_NX, init_level4_pgt + 8*L4_VMEMMAP_START(%rip)
24837+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*504(%rip)
24838+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*505(%rip)
24839+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*506(%rip)
24840+ btsq $_PAGE_BIT_NX, level2_fixmap_pgt + 8*507(%rip)
24841+ btsq $_PAGE_BIT_NX, __supported_pte_mask(%rip)
24842 1: wrmsr /* Make changes effective */
24843
24844 /* Setup cr0 */
24845@@ -282,6 +317,7 @@ ENTRY(secondary_startup_64)
24846 * REX.W + FF /5 JMP m16:64 Jump far, absolute indirect,
24847 * address given in m16:64.
24848 */
24849+ pax_set_fptr_mask
24850 movq initial_code(%rip),%rax
24851 pushq $0 # fake return address to stop unwinder
24852 pushq $__KERNEL_CS # set correct cs
24853@@ -313,7 +349,7 @@ ENDPROC(start_cpu0)
24854 .quad INIT_PER_CPU_VAR(irq_stack_union)
24855
24856 GLOBAL(stack_start)
24857- .quad init_thread_union+THREAD_SIZE-8
24858+ .quad init_thread_union+THREAD_SIZE-16
24859 .word 0
24860 __FINITDATA
24861
24862@@ -391,7 +427,7 @@ ENTRY(early_idt_handler)
24863 call dump_stack
24864 #ifdef CONFIG_KALLSYMS
24865 leaq early_idt_ripmsg(%rip),%rdi
24866- movq 40(%rsp),%rsi # %rip again
24867+ movq 88(%rsp),%rsi # %rip again
24868 call __print_symbol
24869 #endif
24870 #endif /* EARLY_PRINTK */
24871@@ -420,6 +456,7 @@ ENDPROC(early_idt_handler)
24872 early_recursion_flag:
24873 .long 0
24874
24875+ .section .rodata,"a",@progbits
24876 #ifdef CONFIG_EARLY_PRINTK
24877 early_idt_msg:
24878 .asciz "PANIC: early exception %02lx rip %lx:%lx error %lx cr2 %lx\n"
24879@@ -447,29 +484,52 @@ NEXT_PAGE(early_level4_pgt)
24880 NEXT_PAGE(early_dynamic_pgts)
24881 .fill 512*EARLY_DYNAMIC_PAGE_TABLES,8,0
24882
24883- .data
24884+ .section .rodata,"a",@progbits
24885
24886-#ifndef CONFIG_XEN
24887 NEXT_PAGE(init_level4_pgt)
24888- .fill 512,8,0
24889-#else
24890-NEXT_PAGE(init_level4_pgt)
24891- .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24892 .org init_level4_pgt + L4_PAGE_OFFSET*8, 0
24893 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24894+ .org init_level4_pgt + L4_VMALLOC_START*8, 0
24895+ .quad level3_vmalloc_start_pgt - __START_KERNEL_map + _KERNPG_TABLE
24896+ .org init_level4_pgt + L4_VMALLOC_END*8, 0
24897+ .quad level3_vmalloc_end_pgt - __START_KERNEL_map + _KERNPG_TABLE
24898+ .org init_level4_pgt + L4_VMEMMAP_START*8, 0
24899+ .quad level3_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24900 .org init_level4_pgt + L4_START_KERNEL*8, 0
24901 /* (2^48-(2*1024*1024*1024))/(2^39) = 511 */
24902 .quad level3_kernel_pgt - __START_KERNEL_map + _PAGE_TABLE
24903
24904+#ifdef CONFIG_PAX_PER_CPU_PGD
24905+NEXT_PAGE(cpu_pgd)
24906+ .rept 2*NR_CPUS
24907+ .fill 512,8,0
24908+ .endr
24909+#endif
24910+
24911 NEXT_PAGE(level3_ident_pgt)
24912 .quad level2_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE
24913+#ifdef CONFIG_XEN
24914 .fill 511, 8, 0
24915+#else
24916+ .quad level2_ident_pgt + PAGE_SIZE - __START_KERNEL_map + _KERNPG_TABLE
24917+ .fill 510,8,0
24918+#endif
24919+
24920+NEXT_PAGE(level3_vmalloc_start_pgt)
24921+ .fill 512,8,0
24922+
24923+NEXT_PAGE(level3_vmalloc_end_pgt)
24924+ .fill 512,8,0
24925+
24926+NEXT_PAGE(level3_vmemmap_pgt)
24927+ .fill L3_VMEMMAP_START,8,0
24928+ .quad level2_vmemmap_pgt - __START_KERNEL_map + _KERNPG_TABLE
24929+
24930 NEXT_PAGE(level2_ident_pgt)
24931- /* Since I easily can, map the first 1G.
24932+ /* Since I easily can, map the first 2G.
24933 * Don't set NX because code runs from these pages.
24934 */
24935- PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, PTRS_PER_PMD)
24936-#endif
24937+ PMDS(0, __PAGE_KERNEL_IDENT_LARGE_EXEC, 2*PTRS_PER_PMD)
24938
24939 NEXT_PAGE(level3_kernel_pgt)
24940 .fill L3_START_KERNEL,8,0
24941@@ -477,6 +537,9 @@ NEXT_PAGE(level3_kernel_pgt)
24942 .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE
24943 .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24944
24945+NEXT_PAGE(level2_vmemmap_pgt)
24946+ .fill 512,8,0
24947+
24948 NEXT_PAGE(level2_kernel_pgt)
24949 /*
24950 * 512 MB kernel mapping. We spend a full page on this pagetable
24951@@ -492,23 +555,59 @@ NEXT_PAGE(level2_kernel_pgt)
24952 KERNEL_IMAGE_SIZE/PMD_SIZE)
24953
24954 NEXT_PAGE(level2_fixmap_pgt)
24955- .fill 506,8,0
24956- .quad level1_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE
24957- /* 8MB reserved for vsyscalls + a 2MB hole = 4 + 1 entries */
24958- .fill 5,8,0
24959+ .fill 504,8,0
24960+ PMDS(level1_fixmap_pgt - __START_KERNEL_map, _PAGE_TABLE, 3)
24961+ .quad level1_vsyscall_pgt - __START_KERNEL_map + _PAGE_TABLE
24962+ /* 6MB reserved for vsyscalls + a 2MB hole = 3 + 1 entries */
24963+ .fill 4,8,0
24964
24965 NEXT_PAGE(level1_fixmap_pgt)
24966+ .fill 3*512,8,0
24967+
24968+NEXT_PAGE(level1_vsyscall_pgt)
24969 .fill 512,8,0
24970
24971 #undef PMDS
24972
24973- .data
24974+ .align PAGE_SIZE
24975+ENTRY(cpu_gdt_table)
24976+ .rept NR_CPUS
24977+ .quad 0x0000000000000000 /* NULL descriptor */
24978+ .quad 0x00cf9b000000ffff /* __KERNEL32_CS */
24979+ .quad 0x00af9b000000ffff /* __KERNEL_CS */
24980+ .quad 0x00cf93000000ffff /* __KERNEL_DS */
24981+ .quad 0x00cffb000000ffff /* __USER32_CS */
24982+ .quad 0x00cff3000000ffff /* __USER_DS, __USER32_DS */
24983+ .quad 0x00affb000000ffff /* __USER_CS */
24984+
24985+#ifdef CONFIG_PAX_KERNEXEC
24986+ .quad 0x00af9b000000ffff /* __KERNEXEC_KERNEL_CS */
24987+#else
24988+ .quad 0x0 /* unused */
24989+#endif
24990+
24991+ .quad 0,0 /* TSS */
24992+ .quad 0,0 /* LDT */
24993+ .quad 0,0,0 /* three TLS descriptors */
24994+ .quad 0x0000f40000000000 /* node/CPU stored in limit */
24995+ /* asm/segment.h:GDT_ENTRIES must match this */
24996+
24997+#ifdef CONFIG_PAX_MEMORY_UDEREF
24998+ .quad 0x00cf93000000ffff /* __UDEREF_KERNEL_DS */
24999+#else
25000+ .quad 0x0 /* unused */
25001+#endif
25002+
25003+ /* zero the remaining page */
25004+ .fill PAGE_SIZE / 8 - GDT_ENTRIES,8,0
25005+ .endr
25006+
25007 .align 16
25008 .globl early_gdt_descr
25009 early_gdt_descr:
25010 .word GDT_ENTRIES*8-1
25011 early_gdt_descr_base:
25012- .quad INIT_PER_CPU_VAR(gdt_page)
25013+ .quad cpu_gdt_table
25014
25015 ENTRY(phys_base)
25016 /* This must match the first entry in level2_kernel_pgt */
25017@@ -532,8 +631,8 @@ NEXT_PAGE(kasan_zero_pud)
25018
25019
25020 #include "../../x86/xen/xen-head.S"
25021-
25022- __PAGE_ALIGNED_BSS
25023+
25024+ .section .rodata,"a",@progbits
25025 NEXT_PAGE(empty_zero_page)
25026 .skip PAGE_SIZE
25027
25028diff --git a/arch/x86/kernel/i386_ksyms_32.c b/arch/x86/kernel/i386_ksyms_32.c
25029index 05fd74f..c3548b1 100644
25030--- a/arch/x86/kernel/i386_ksyms_32.c
25031+++ b/arch/x86/kernel/i386_ksyms_32.c
25032@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
25033 EXPORT_SYMBOL(cmpxchg8b_emu);
25034 #endif
25035
25036+EXPORT_SYMBOL_GPL(cpu_gdt_table);
25037+
25038 /* Networking helper routines. */
25039 EXPORT_SYMBOL(csum_partial_copy_generic);
25040+EXPORT_SYMBOL(csum_partial_copy_generic_to_user);
25041+EXPORT_SYMBOL(csum_partial_copy_generic_from_user);
25042
25043 EXPORT_SYMBOL(__get_user_1);
25044 EXPORT_SYMBOL(__get_user_2);
25045@@ -44,3 +48,11 @@ EXPORT_SYMBOL(___preempt_schedule);
25046 EXPORT_SYMBOL(___preempt_schedule_context);
25047 #endif
25048 #endif
25049+
25050+#ifdef CONFIG_PAX_KERNEXEC
25051+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
25052+#endif
25053+
25054+#ifdef CONFIG_PAX_PER_CPU_PGD
25055+EXPORT_SYMBOL(cpu_pgd);
25056+#endif
25057diff --git a/arch/x86/kernel/i387.c b/arch/x86/kernel/i387.c
25058index d5651fc..29c740d 100644
25059--- a/arch/x86/kernel/i387.c
25060+++ b/arch/x86/kernel/i387.c
25061@@ -68,7 +68,7 @@ static inline bool interrupted_kernel_fpu_idle(void)
25062 static inline bool interrupted_user_mode(void)
25063 {
25064 struct pt_regs *regs = get_irq_regs();
25065- return regs && user_mode_vm(regs);
25066+ return regs && user_mode(regs);
25067 }
25068
25069 /*
25070diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
25071index e7cc537..67d7372 100644
25072--- a/arch/x86/kernel/i8259.c
25073+++ b/arch/x86/kernel/i8259.c
25074@@ -110,7 +110,7 @@ static int i8259A_irq_pending(unsigned int irq)
25075 static void make_8259A_irq(unsigned int irq)
25076 {
25077 disable_irq_nosync(irq);
25078- io_apic_irqs &= ~(1<<irq);
25079+ io_apic_irqs &= ~(1UL<<irq);
25080 irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
25081 enable_irq(irq);
25082 }
25083@@ -208,7 +208,7 @@ spurious_8259A_irq:
25084 "spurious 8259A interrupt: IRQ%d.\n", irq);
25085 spurious_irq_mask |= irqmask;
25086 }
25087- atomic_inc(&irq_err_count);
25088+ atomic_inc_unchecked(&irq_err_count);
25089 /*
25090 * Theoretically we do not have to handle this IRQ,
25091 * but in Linux this does not cause problems and is
25092@@ -349,14 +349,16 @@ static void init_8259A(int auto_eoi)
25093 /* (slave's support for AEOI in flat mode is to be investigated) */
25094 outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR);
25095
25096+ pax_open_kernel();
25097 if (auto_eoi)
25098 /*
25099 * In AEOI mode we just have to mask the interrupt
25100 * when acking.
25101 */
25102- i8259A_chip.irq_mask_ack = disable_8259A_irq;
25103+ *(void **)&i8259A_chip.irq_mask_ack = disable_8259A_irq;
25104 else
25105- i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25106+ *(void **)&i8259A_chip.irq_mask_ack = mask_and_ack_8259A;
25107+ pax_close_kernel();
25108
25109 udelay(100); /* wait for 8259A to initialize */
25110
25111diff --git a/arch/x86/kernel/io_delay.c b/arch/x86/kernel/io_delay.c
25112index a979b5b..1d6db75 100644
25113--- a/arch/x86/kernel/io_delay.c
25114+++ b/arch/x86/kernel/io_delay.c
25115@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id)
25116 * Quirk table for systems that misbehave (lock up, etc.) if port
25117 * 0x80 is used:
25118 */
25119-static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {
25120+static const struct dmi_system_id __initconst io_delay_0xed_port_dmi_table[] = {
25121 {
25122 .callback = dmi_io_delay_0xed_port,
25123 .ident = "Compaq Presario V6000",
25124diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c
25125index 4ddaf66..49d5c18 100644
25126--- a/arch/x86/kernel/ioport.c
25127+++ b/arch/x86/kernel/ioport.c
25128@@ -6,6 +6,7 @@
25129 #include <linux/sched.h>
25130 #include <linux/kernel.h>
25131 #include <linux/capability.h>
25132+#include <linux/security.h>
25133 #include <linux/errno.h>
25134 #include <linux/types.h>
25135 #include <linux/ioport.h>
25136@@ -30,6 +31,12 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25137 return -EINVAL;
25138 if (turn_on && !capable(CAP_SYS_RAWIO))
25139 return -EPERM;
25140+#ifdef CONFIG_GRKERNSEC_IO
25141+ if (turn_on && grsec_disable_privio) {
25142+ gr_handle_ioperm();
25143+ return -ENODEV;
25144+ }
25145+#endif
25146
25147 /*
25148 * If it's the first ioperm() call in this thread's lifetime, set the
25149@@ -54,7 +61,7 @@ asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int turn_on)
25150 * because the ->io_bitmap_max value must match the bitmap
25151 * contents:
25152 */
25153- tss = &per_cpu(init_tss, get_cpu());
25154+ tss = init_tss + get_cpu();
25155
25156 if (turn_on)
25157 bitmap_clear(t->io_bitmap_ptr, from, num);
25158@@ -105,6 +112,12 @@ SYSCALL_DEFINE1(iopl, unsigned int, level)
25159 if (level > old) {
25160 if (!capable(CAP_SYS_RAWIO))
25161 return -EPERM;
25162+#ifdef CONFIG_GRKERNSEC_IO
25163+ if (grsec_disable_privio) {
25164+ gr_handle_iopl();
25165+ return -ENODEV;
25166+ }
25167+#endif
25168 }
25169 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
25170 t->iopl = level << 12;
25171diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
25172index 67b1cbe..6ad4cbc 100644
25173--- a/arch/x86/kernel/irq.c
25174+++ b/arch/x86/kernel/irq.c
25175@@ -22,7 +22,7 @@
25176 #define CREATE_TRACE_POINTS
25177 #include <asm/trace/irq_vectors.h>
25178
25179-atomic_t irq_err_count;
25180+atomic_unchecked_t irq_err_count;
25181
25182 /* Function pointer for generic interrupt vector handling */
25183 void (*x86_platform_ipi_callback)(void) = NULL;
25184@@ -132,9 +132,9 @@ int arch_show_interrupts(struct seq_file *p, int prec)
25185 seq_printf(p, "%10u ", irq_stats(j)->irq_hv_callback_count);
25186 seq_puts(p, " Hypervisor callback interrupts\n");
25187 #endif
25188- seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read(&irq_err_count));
25189+ seq_printf(p, "%*s: %10u\n", prec, "ERR", atomic_read_unchecked(&irq_err_count));
25190 #if defined(CONFIG_X86_IO_APIC)
25191- seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read(&irq_mis_count));
25192+ seq_printf(p, "%*s: %10u\n", prec, "MIS", atomic_read_unchecked(&irq_mis_count));
25193 #endif
25194 return 0;
25195 }
25196@@ -174,7 +174,7 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
25197
25198 u64 arch_irq_stat(void)
25199 {
25200- u64 sum = atomic_read(&irq_err_count);
25201+ u64 sum = atomic_read_unchecked(&irq_err_count);
25202 return sum;
25203 }
25204
25205diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
25206index 28d28f5..e6cc9ae 100644
25207--- a/arch/x86/kernel/irq_32.c
25208+++ b/arch/x86/kernel/irq_32.c
25209@@ -29,6 +29,8 @@ EXPORT_PER_CPU_SYMBOL(irq_regs);
25210
25211 #ifdef CONFIG_DEBUG_STACKOVERFLOW
25212
25213+extern void gr_handle_kernel_exploit(void);
25214+
25215 int sysctl_panic_on_stackoverflow __read_mostly;
25216
25217 /* Debugging check for stack overflow: is there less than 1KB free? */
25218@@ -39,13 +41,14 @@ static int check_stack_overflow(void)
25219 __asm__ __volatile__("andl %%esp,%0" :
25220 "=r" (sp) : "0" (THREAD_SIZE - 1));
25221
25222- return sp < (sizeof(struct thread_info) + STACK_WARN);
25223+ return sp < STACK_WARN;
25224 }
25225
25226 static void print_stack_overflow(void)
25227 {
25228 printk(KERN_WARNING "low stack detected by irq handler\n");
25229 dump_stack();
25230+ gr_handle_kernel_exploit();
25231 if (sysctl_panic_on_stackoverflow)
25232 panic("low stack detected by irq handler - check messages\n");
25233 }
25234@@ -77,10 +80,9 @@ static inline void *current_stack(void)
25235 static inline int
25236 execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25237 {
25238- struct irq_stack *curstk, *irqstk;
25239+ struct irq_stack *irqstk;
25240 u32 *isp, *prev_esp, arg1, arg2;
25241
25242- curstk = (struct irq_stack *) current_stack();
25243 irqstk = __this_cpu_read(hardirq_stack);
25244
25245 /*
25246@@ -89,15 +91,19 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25247 * handler) we can't do that and just have to keep using the
25248 * current stack (which is the irq stack already after all)
25249 */
25250- if (unlikely(curstk == irqstk))
25251+ if (unlikely((void *)current_stack_pointer - (void *)irqstk < THREAD_SIZE))
25252 return 0;
25253
25254- isp = (u32 *) ((char *)irqstk + sizeof(*irqstk));
25255+ isp = (u32 *) ((char *)irqstk + sizeof(*irqstk) - 8);
25256
25257 /* Save the next esp at the bottom of the stack */
25258 prev_esp = (u32 *)irqstk;
25259 *prev_esp = current_stack_pointer();
25260
25261+#ifdef CONFIG_PAX_MEMORY_UDEREF
25262+ __set_fs(MAKE_MM_SEG(0));
25263+#endif
25264+
25265 if (unlikely(overflow))
25266 call_on_stack(print_stack_overflow, isp);
25267
25268@@ -108,6 +114,11 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25269 : "0" (irq), "1" (desc), "2" (isp),
25270 "D" (desc->handle_irq)
25271 : "memory", "cc", "ecx");
25272+
25273+#ifdef CONFIG_PAX_MEMORY_UDEREF
25274+ __set_fs(current_thread_info()->addr_limit);
25275+#endif
25276+
25277 return 1;
25278 }
25279
25280@@ -116,32 +127,18 @@ execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq)
25281 */
25282 void irq_ctx_init(int cpu)
25283 {
25284- struct irq_stack *irqstk;
25285-
25286 if (per_cpu(hardirq_stack, cpu))
25287 return;
25288
25289- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25290- THREADINFO_GFP,
25291- THREAD_SIZE_ORDER));
25292- per_cpu(hardirq_stack, cpu) = irqstk;
25293-
25294- irqstk = page_address(alloc_pages_node(cpu_to_node(cpu),
25295- THREADINFO_GFP,
25296- THREAD_SIZE_ORDER));
25297- per_cpu(softirq_stack, cpu) = irqstk;
25298-
25299- printk(KERN_DEBUG "CPU %u irqstacks, hard=%p soft=%p\n",
25300- cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
25301+ per_cpu(hardirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25302+ per_cpu(softirq_stack, cpu) = page_address(alloc_pages_node(cpu_to_node(cpu), THREADINFO_GFP, THREAD_SIZE_ORDER));
25303 }
25304
25305 void do_softirq_own_stack(void)
25306 {
25307- struct thread_info *curstk;
25308 struct irq_stack *irqstk;
25309 u32 *isp, *prev_esp;
25310
25311- curstk = current_stack();
25312 irqstk = __this_cpu_read(softirq_stack);
25313
25314 /* build the stack frame on the softirq stack */
25315@@ -151,7 +148,16 @@ void do_softirq_own_stack(void)
25316 prev_esp = (u32 *)irqstk;
25317 *prev_esp = current_stack_pointer();
25318
25319+#ifdef CONFIG_PAX_MEMORY_UDEREF
25320+ __set_fs(MAKE_MM_SEG(0));
25321+#endif
25322+
25323 call_on_stack(__do_softirq, isp);
25324+
25325+#ifdef CONFIG_PAX_MEMORY_UDEREF
25326+ __set_fs(current_thread_info()->addr_limit);
25327+#endif
25328+
25329 }
25330
25331 bool handle_irq(unsigned irq, struct pt_regs *regs)
25332@@ -165,7 +171,7 @@ bool handle_irq(unsigned irq, struct pt_regs *regs)
25333 if (unlikely(!desc))
25334 return false;
25335
25336- if (user_mode_vm(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25337+ if (user_mode(regs) || !execute_on_irq_stack(overflow, desc, irq)) {
25338 if (unlikely(overflow))
25339 print_stack_overflow();
25340 desc->handle_irq(irq, desc);
25341diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c
25342index e4b503d..824fce8 100644
25343--- a/arch/x86/kernel/irq_64.c
25344+++ b/arch/x86/kernel/irq_64.c
25345@@ -26,6 +26,8 @@ EXPORT_PER_CPU_SYMBOL(irq_stat);
25346 DEFINE_PER_CPU(struct pt_regs *, irq_regs);
25347 EXPORT_PER_CPU_SYMBOL(irq_regs);
25348
25349+extern void gr_handle_kernel_exploit(void);
25350+
25351 int sysctl_panic_on_stackoverflow;
25352
25353 /*
25354@@ -44,7 +46,7 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25355 u64 estack_top, estack_bottom;
25356 u64 curbase = (u64)task_stack_page(current);
25357
25358- if (user_mode_vm(regs))
25359+ if (user_mode(regs))
25360 return;
25361
25362 if (regs->sp >= curbase + sizeof(struct thread_info) +
25363@@ -69,6 +71,8 @@ static inline void stack_overflow_check(struct pt_regs *regs)
25364 irq_stack_top, irq_stack_bottom,
25365 estack_top, estack_bottom);
25366
25367+ gr_handle_kernel_exploit();
25368+
25369 if (sysctl_panic_on_stackoverflow)
25370 panic("low stack detected by irq handler - check messages\n");
25371 #endif
25372diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
25373index 26d5a55..a01160a 100644
25374--- a/arch/x86/kernel/jump_label.c
25375+++ b/arch/x86/kernel/jump_label.c
25376@@ -51,7 +51,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25377 * Jump label is enabled for the first time.
25378 * So we expect a default_nop...
25379 */
25380- if (unlikely(memcmp((void *)entry->code, default_nop, 5)
25381+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5)
25382 != 0))
25383 bug_at((void *)entry->code, __LINE__);
25384 } else {
25385@@ -59,7 +59,7 @@ static void __jump_label_transform(struct jump_entry *entry,
25386 * ...otherwise expect an ideal_nop. Otherwise
25387 * something went horribly wrong.
25388 */
25389- if (unlikely(memcmp((void *)entry->code, ideal_nop, 5)
25390+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), ideal_nop, 5)
25391 != 0))
25392 bug_at((void *)entry->code, __LINE__);
25393 }
25394@@ -75,13 +75,13 @@ static void __jump_label_transform(struct jump_entry *entry,
25395 * are converting the default nop to the ideal nop.
25396 */
25397 if (init) {
25398- if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
25399+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), default_nop, 5) != 0))
25400 bug_at((void *)entry->code, __LINE__);
25401 } else {
25402 code.jump = 0xe9;
25403 code.offset = entry->target -
25404 (entry->code + JUMP_LABEL_NOP_SIZE);
25405- if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
25406+ if (unlikely(memcmp((void *)ktla_ktva(entry->code), &code, 5) != 0))
25407 bug_at((void *)entry->code, __LINE__);
25408 }
25409 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
25410diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
25411index 25ecd56..e12482f 100644
25412--- a/arch/x86/kernel/kgdb.c
25413+++ b/arch/x86/kernel/kgdb.c
25414@@ -126,11 +126,11 @@ char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
25415 #ifdef CONFIG_X86_32
25416 switch (regno) {
25417 case GDB_SS:
25418- if (!user_mode_vm(regs))
25419+ if (!user_mode(regs))
25420 *(unsigned long *)mem = __KERNEL_DS;
25421 break;
25422 case GDB_SP:
25423- if (!user_mode_vm(regs))
25424+ if (!user_mode(regs))
25425 *(unsigned long *)mem = kernel_stack_pointer(regs);
25426 break;
25427 case GDB_GS:
25428@@ -228,7 +228,10 @@ static void kgdb_correct_hw_break(void)
25429 bp->attr.bp_addr = breakinfo[breakno].addr;
25430 bp->attr.bp_len = breakinfo[breakno].len;
25431 bp->attr.bp_type = breakinfo[breakno].type;
25432- info->address = breakinfo[breakno].addr;
25433+ if (breakinfo[breakno].type == X86_BREAKPOINT_EXECUTE)
25434+ info->address = ktla_ktva(breakinfo[breakno].addr);
25435+ else
25436+ info->address = breakinfo[breakno].addr;
25437 info->len = breakinfo[breakno].len;
25438 info->type = breakinfo[breakno].type;
25439 val = arch_install_hw_breakpoint(bp);
25440@@ -475,12 +478,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
25441 case 'k':
25442 /* clear the trace bit */
25443 linux_regs->flags &= ~X86_EFLAGS_TF;
25444- atomic_set(&kgdb_cpu_doing_single_step, -1);
25445+ atomic_set_unchecked(&kgdb_cpu_doing_single_step, -1);
25446
25447 /* set the trace bit if we're stepping */
25448 if (remcomInBuffer[0] == 's') {
25449 linux_regs->flags |= X86_EFLAGS_TF;
25450- atomic_set(&kgdb_cpu_doing_single_step,
25451+ atomic_set_unchecked(&kgdb_cpu_doing_single_step,
25452 raw_smp_processor_id());
25453 }
25454
25455@@ -545,7 +548,7 @@ static int __kgdb_notify(struct die_args *args, unsigned long cmd)
25456
25457 switch (cmd) {
25458 case DIE_DEBUG:
25459- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
25460+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
25461 if (user_mode(regs))
25462 return single_step_cont(regs, args);
25463 break;
25464@@ -750,11 +753,11 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25465 #endif /* CONFIG_DEBUG_RODATA */
25466
25467 bpt->type = BP_BREAKPOINT;
25468- err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
25469+ err = probe_kernel_read(bpt->saved_instr, ktla_ktva((char *)bpt->bpt_addr),
25470 BREAK_INSTR_SIZE);
25471 if (err)
25472 return err;
25473- err = probe_kernel_write((char *)bpt->bpt_addr,
25474+ err = probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25475 arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE);
25476 #ifdef CONFIG_DEBUG_RODATA
25477 if (!err)
25478@@ -767,7 +770,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
25479 return -EBUSY;
25480 text_poke((void *)bpt->bpt_addr, arch_kgdb_ops.gdb_bpt_instr,
25481 BREAK_INSTR_SIZE);
25482- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25483+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25484 if (err)
25485 return err;
25486 if (memcmp(opc, arch_kgdb_ops.gdb_bpt_instr, BREAK_INSTR_SIZE))
25487@@ -792,13 +795,13 @@ int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
25488 if (mutex_is_locked(&text_mutex))
25489 goto knl_write;
25490 text_poke((void *)bpt->bpt_addr, bpt->saved_instr, BREAK_INSTR_SIZE);
25491- err = probe_kernel_read(opc, (char *)bpt->bpt_addr, BREAK_INSTR_SIZE);
25492+ err = probe_kernel_read(opc, ktla_ktva((char *)bpt->bpt_addr), BREAK_INSTR_SIZE);
25493 if (err || memcmp(opc, bpt->saved_instr, BREAK_INSTR_SIZE))
25494 goto knl_write;
25495 return err;
25496 knl_write:
25497 #endif /* CONFIG_DEBUG_RODATA */
25498- return probe_kernel_write((char *)bpt->bpt_addr,
25499+ return probe_kernel_write(ktla_ktva((char *)bpt->bpt_addr),
25500 (char *)bpt->saved_instr, BREAK_INSTR_SIZE);
25501 }
25502
25503diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
25504index 4e3d5a9..03fffd8 100644
25505--- a/arch/x86/kernel/kprobes/core.c
25506+++ b/arch/x86/kernel/kprobes/core.c
25507@@ -120,9 +120,12 @@ __synthesize_relative_insn(void *from, void *to, u8 op)
25508 s32 raddr;
25509 } __packed *insn;
25510
25511- insn = (struct __arch_relative_insn *)from;
25512+ insn = (struct __arch_relative_insn *)ktla_ktva(from);
25513+
25514+ pax_open_kernel();
25515 insn->raddr = (s32)((long)(to) - ((long)(from) + 5));
25516 insn->op = op;
25517+ pax_close_kernel();
25518 }
25519
25520 /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/
25521@@ -168,7 +171,7 @@ int can_boost(kprobe_opcode_t *opcodes)
25522 kprobe_opcode_t opcode;
25523 kprobe_opcode_t *orig_opcodes = opcodes;
25524
25525- if (search_exception_tables((unsigned long)opcodes))
25526+ if (search_exception_tables(ktva_ktla((unsigned long)opcodes)))
25527 return 0; /* Page fault may occur on this address. */
25528
25529 retry:
25530@@ -260,12 +263,12 @@ __recover_probed_insn(kprobe_opcode_t *buf, unsigned long addr)
25531 * Fortunately, we know that the original code is the ideal 5-byte
25532 * long NOP.
25533 */
25534- memcpy(buf, (void *)addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25535+ memcpy(buf, (void *)ktla_ktva(addr), MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
25536 if (faddr)
25537 memcpy(buf, ideal_nops[NOP_ATOMIC5], 5);
25538 else
25539 buf[0] = kp->opcode;
25540- return (unsigned long)buf;
25541+ return ktva_ktla((unsigned long)buf);
25542 }
25543
25544 /*
25545@@ -364,7 +367,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25546 /* Another subsystem puts a breakpoint, failed to recover */
25547 if (insn.opcode.bytes[0] == BREAKPOINT_INSTRUCTION)
25548 return 0;
25549+ pax_open_kernel();
25550 memcpy(dest, insn.kaddr, insn.length);
25551+ pax_close_kernel();
25552
25553 #ifdef CONFIG_X86_64
25554 if (insn_rip_relative(&insn)) {
25555@@ -391,7 +396,9 @@ int __copy_instruction(u8 *dest, u8 *src)
25556 return 0;
25557 }
25558 disp = (u8 *) dest + insn_offset_displacement(&insn);
25559+ pax_open_kernel();
25560 *(s32 *) disp = (s32) newdisp;
25561+ pax_close_kernel();
25562 }
25563 #endif
25564 return insn.length;
25565@@ -533,7 +540,7 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25566 * nor set current_kprobe, because it doesn't use single
25567 * stepping.
25568 */
25569- regs->ip = (unsigned long)p->ainsn.insn;
25570+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25571 preempt_enable_no_resched();
25572 return;
25573 }
25574@@ -550,9 +557,9 @@ static void setup_singlestep(struct kprobe *p, struct pt_regs *regs,
25575 regs->flags &= ~X86_EFLAGS_IF;
25576 /* single step inline if the instruction is an int3 */
25577 if (p->opcode == BREAKPOINT_INSTRUCTION)
25578- regs->ip = (unsigned long)p->addr;
25579+ regs->ip = ktla_ktva((unsigned long)p->addr);
25580 else
25581- regs->ip = (unsigned long)p->ainsn.insn;
25582+ regs->ip = ktva_ktla((unsigned long)p->ainsn.insn);
25583 }
25584 NOKPROBE_SYMBOL(setup_singlestep);
25585
25586@@ -602,7 +609,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25587 struct kprobe *p;
25588 struct kprobe_ctlblk *kcb;
25589
25590- if (user_mode_vm(regs))
25591+ if (user_mode(regs))
25592 return 0;
25593
25594 addr = (kprobe_opcode_t *)(regs->ip - sizeof(kprobe_opcode_t));
25595@@ -637,7 +644,7 @@ int kprobe_int3_handler(struct pt_regs *regs)
25596 setup_singlestep(p, regs, kcb, 0);
25597 return 1;
25598 }
25599- } else if (*addr != BREAKPOINT_INSTRUCTION) {
25600+ } else if (*(kprobe_opcode_t *)ktla_ktva((unsigned long)addr) != BREAKPOINT_INSTRUCTION) {
25601 /*
25602 * The breakpoint instruction was removed right
25603 * after we hit it. Another cpu has removed
25604@@ -684,6 +691,9 @@ static void __used kretprobe_trampoline_holder(void)
25605 " movq %rax, 152(%rsp)\n"
25606 RESTORE_REGS_STRING
25607 " popfq\n"
25608+#ifdef KERNEXEC_PLUGIN
25609+ " btsq $63,(%rsp)\n"
25610+#endif
25611 #else
25612 " pushf\n"
25613 SAVE_REGS_STRING
25614@@ -824,7 +834,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs,
25615 struct kprobe_ctlblk *kcb)
25616 {
25617 unsigned long *tos = stack_addr(regs);
25618- unsigned long copy_ip = (unsigned long)p->ainsn.insn;
25619+ unsigned long copy_ip = ktva_ktla((unsigned long)p->ainsn.insn);
25620 unsigned long orig_ip = (unsigned long)p->addr;
25621 kprobe_opcode_t *insn = p->ainsn.insn;
25622
25623@@ -1007,7 +1017,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
25624 struct die_args *args = data;
25625 int ret = NOTIFY_DONE;
25626
25627- if (args->regs && user_mode_vm(args->regs))
25628+ if (args->regs && user_mode(args->regs))
25629 return ret;
25630
25631 if (val == DIE_GPF) {
25632diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
25633index 7b3b9d1..e2478b91 100644
25634--- a/arch/x86/kernel/kprobes/opt.c
25635+++ b/arch/x86/kernel/kprobes/opt.c
25636@@ -79,6 +79,7 @@ found:
25637 /* Insert a move instruction which sets a pointer to eax/rdi (1st arg). */
25638 static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25639 {
25640+ pax_open_kernel();
25641 #ifdef CONFIG_X86_64
25642 *addr++ = 0x48;
25643 *addr++ = 0xbf;
25644@@ -86,6 +87,7 @@ static void synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long val)
25645 *addr++ = 0xb8;
25646 #endif
25647 *(unsigned long *)addr = val;
25648+ pax_close_kernel();
25649 }
25650
25651 asm (
25652@@ -342,7 +344,7 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25653 * Verify if the address gap is in 2GB range, because this uses
25654 * a relative jump.
25655 */
25656- rel = (long)op->optinsn.insn - (long)op->kp.addr + RELATIVEJUMP_SIZE;
25657+ rel = (long)op->optinsn.insn - ktla_ktva((long)op->kp.addr) + RELATIVEJUMP_SIZE;
25658 if (abs(rel) > 0x7fffffff) {
25659 __arch_remove_optimized_kprobe(op, 0);
25660 return -ERANGE;
25661@@ -359,16 +361,18 @@ int arch_prepare_optimized_kprobe(struct optimized_kprobe *op,
25662 op->optinsn.size = ret;
25663
25664 /* Copy arch-dep-instance from template */
25665- memcpy(buf, &optprobe_template_entry, TMPL_END_IDX);
25666+ pax_open_kernel();
25667+ memcpy(buf, ktla_ktva(&optprobe_template_entry), TMPL_END_IDX);
25668+ pax_close_kernel();
25669
25670 /* Set probe information */
25671 synthesize_set_arg1(buf + TMPL_MOVE_IDX, (unsigned long)op);
25672
25673 /* Set probe function call */
25674- synthesize_relcall(buf + TMPL_CALL_IDX, optimized_callback);
25675+ synthesize_relcall(ktva_ktla(buf) + TMPL_CALL_IDX, optimized_callback);
25676
25677 /* Set returning jmp instruction at the tail of out-of-line buffer */
25678- synthesize_reljump(buf + TMPL_END_IDX + op->optinsn.size,
25679+ synthesize_reljump(ktva_ktla(buf) + TMPL_END_IDX + op->optinsn.size,
25680 (u8 *)op->kp.addr + op->optinsn.size);
25681
25682 flush_icache_range((unsigned long) buf,
25683@@ -393,7 +397,7 @@ void arch_optimize_kprobes(struct list_head *oplist)
25684 WARN_ON(kprobe_disabled(&op->kp));
25685
25686 /* Backup instructions which will be replaced by jump address */
25687- memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
25688+ memcpy(op->optinsn.copied_insn, ktla_ktva(op->kp.addr) + INT3_SIZE,
25689 RELATIVE_ADDR_SIZE);
25690
25691 insn_buf[0] = RELATIVEJUMP_OPCODE;
25692@@ -441,7 +445,7 @@ int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
25693 /* This kprobe is really able to run optimized path. */
25694 op = container_of(p, struct optimized_kprobe, kp);
25695 /* Detour through copied instructions */
25696- regs->ip = (unsigned long)op->optinsn.insn + TMPL_END_IDX;
25697+ regs->ip = ktva_ktla((unsigned long)op->optinsn.insn) + TMPL_END_IDX;
25698 if (!reenter)
25699 reset_current_kprobe();
25700 preempt_enable_no_resched();
25701diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c
25702index c2bedae..25e7ab60 100644
25703--- a/arch/x86/kernel/ksysfs.c
25704+++ b/arch/x86/kernel/ksysfs.c
25705@@ -184,7 +184,7 @@ out:
25706
25707 static struct kobj_attribute type_attr = __ATTR_RO(type);
25708
25709-static struct bin_attribute data_attr = {
25710+static bin_attribute_no_const data_attr __read_only = {
25711 .attr = {
25712 .name = "data",
25713 .mode = S_IRUGO,
25714diff --git a/arch/x86/kernel/ldt.c b/arch/x86/kernel/ldt.c
25715index c37886d..d851d32 100644
25716--- a/arch/x86/kernel/ldt.c
25717+++ b/arch/x86/kernel/ldt.c
25718@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, int mincount, int reload)
25719 if (reload) {
25720 #ifdef CONFIG_SMP
25721 preempt_disable();
25722- load_LDT(pc);
25723+ load_LDT_nolock(pc);
25724 if (!cpumask_equal(mm_cpumask(current->mm),
25725 cpumask_of(smp_processor_id())))
25726 smp_call_function(flush_ldt, current->mm, 1);
25727 preempt_enable();
25728 #else
25729- load_LDT(pc);
25730+ load_LDT_nolock(pc);
25731 #endif
25732 }
25733 if (oldsize) {
25734@@ -94,7 +94,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)
25735 return err;
25736
25737 for (i = 0; i < old->size; i++)
25738- write_ldt_entry(new->ldt, i, old->ldt + i * LDT_ENTRY_SIZE);
25739+ write_ldt_entry(new->ldt, i, old->ldt + i);
25740 return 0;
25741 }
25742
25743@@ -115,6 +115,24 @@ int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
25744 retval = copy_ldt(&mm->context, &old_mm->context);
25745 mutex_unlock(&old_mm->context.lock);
25746 }
25747+
25748+ if (tsk == current) {
25749+ mm->context.vdso = 0;
25750+
25751+#ifdef CONFIG_X86_32
25752+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
25753+ mm->context.user_cs_base = 0UL;
25754+ mm->context.user_cs_limit = ~0UL;
25755+
25756+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
25757+ cpus_clear(mm->context.cpu_user_cs_mask);
25758+#endif
25759+
25760+#endif
25761+#endif
25762+
25763+ }
25764+
25765 return retval;
25766 }
25767
25768@@ -229,6 +247,13 @@ static int write_ldt(void __user *ptr, unsigned long bytecount, int oldmode)
25769 }
25770 }
25771
25772+#ifdef CONFIG_PAX_SEGMEXEC
25773+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (ldt_info.contents & MODIFY_LDT_CONTENTS_CODE)) {
25774+ error = -EINVAL;
25775+ goto out_unlock;
25776+ }
25777+#endif
25778+
25779 if (!IS_ENABLED(CONFIG_X86_16BIT) && !ldt_info.seg_32bit) {
25780 error = -EINVAL;
25781 goto out_unlock;
25782diff --git a/arch/x86/kernel/livepatch.c b/arch/x86/kernel/livepatch.c
25783index ff3c3101d..d7c0cd8 100644
25784--- a/arch/x86/kernel/livepatch.c
25785+++ b/arch/x86/kernel/livepatch.c
25786@@ -41,9 +41,10 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25787 int ret, numpages, size = 4;
25788 bool readonly;
25789 unsigned long val;
25790- unsigned long core = (unsigned long)mod->module_core;
25791- unsigned long core_ro_size = mod->core_ro_size;
25792- unsigned long core_size = mod->core_size;
25793+ unsigned long core_rx = (unsigned long)mod->module_core_rx;
25794+ unsigned long core_rw = (unsigned long)mod->module_core_rw;
25795+ unsigned long core_size_rx = mod->core_size_rx;
25796+ unsigned long core_size_rw = mod->core_size_rw;
25797
25798 switch (type) {
25799 case R_X86_64_NONE:
25800@@ -66,11 +67,12 @@ int klp_write_module_reloc(struct module *mod, unsigned long type,
25801 return -EINVAL;
25802 }
25803
25804- if (loc < core || loc >= core + core_size)
25805+ if ((loc < core_rx || loc >= core_rx + core_size_rx) &&
25806+ (loc < core_rw || loc >= core_rw + core_size_rw))
25807 /* loc does not point to any symbol inside the module */
25808 return -EINVAL;
25809
25810- if (loc < core + core_ro_size)
25811+ if (loc < core_rx + core_size_rx)
25812 readonly = true;
25813 else
25814 readonly = false;
25815diff --git a/arch/x86/kernel/machine_kexec_32.c b/arch/x86/kernel/machine_kexec_32.c
25816index 469b23d..5449cfe 100644
25817--- a/arch/x86/kernel/machine_kexec_32.c
25818+++ b/arch/x86/kernel/machine_kexec_32.c
25819@@ -26,7 +26,7 @@
25820 #include <asm/cacheflush.h>
25821 #include <asm/debugreg.h>
25822
25823-static void set_idt(void *newidt, __u16 limit)
25824+static void set_idt(struct desc_struct *newidt, __u16 limit)
25825 {
25826 struct desc_ptr curidt;
25827
25828@@ -38,7 +38,7 @@ static void set_idt(void *newidt, __u16 limit)
25829 }
25830
25831
25832-static void set_gdt(void *newgdt, __u16 limit)
25833+static void set_gdt(struct desc_struct *newgdt, __u16 limit)
25834 {
25835 struct desc_ptr curgdt;
25836
25837@@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image)
25838 }
25839
25840 control_page = page_address(image->control_code_page);
25841- memcpy(control_page, relocate_kernel, KEXEC_CONTROL_CODE_MAX_SIZE);
25842+ memcpy(control_page, (void *)ktla_ktva((unsigned long)relocate_kernel), KEXEC_CONTROL_CODE_MAX_SIZE);
25843
25844 relocate_kernel_ptr = control_page;
25845 page_list[PA_CONTROL_PAGE] = __pa(control_page);
25846diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
25847index 94ea120..4154cea 100644
25848--- a/arch/x86/kernel/mcount_64.S
25849+++ b/arch/x86/kernel/mcount_64.S
25850@@ -7,7 +7,7 @@
25851 #include <linux/linkage.h>
25852 #include <asm/ptrace.h>
25853 #include <asm/ftrace.h>
25854-
25855+#include <asm/alternative-asm.h>
25856
25857 .code64
25858 .section .entry.text, "ax"
25859@@ -148,8 +148,9 @@
25860 #ifdef CONFIG_DYNAMIC_FTRACE
25861
25862 ENTRY(function_hook)
25863+ pax_force_retaddr
25864 retq
25865-END(function_hook)
25866+ENDPROC(function_hook)
25867
25868 ENTRY(ftrace_caller)
25869 /* save_mcount_regs fills in first two parameters */
25870@@ -181,8 +182,9 @@ GLOBAL(ftrace_graph_call)
25871 #endif
25872
25873 GLOBAL(ftrace_stub)
25874+ pax_force_retaddr
25875 retq
25876-END(ftrace_caller)
25877+ENDPROC(ftrace_caller)
25878
25879 ENTRY(ftrace_regs_caller)
25880 /* Save the current flags before any operations that can change them */
25881@@ -253,7 +255,7 @@ GLOBAL(ftrace_regs_caller_end)
25882
25883 jmp ftrace_return
25884
25885-END(ftrace_regs_caller)
25886+ENDPROC(ftrace_regs_caller)
25887
25888
25889 #else /* ! CONFIG_DYNAMIC_FTRACE */
25890@@ -272,18 +274,20 @@ fgraph_trace:
25891 #endif
25892
25893 GLOBAL(ftrace_stub)
25894+ pax_force_retaddr
25895 retq
25896
25897 trace:
25898 /* save_mcount_regs fills in first two parameters */
25899 save_mcount_regs
25900
25901+ pax_force_fptr ftrace_trace_function
25902 call *ftrace_trace_function
25903
25904 restore_mcount_regs
25905
25906 jmp fgraph_trace
25907-END(function_hook)
25908+ENDPROC(function_hook)
25909 #endif /* CONFIG_DYNAMIC_FTRACE */
25910 #endif /* CONFIG_FUNCTION_TRACER */
25911
25912@@ -305,8 +309,9 @@ ENTRY(ftrace_graph_caller)
25913
25914 restore_mcount_regs
25915
25916+ pax_force_retaddr
25917 retq
25918-END(ftrace_graph_caller)
25919+ENDPROC(ftrace_graph_caller)
25920
25921 GLOBAL(return_to_handler)
25922 subq $24, %rsp
25923@@ -322,5 +327,7 @@ GLOBAL(return_to_handler)
25924 movq 8(%rsp), %rdx
25925 movq (%rsp), %rax
25926 addq $24, %rsp
25927+ pax_force_fptr %rdi
25928 jmp *%rdi
25929+ENDPROC(return_to_handler)
25930 #endif
25931diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
25932index d1ac80b..f593701 100644
25933--- a/arch/x86/kernel/module.c
25934+++ b/arch/x86/kernel/module.c
25935@@ -82,17 +82,17 @@ static unsigned long int get_module_load_offset(void)
25936 }
25937 #endif
25938
25939-void *module_alloc(unsigned long size)
25940+static inline void *__module_alloc(unsigned long size, pgprot_t prot)
25941 {
25942 void *p;
25943
25944- if (PAGE_ALIGN(size) > MODULES_LEN)
25945+ if (!size || PAGE_ALIGN(size) > MODULES_LEN)
25946 return NULL;
25947
25948 p = __vmalloc_node_range(size, MODULE_ALIGN,
25949 MODULES_VADDR + get_module_load_offset(),
25950- MODULES_END, GFP_KERNEL | __GFP_HIGHMEM,
25951- PAGE_KERNEL_EXEC, 0, NUMA_NO_NODE,
25952+ MODULES_END, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO,
25953+ prot, 0, NUMA_NO_NODE,
25954 __builtin_return_address(0));
25955 if (p && (kasan_module_alloc(p, size) < 0)) {
25956 vfree(p);
25957@@ -102,6 +102,51 @@ void *module_alloc(unsigned long size)
25958 return p;
25959 }
25960
25961+void *module_alloc(unsigned long size)
25962+{
25963+
25964+#ifdef CONFIG_PAX_KERNEXEC
25965+ return __module_alloc(size, PAGE_KERNEL);
25966+#else
25967+ return __module_alloc(size, PAGE_KERNEL_EXEC);
25968+#endif
25969+
25970+}
25971+
25972+#ifdef CONFIG_PAX_KERNEXEC
25973+#ifdef CONFIG_X86_32
25974+void *module_alloc_exec(unsigned long size)
25975+{
25976+ struct vm_struct *area;
25977+
25978+ if (size == 0)
25979+ return NULL;
25980+
25981+ area = __get_vm_area(size, VM_ALLOC, (unsigned long)&MODULES_EXEC_VADDR, (unsigned long)&MODULES_EXEC_END);
25982+return area ? area->addr : NULL;
25983+}
25984+EXPORT_SYMBOL(module_alloc_exec);
25985+
25986+void module_memfree_exec(void *module_region)
25987+{
25988+ vunmap(module_region);
25989+}
25990+EXPORT_SYMBOL(module_memfree_exec);
25991+#else
25992+void module_memfree_exec(void *module_region)
25993+{
25994+ module_memfree(module_region);
25995+}
25996+EXPORT_SYMBOL(module_memfree_exec);
25997+
25998+void *module_alloc_exec(unsigned long size)
25999+{
26000+ return __module_alloc(size, PAGE_KERNEL_RX);
26001+}
26002+EXPORT_SYMBOL(module_alloc_exec);
26003+#endif
26004+#endif
26005+
26006 #ifdef CONFIG_X86_32
26007 int apply_relocate(Elf32_Shdr *sechdrs,
26008 const char *strtab,
26009@@ -112,14 +157,16 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26010 unsigned int i;
26011 Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr;
26012 Elf32_Sym *sym;
26013- uint32_t *location;
26014+ uint32_t *plocation, location;
26015
26016 DEBUGP("Applying relocate section %u to %u\n",
26017 relsec, sechdrs[relsec].sh_info);
26018 for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) {
26019 /* This is where to make the change */
26020- location = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr
26021- + rel[i].r_offset;
26022+ plocation = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr + rel[i].r_offset;
26023+ location = (uint32_t)plocation;
26024+ if (sechdrs[sechdrs[relsec].sh_info].sh_flags & SHF_EXECINSTR)
26025+ plocation = ktla_ktva((void *)plocation);
26026 /* This is the symbol it is referring to. Note that all
26027 undefined symbols have been resolved. */
26028 sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
26029@@ -128,11 +175,15 @@ int apply_relocate(Elf32_Shdr *sechdrs,
26030 switch (ELF32_R_TYPE(rel[i].r_info)) {
26031 case R_386_32:
26032 /* We add the value into the location given */
26033- *location += sym->st_value;
26034+ pax_open_kernel();
26035+ *plocation += sym->st_value;
26036+ pax_close_kernel();
26037 break;
26038 case R_386_PC32:
26039 /* Add the value, subtract its position */
26040- *location += sym->st_value - (uint32_t)location;
26041+ pax_open_kernel();
26042+ *plocation += sym->st_value - location;
26043+ pax_close_kernel();
26044 break;
26045 default:
26046 pr_err("%s: Unknown relocation: %u\n",
26047@@ -177,21 +228,30 @@ int apply_relocate_add(Elf64_Shdr *sechdrs,
26048 case R_X86_64_NONE:
26049 break;
26050 case R_X86_64_64:
26051+ pax_open_kernel();
26052 *(u64 *)loc = val;
26053+ pax_close_kernel();
26054 break;
26055 case R_X86_64_32:
26056+ pax_open_kernel();
26057 *(u32 *)loc = val;
26058+ pax_close_kernel();
26059 if (val != *(u32 *)loc)
26060 goto overflow;
26061 break;
26062 case R_X86_64_32S:
26063+ pax_open_kernel();
26064 *(s32 *)loc = val;
26065+ pax_close_kernel();
26066 if ((s64)val != *(s32 *)loc)
26067 goto overflow;
26068 break;
26069 case R_X86_64_PC32:
26070 val -= (u64)loc;
26071+ pax_open_kernel();
26072 *(u32 *)loc = val;
26073+ pax_close_kernel();
26074+
26075 #if 0
26076 if ((s64)val != *(s32 *)loc)
26077 goto overflow;
26078diff --git a/arch/x86/kernel/msr.c b/arch/x86/kernel/msr.c
26079index 113e707..0a690e1 100644
26080--- a/arch/x86/kernel/msr.c
26081+++ b/arch/x86/kernel/msr.c
26082@@ -39,6 +39,7 @@
26083 #include <linux/notifier.h>
26084 #include <linux/uaccess.h>
26085 #include <linux/gfp.h>
26086+#include <linux/grsecurity.h>
26087
26088 #include <asm/processor.h>
26089 #include <asm/msr.h>
26090@@ -105,6 +106,11 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
26091 int err = 0;
26092 ssize_t bytes = 0;
26093
26094+#ifdef CONFIG_GRKERNSEC_KMEM
26095+ gr_handle_msr_write();
26096+ return -EPERM;
26097+#endif
26098+
26099 if (count % 8)
26100 return -EINVAL; /* Invalid chunk size */
26101
26102@@ -152,6 +158,10 @@ static long msr_ioctl(struct file *file, unsigned int ioc, unsigned long arg)
26103 err = -EBADF;
26104 break;
26105 }
26106+#ifdef CONFIG_GRKERNSEC_KMEM
26107+ gr_handle_msr_write();
26108+ return -EPERM;
26109+#endif
26110 if (copy_from_user(&regs, uregs, sizeof regs)) {
26111 err = -EFAULT;
26112 break;
26113@@ -235,7 +245,7 @@ static int msr_class_cpu_callback(struct notifier_block *nfb,
26114 return notifier_from_errno(err);
26115 }
26116
26117-static struct notifier_block __refdata msr_class_cpu_notifier = {
26118+static struct notifier_block msr_class_cpu_notifier = {
26119 .notifier_call = msr_class_cpu_callback,
26120 };
26121
26122diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c
26123index c3e985d..110a36a 100644
26124--- a/arch/x86/kernel/nmi.c
26125+++ b/arch/x86/kernel/nmi.c
26126@@ -98,16 +98,16 @@ fs_initcall(nmi_warning_debugfs);
26127
26128 static void nmi_max_handler(struct irq_work *w)
26129 {
26130- struct nmiaction *a = container_of(w, struct nmiaction, irq_work);
26131+ struct nmiwork *n = container_of(w, struct nmiwork, irq_work);
26132 int remainder_ns, decimal_msecs;
26133- u64 whole_msecs = ACCESS_ONCE(a->max_duration);
26134+ u64 whole_msecs = ACCESS_ONCE(n->max_duration);
26135
26136 remainder_ns = do_div(whole_msecs, (1000 * 1000));
26137 decimal_msecs = remainder_ns / 1000;
26138
26139 printk_ratelimited(KERN_INFO
26140 "INFO: NMI handler (%ps) took too long to run: %lld.%03d msecs\n",
26141- a->handler, whole_msecs, decimal_msecs);
26142+ n->action->handler, whole_msecs, decimal_msecs);
26143 }
26144
26145 static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26146@@ -134,11 +134,11 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26147 delta = sched_clock() - delta;
26148 trace_nmi_handler(a->handler, (int)delta, thishandled);
26149
26150- if (delta < nmi_longest_ns || delta < a->max_duration)
26151+ if (delta < nmi_longest_ns || delta < a->work->max_duration)
26152 continue;
26153
26154- a->max_duration = delta;
26155- irq_work_queue(&a->irq_work);
26156+ a->work->max_duration = delta;
26157+ irq_work_queue(&a->work->irq_work);
26158 }
26159
26160 rcu_read_unlock();
26161@@ -148,7 +148,7 @@ static int nmi_handle(unsigned int type, struct pt_regs *regs, bool b2b)
26162 }
26163 NOKPROBE_SYMBOL(nmi_handle);
26164
26165-int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26166+int __register_nmi_handler(unsigned int type, const struct nmiaction *action)
26167 {
26168 struct nmi_desc *desc = nmi_to_desc(type);
26169 unsigned long flags;
26170@@ -156,7 +156,8 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26171 if (!action->handler)
26172 return -EINVAL;
26173
26174- init_irq_work(&action->irq_work, nmi_max_handler);
26175+ action->work->action = action;
26176+ init_irq_work(&action->work->irq_work, nmi_max_handler);
26177
26178 spin_lock_irqsave(&desc->lock, flags);
26179
26180@@ -174,9 +175,9 @@ int __register_nmi_handler(unsigned int type, struct nmiaction *action)
26181 * event confuses some handlers (kdump uses this flag)
26182 */
26183 if (action->flags & NMI_FLAG_FIRST)
26184- list_add_rcu(&action->list, &desc->head);
26185+ pax_list_add_rcu((struct list_head *)&action->list, &desc->head);
26186 else
26187- list_add_tail_rcu(&action->list, &desc->head);
26188+ pax_list_add_tail_rcu((struct list_head *)&action->list, &desc->head);
26189
26190 spin_unlock_irqrestore(&desc->lock, flags);
26191 return 0;
26192@@ -199,7 +200,7 @@ void unregister_nmi_handler(unsigned int type, const char *name)
26193 if (!strcmp(n->name, name)) {
26194 WARN(in_nmi(),
26195 "Trying to free NMI (%s) from NMI context!\n", n->name);
26196- list_del_rcu(&n->list);
26197+ pax_list_del_rcu((struct list_head *)&n->list);
26198 break;
26199 }
26200 }
26201@@ -528,6 +529,17 @@ static inline void nmi_nesting_postprocess(void)
26202 dotraplinkage notrace void
26203 do_nmi(struct pt_regs *regs, long error_code)
26204 {
26205+
26206+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
26207+ if (!user_mode(regs)) {
26208+ unsigned long cs = regs->cs & 0xFFFF;
26209+ unsigned long ip = ktva_ktla(regs->ip);
26210+
26211+ if ((cs == __KERNEL_CS || cs == __KERNEXEC_KERNEL_CS) && ip <= (unsigned long)_etext)
26212+ regs->ip = ip;
26213+ }
26214+#endif
26215+
26216 nmi_nesting_preprocess(regs);
26217
26218 nmi_enter();
26219diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
26220index 6d9582e..f746287 100644
26221--- a/arch/x86/kernel/nmi_selftest.c
26222+++ b/arch/x86/kernel/nmi_selftest.c
26223@@ -43,7 +43,7 @@ static void __init init_nmi_testsuite(void)
26224 {
26225 /* trap all the unknown NMIs we may generate */
26226 register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk",
26227- __initdata);
26228+ __initconst);
26229 }
26230
26231 static void __init cleanup_nmi_testsuite(void)
26232@@ -66,7 +66,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
26233 unsigned long timeout;
26234
26235 if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
26236- NMI_FLAG_FIRST, "nmi_selftest", __initdata)) {
26237+ NMI_FLAG_FIRST, "nmi_selftest", __initconst)) {
26238 nmi_fail = FAILURE;
26239 return;
26240 }
26241diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c
26242index bbb6c73..24a58ef 100644
26243--- a/arch/x86/kernel/paravirt-spinlocks.c
26244+++ b/arch/x86/kernel/paravirt-spinlocks.c
26245@@ -8,7 +8,7 @@
26246
26247 #include <asm/paravirt.h>
26248
26249-struct pv_lock_ops pv_lock_ops = {
26250+struct pv_lock_ops pv_lock_ops __read_only = {
26251 #ifdef CONFIG_SMP
26252 .lock_spinning = __PV_IS_CALLEE_SAVE(paravirt_nop),
26253 .unlock_kick = paravirt_nop,
26254diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
26255index 548d25f..f8fb99c 100644
26256--- a/arch/x86/kernel/paravirt.c
26257+++ b/arch/x86/kernel/paravirt.c
26258@@ -56,6 +56,9 @@ u64 _paravirt_ident_64(u64 x)
26259 {
26260 return x;
26261 }
26262+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26263+PV_CALLEE_SAVE_REGS_THUNK(_paravirt_ident_64);
26264+#endif
26265
26266 void __init default_banner(void)
26267 {
26268@@ -142,16 +145,20 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
26269
26270 if (opfunc == NULL)
26271 /* If there's no function, patch it with a ud2a (BUG) */
26272- ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
26273- else if (opfunc == _paravirt_nop)
26274+ ret = paravirt_patch_insns(insnbuf, len, ktva_ktla(ud2a), ud2a+sizeof(ud2a));
26275+ else if (opfunc == (void *)_paravirt_nop)
26276 /* If the operation is a nop, then nop the callsite */
26277 ret = paravirt_patch_nop();
26278
26279 /* identity functions just return their single argument */
26280- else if (opfunc == _paravirt_ident_32)
26281+ else if (opfunc == (void *)_paravirt_ident_32)
26282 ret = paravirt_patch_ident_32(insnbuf, len);
26283- else if (opfunc == _paravirt_ident_64)
26284+ else if (opfunc == (void *)_paravirt_ident_64)
26285 ret = paravirt_patch_ident_64(insnbuf, len);
26286+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
26287+ else if (opfunc == (void *)__raw_callee_save__paravirt_ident_64)
26288+ ret = paravirt_patch_ident_64(insnbuf, len);
26289+#endif
26290
26291 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
26292 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||
26293@@ -176,7 +183,7 @@ unsigned paravirt_patch_insns(void *insnbuf, unsigned len,
26294 if (insn_len > len || start == NULL)
26295 insn_len = len;
26296 else
26297- memcpy(insnbuf, start, insn_len);
26298+ memcpy(insnbuf, ktla_ktva(start), insn_len);
26299
26300 return insn_len;
26301 }
26302@@ -300,7 +307,7 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
26303 return this_cpu_read(paravirt_lazy_mode);
26304 }
26305
26306-struct pv_info pv_info = {
26307+struct pv_info pv_info __read_only = {
26308 .name = "bare hardware",
26309 .paravirt_enabled = 0,
26310 .kernel_rpl = 0,
26311@@ -311,16 +318,16 @@ struct pv_info pv_info = {
26312 #endif
26313 };
26314
26315-struct pv_init_ops pv_init_ops = {
26316+struct pv_init_ops pv_init_ops __read_only = {
26317 .patch = native_patch,
26318 };
26319
26320-struct pv_time_ops pv_time_ops = {
26321+struct pv_time_ops pv_time_ops __read_only = {
26322 .sched_clock = native_sched_clock,
26323 .steal_clock = native_steal_clock,
26324 };
26325
26326-__visible struct pv_irq_ops pv_irq_ops = {
26327+__visible struct pv_irq_ops pv_irq_ops __read_only = {
26328 .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
26329 .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
26330 .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
26331@@ -332,7 +339,7 @@ __visible struct pv_irq_ops pv_irq_ops = {
26332 #endif
26333 };
26334
26335-__visible struct pv_cpu_ops pv_cpu_ops = {
26336+__visible struct pv_cpu_ops pv_cpu_ops __read_only = {
26337 .cpuid = native_cpuid,
26338 .get_debugreg = native_get_debugreg,
26339 .set_debugreg = native_set_debugreg,
26340@@ -395,21 +402,26 @@ NOKPROBE_SYMBOL(native_get_debugreg);
26341 NOKPROBE_SYMBOL(native_set_debugreg);
26342 NOKPROBE_SYMBOL(native_load_idt);
26343
26344-struct pv_apic_ops pv_apic_ops = {
26345+struct pv_apic_ops pv_apic_ops __read_only= {
26346 #ifdef CONFIG_X86_LOCAL_APIC
26347 .startup_ipi_hook = paravirt_nop,
26348 #endif
26349 };
26350
26351-#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE)
26352+#ifdef CONFIG_X86_32
26353+#ifdef CONFIG_X86_PAE
26354+/* 64-bit pagetable entries */
26355+#define PTE_IDENT PV_CALLEE_SAVE(_paravirt_ident_64)
26356+#else
26357 /* 32-bit pagetable entries */
26358 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32)
26359+#endif
26360 #else
26361 /* 64-bit pagetable entries */
26362 #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64)
26363 #endif
26364
26365-struct pv_mmu_ops pv_mmu_ops = {
26366+struct pv_mmu_ops pv_mmu_ops __read_only = {
26367
26368 .read_cr2 = native_read_cr2,
26369 .write_cr2 = native_write_cr2,
26370@@ -459,6 +471,7 @@ struct pv_mmu_ops pv_mmu_ops = {
26371 .make_pud = PTE_IDENT,
26372
26373 .set_pgd = native_set_pgd,
26374+ .set_pgd_batched = native_set_pgd_batched,
26375 #endif
26376 #endif /* PAGETABLE_LEVELS >= 3 */
26377
26378@@ -479,6 +492,12 @@ struct pv_mmu_ops pv_mmu_ops = {
26379 },
26380
26381 .set_fixmap = native_set_fixmap,
26382+
26383+#ifdef CONFIG_PAX_KERNEXEC
26384+ .pax_open_kernel = native_pax_open_kernel,
26385+ .pax_close_kernel = native_pax_close_kernel,
26386+#endif
26387+
26388 };
26389
26390 EXPORT_SYMBOL_GPL(pv_time_ops);
26391diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c
26392index a1da673..b6f5831 100644
26393--- a/arch/x86/kernel/paravirt_patch_64.c
26394+++ b/arch/x86/kernel/paravirt_patch_64.c
26395@@ -9,7 +9,11 @@ DEF_NATIVE(pv_irq_ops, save_fl, "pushfq; popq %rax");
26396 DEF_NATIVE(pv_mmu_ops, read_cr2, "movq %cr2, %rax");
26397 DEF_NATIVE(pv_mmu_ops, read_cr3, "movq %cr3, %rax");
26398 DEF_NATIVE(pv_mmu_ops, write_cr3, "movq %rdi, %cr3");
26399+
26400+#ifndef CONFIG_PAX_MEMORY_UDEREF
26401 DEF_NATIVE(pv_mmu_ops, flush_tlb_single, "invlpg (%rdi)");
26402+#endif
26403+
26404 DEF_NATIVE(pv_cpu_ops, clts, "clts");
26405 DEF_NATIVE(pv_cpu_ops, wbinvd, "wbinvd");
26406
26407@@ -57,7 +61,11 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf,
26408 PATCH_SITE(pv_mmu_ops, read_cr3);
26409 PATCH_SITE(pv_mmu_ops, write_cr3);
26410 PATCH_SITE(pv_cpu_ops, clts);
26411+
26412+#ifndef CONFIG_PAX_MEMORY_UDEREF
26413 PATCH_SITE(pv_mmu_ops, flush_tlb_single);
26414+#endif
26415+
26416 PATCH_SITE(pv_cpu_ops, wbinvd);
26417
26418 patch_site:
26419diff --git a/arch/x86/kernel/pci-calgary_64.c b/arch/x86/kernel/pci-calgary_64.c
26420index 0497f71..7186c0d 100644
26421--- a/arch/x86/kernel/pci-calgary_64.c
26422+++ b/arch/x86/kernel/pci-calgary_64.c
26423@@ -1347,7 +1347,7 @@ static void __init get_tce_space_from_tar(void)
26424 tce_space = be64_to_cpu(readq(target));
26425 tce_space = tce_space & TAR_SW_BITS;
26426
26427- tce_space = tce_space & (~specified_table_size);
26428+ tce_space = tce_space & (~(unsigned long)specified_table_size);
26429 info->tce_space = (u64 *)__va(tce_space);
26430 }
26431 }
26432diff --git a/arch/x86/kernel/pci-iommu_table.c b/arch/x86/kernel/pci-iommu_table.c
26433index 35ccf75..7a15747 100644
26434--- a/arch/x86/kernel/pci-iommu_table.c
26435+++ b/arch/x86/kernel/pci-iommu_table.c
26436@@ -2,7 +2,7 @@
26437 #include <asm/iommu_table.h>
26438 #include <linux/string.h>
26439 #include <linux/kallsyms.h>
26440-
26441+#include <linux/sched.h>
26442
26443 #define DEBUG 1
26444
26445diff --git a/arch/x86/kernel/pci-swiotlb.c b/arch/x86/kernel/pci-swiotlb.c
26446index 77dd0ad..9ec4723 100644
26447--- a/arch/x86/kernel/pci-swiotlb.c
26448+++ b/arch/x86/kernel/pci-swiotlb.c
26449@@ -33,7 +33,7 @@ void x86_swiotlb_free_coherent(struct device *dev, size_t size,
26450 struct dma_attrs *attrs)
26451 {
26452 if (is_swiotlb_buffer(dma_to_phys(dev, dma_addr)))
26453- swiotlb_free_coherent(dev, size, vaddr, dma_addr);
26454+ swiotlb_free_coherent(dev, size, vaddr, dma_addr, attrs);
26455 else
26456 dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);
26457 }
26458diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
26459index a388bb8..97064ad 100644
26460--- a/arch/x86/kernel/process.c
26461+++ b/arch/x86/kernel/process.c
26462@@ -38,7 +38,8 @@
26463 * section. Since TSS's are completely CPU-local, we want them
26464 * on exact cacheline boundaries, to eliminate cacheline ping-pong.
26465 */
26466-__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
26467+struct tss_struct init_tss[NR_CPUS] __visible ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
26468+EXPORT_SYMBOL(init_tss);
26469
26470 #ifdef CONFIG_X86_64
26471 static DEFINE_PER_CPU(unsigned char, is_idle);
26472@@ -96,7 +97,7 @@ void arch_task_cache_init(void)
26473 task_xstate_cachep =
26474 kmem_cache_create("task_xstate", xstate_size,
26475 __alignof__(union thread_xstate),
26476- SLAB_PANIC | SLAB_NOTRACK, NULL);
26477+ SLAB_PANIC | SLAB_NOTRACK | SLAB_USERCOPY, NULL);
26478 setup_xstate_comp();
26479 }
26480
26481@@ -110,7 +111,7 @@ void exit_thread(void)
26482 unsigned long *bp = t->io_bitmap_ptr;
26483
26484 if (bp) {
26485- struct tss_struct *tss = &per_cpu(init_tss, get_cpu());
26486+ struct tss_struct *tss = init_tss + get_cpu();
26487
26488 t->io_bitmap_ptr = NULL;
26489 clear_thread_flag(TIF_IO_BITMAP);
26490@@ -130,6 +131,9 @@ void flush_thread(void)
26491 {
26492 struct task_struct *tsk = current;
26493
26494+#if defined(CONFIG_X86_32) && !defined(CONFIG_CC_STACKPROTECTOR) && !defined(CONFIG_PAX_MEMORY_UDEREF)
26495+ loadsegment(gs, 0);
26496+#endif
26497 flush_ptrace_hw_breakpoint(tsk);
26498 memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
26499 drop_init_fpu(tsk);
26500@@ -276,7 +280,7 @@ static void __exit_idle(void)
26501 void exit_idle(void)
26502 {
26503 /* idle loop has pid 0 */
26504- if (current->pid)
26505+ if (task_pid_nr(current))
26506 return;
26507 __exit_idle();
26508 }
26509@@ -329,7 +333,7 @@ bool xen_set_default_idle(void)
26510 return ret;
26511 }
26512 #endif
26513-void stop_this_cpu(void *dummy)
26514+__noreturn void stop_this_cpu(void *dummy)
26515 {
26516 local_irq_disable();
26517 /*
26518@@ -508,16 +512,37 @@ static int __init idle_setup(char *str)
26519 }
26520 early_param("idle", idle_setup);
26521
26522-unsigned long arch_align_stack(unsigned long sp)
26523+#ifdef CONFIG_PAX_RANDKSTACK
26524+void pax_randomize_kstack(struct pt_regs *regs)
26525 {
26526- if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
26527- sp -= get_random_int() % 8192;
26528- return sp & ~0xf;
26529-}
26530+ struct thread_struct *thread = &current->thread;
26531+ unsigned long time;
26532
26533-unsigned long arch_randomize_brk(struct mm_struct *mm)
26534-{
26535- unsigned long range_end = mm->brk + 0x02000000;
26536- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
26537-}
26538+ if (!randomize_va_space)
26539+ return;
26540+
26541+ if (v8086_mode(regs))
26542+ return;
26543
26544+ rdtscl(time);
26545+
26546+ /* P4 seems to return a 0 LSB, ignore it */
26547+#ifdef CONFIG_MPENTIUM4
26548+ time &= 0x3EUL;
26549+ time <<= 2;
26550+#elif defined(CONFIG_X86_64)
26551+ time &= 0xFUL;
26552+ time <<= 4;
26553+#else
26554+ time &= 0x1FUL;
26555+ time <<= 3;
26556+#endif
26557+
26558+ thread->sp0 ^= time;
26559+ load_sp0(init_tss + smp_processor_id(), thread);
26560+
26561+#ifdef CONFIG_X86_64
26562+ this_cpu_write(kernel_stack, thread->sp0);
26563+#endif
26564+}
26565+#endif
26566diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
26567index 603c4f9..3a105d7 100644
26568--- a/arch/x86/kernel/process_32.c
26569+++ b/arch/x86/kernel/process_32.c
26570@@ -64,6 +64,7 @@ asmlinkage void ret_from_kernel_thread(void) __asm__("ret_from_kernel_thread");
26571 unsigned long thread_saved_pc(struct task_struct *tsk)
26572 {
26573 return ((unsigned long *)tsk->thread.sp)[3];
26574+//XXX return tsk->thread.eip;
26575 }
26576
26577 void __show_regs(struct pt_regs *regs, int all)
26578@@ -73,19 +74,18 @@ void __show_regs(struct pt_regs *regs, int all)
26579 unsigned long sp;
26580 unsigned short ss, gs;
26581
26582- if (user_mode_vm(regs)) {
26583+ if (user_mode(regs)) {
26584 sp = regs->sp;
26585 ss = regs->ss & 0xffff;
26586- gs = get_user_gs(regs);
26587 } else {
26588 sp = kernel_stack_pointer(regs);
26589 savesegment(ss, ss);
26590- savesegment(gs, gs);
26591 }
26592+ gs = get_user_gs(regs);
26593
26594 printk(KERN_DEFAULT "EIP: %04x:[<%08lx>] EFLAGS: %08lx CPU: %d\n",
26595 (u16)regs->cs, regs->ip, regs->flags,
26596- smp_processor_id());
26597+ raw_smp_processor_id());
26598 print_symbol("EIP is at %s\n", regs->ip);
26599
26600 printk(KERN_DEFAULT "EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
26601@@ -132,21 +132,22 @@ void release_thread(struct task_struct *dead_task)
26602 int copy_thread(unsigned long clone_flags, unsigned long sp,
26603 unsigned long arg, struct task_struct *p)
26604 {
26605- struct pt_regs *childregs = task_pt_regs(p);
26606+ struct pt_regs *childregs = task_stack_page(p) + THREAD_SIZE - sizeof(struct pt_regs) - 8;
26607 struct task_struct *tsk;
26608 int err;
26609
26610 p->thread.sp = (unsigned long) childregs;
26611 p->thread.sp0 = (unsigned long) (childregs+1);
26612+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26613 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26614
26615 if (unlikely(p->flags & PF_KTHREAD)) {
26616 /* kernel thread */
26617 memset(childregs, 0, sizeof(struct pt_regs));
26618 p->thread.ip = (unsigned long) ret_from_kernel_thread;
26619- task_user_gs(p) = __KERNEL_STACK_CANARY;
26620- childregs->ds = __USER_DS;
26621- childregs->es = __USER_DS;
26622+ savesegment(gs, childregs->gs);
26623+ childregs->ds = __KERNEL_DS;
26624+ childregs->es = __KERNEL_DS;
26625 childregs->fs = __KERNEL_PERCPU;
26626 childregs->bx = sp; /* function */
26627 childregs->bp = arg;
26628@@ -248,7 +249,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26629 struct thread_struct *prev = &prev_p->thread,
26630 *next = &next_p->thread;
26631 int cpu = smp_processor_id();
26632- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26633+ struct tss_struct *tss = init_tss + cpu;
26634 fpu_switch_t fpu;
26635
26636 /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
26637@@ -272,6 +273,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26638 */
26639 lazy_save_gs(prev->gs);
26640
26641+#ifdef CONFIG_PAX_MEMORY_UDEREF
26642+ __set_fs(task_thread_info(next_p)->addr_limit);
26643+#endif
26644+
26645 /*
26646 * Load the per-thread Thread-Local Storage descriptor.
26647 */
26648@@ -310,9 +315,9 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26649 */
26650 arch_end_context_switch(next_p);
26651
26652- this_cpu_write(kernel_stack,
26653- (unsigned long)task_stack_page(next_p) +
26654- THREAD_SIZE - KERNEL_STACK_OFFSET);
26655+ this_cpu_write(current_task, next_p);
26656+ this_cpu_write(current_tinfo, &next_p->tinfo);
26657+ this_cpu_write(kernel_stack, next->sp0);
26658
26659 /*
26660 * Restore %gs if needed (which is common)
26661@@ -322,8 +327,6 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26662
26663 switch_fpu_finish(next_p, fpu);
26664
26665- this_cpu_write(current_task, next_p);
26666-
26667 return prev_p;
26668 }
26669
26670@@ -353,4 +356,3 @@ unsigned long get_wchan(struct task_struct *p)
26671 } while (count++ < 16);
26672 return 0;
26673 }
26674-
26675diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
26676index 67fcc43..0d2c630 100644
26677--- a/arch/x86/kernel/process_64.c
26678+++ b/arch/x86/kernel/process_64.c
26679@@ -158,10 +158,11 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26680 struct pt_regs *childregs;
26681 struct task_struct *me = current;
26682
26683- p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE;
26684+ p->thread.sp0 = (unsigned long)task_stack_page(p) + THREAD_SIZE - 16;
26685 childregs = task_pt_regs(p);
26686 p->thread.sp = (unsigned long) childregs;
26687 p->thread.usersp = me->thread.usersp;
26688+ p->tinfo.lowest_stack = (unsigned long)task_stack_page(p) + 2 * sizeof(unsigned long);
26689 set_tsk_thread_flag(p, TIF_FORK);
26690 p->thread.io_bitmap_ptr = NULL;
26691
26692@@ -171,6 +172,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
26693 p->thread.fs = p->thread.fsindex ? 0 : me->thread.fs;
26694 savesegment(es, p->thread.es);
26695 savesegment(ds, p->thread.ds);
26696+ savesegment(ss, p->thread.ss);
26697+ BUG_ON(p->thread.ss == __UDEREF_KERNEL_DS);
26698 memset(p->thread.ptrace_bps, 0, sizeof(p->thread.ptrace_bps));
26699
26700 if (unlikely(p->flags & PF_KTHREAD)) {
26701@@ -277,7 +280,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26702 struct thread_struct *prev = &prev_p->thread;
26703 struct thread_struct *next = &next_p->thread;
26704 int cpu = smp_processor_id();
26705- struct tss_struct *tss = &per_cpu(init_tss, cpu);
26706+ struct tss_struct *tss = init_tss + cpu;
26707 unsigned fsindex, gsindex;
26708 fpu_switch_t fpu;
26709
26710@@ -331,6 +334,10 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26711 if (unlikely(next->ds | prev->ds))
26712 loadsegment(ds, next->ds);
26713
26714+ savesegment(ss, prev->ss);
26715+ if (unlikely(next->ss != prev->ss))
26716+ loadsegment(ss, next->ss);
26717+
26718 /*
26719 * Switch FS and GS.
26720 *
26721@@ -404,6 +411,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26722 prev->usersp = this_cpu_read(old_rsp);
26723 this_cpu_write(old_rsp, next->usersp);
26724 this_cpu_write(current_task, next_p);
26725+ this_cpu_write(current_tinfo, &next_p->tinfo);
26726
26727 /*
26728 * If it were not for PREEMPT_ACTIVE we could guarantee that the
26729@@ -413,9 +421,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
26730 task_thread_info(prev_p)->saved_preempt_count = this_cpu_read(__preempt_count);
26731 this_cpu_write(__preempt_count, task_thread_info(next_p)->saved_preempt_count);
26732
26733- this_cpu_write(kernel_stack,
26734- (unsigned long)task_stack_page(next_p) +
26735- THREAD_SIZE - KERNEL_STACK_OFFSET);
26736+ this_cpu_write(kernel_stack, next->sp0);
26737
26738 /*
26739 * Now maybe reload the debug registers and handle I/O bitmaps
26740@@ -485,12 +491,11 @@ unsigned long get_wchan(struct task_struct *p)
26741 if (!p || p == current || p->state == TASK_RUNNING)
26742 return 0;
26743 stack = (unsigned long)task_stack_page(p);
26744- if (p->thread.sp < stack || p->thread.sp >= stack+THREAD_SIZE)
26745+ if (p->thread.sp < stack || p->thread.sp > stack+THREAD_SIZE-16-sizeof(u64))
26746 return 0;
26747 fp = *(u64 *)(p->thread.sp);
26748 do {
26749- if (fp < (unsigned long)stack ||
26750- fp >= (unsigned long)stack+THREAD_SIZE)
26751+ if (fp < stack || fp > stack+THREAD_SIZE-16-sizeof(u64))
26752 return 0;
26753 ip = *(u64 *)(fp+8);
26754 if (!in_sched_functions(ip))
26755diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
26756index e510618..5165ac0 100644
26757--- a/arch/x86/kernel/ptrace.c
26758+++ b/arch/x86/kernel/ptrace.c
26759@@ -186,10 +186,10 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
26760 unsigned long sp = (unsigned long)&regs->sp;
26761 u32 *prev_esp;
26762
26763- if (context == (sp & ~(THREAD_SIZE - 1)))
26764+ if (context == ((sp + 8) & ~(THREAD_SIZE - 1)))
26765 return sp;
26766
26767- prev_esp = (u32 *)(context);
26768+ prev_esp = *(u32 **)(context);
26769 if (prev_esp)
26770 return (unsigned long)prev_esp;
26771
26772@@ -452,6 +452,20 @@ static int putreg(struct task_struct *child,
26773 if (child->thread.gs != value)
26774 return do_arch_prctl(child, ARCH_SET_GS, value);
26775 return 0;
26776+
26777+ case offsetof(struct user_regs_struct,ip):
26778+ /*
26779+ * Protect against any attempt to set ip to an
26780+ * impossible address. There are dragons lurking if the
26781+ * address is noncanonical. (This explicitly allows
26782+ * setting ip to TASK_SIZE_MAX, because user code can do
26783+ * that all by itself by running off the end of its
26784+ * address space.
26785+ */
26786+ if (value > TASK_SIZE_MAX)
26787+ return -EIO;
26788+ break;
26789+
26790 #endif
26791 }
26792
26793@@ -588,7 +602,7 @@ static void ptrace_triggered(struct perf_event *bp,
26794 static unsigned long ptrace_get_dr7(struct perf_event *bp[])
26795 {
26796 int i;
26797- int dr7 = 0;
26798+ unsigned long dr7 = 0;
26799 struct arch_hw_breakpoint *info;
26800
26801 for (i = 0; i < HBP_NUM; i++) {
26802@@ -822,7 +836,7 @@ long arch_ptrace(struct task_struct *child, long request,
26803 unsigned long addr, unsigned long data)
26804 {
26805 int ret;
26806- unsigned long __user *datap = (unsigned long __user *)data;
26807+ unsigned long __user *datap = (__force unsigned long __user *)data;
26808
26809 switch (request) {
26810 /* read the word at location addr in the USER area. */
26811@@ -907,14 +921,14 @@ long arch_ptrace(struct task_struct *child, long request,
26812 if ((int) addr < 0)
26813 return -EIO;
26814 ret = do_get_thread_area(child, addr,
26815- (struct user_desc __user *)data);
26816+ (__force struct user_desc __user *) data);
26817 break;
26818
26819 case PTRACE_SET_THREAD_AREA:
26820 if ((int) addr < 0)
26821 return -EIO;
26822 ret = do_set_thread_area(child, addr,
26823- (struct user_desc __user *)data, 0);
26824+ (__force struct user_desc __user *) data, 0);
26825 break;
26826 #endif
26827
26828@@ -1292,7 +1306,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
26829
26830 #ifdef CONFIG_X86_64
26831
26832-static struct user_regset x86_64_regsets[] __read_mostly = {
26833+static user_regset_no_const x86_64_regsets[] __read_only = {
26834 [REGSET_GENERAL] = {
26835 .core_note_type = NT_PRSTATUS,
26836 .n = sizeof(struct user_regs_struct) / sizeof(long),
26837@@ -1333,7 +1347,7 @@ static const struct user_regset_view user_x86_64_view = {
26838 #endif /* CONFIG_X86_64 */
26839
26840 #if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
26841-static struct user_regset x86_32_regsets[] __read_mostly = {
26842+static user_regset_no_const x86_32_regsets[] __read_only = {
26843 [REGSET_GENERAL] = {
26844 .core_note_type = NT_PRSTATUS,
26845 .n = sizeof(struct user_regs_struct32) / sizeof(u32),
26846@@ -1386,7 +1400,7 @@ static const struct user_regset_view user_x86_32_view = {
26847 */
26848 u64 xstate_fx_sw_bytes[USER_XSTATE_FX_SW_WORDS];
26849
26850-void update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26851+void __init update_regset_xstate_info(unsigned int size, u64 xstate_mask)
26852 {
26853 #ifdef CONFIG_X86_64
26854 x86_64_regsets[REGSET_XSTATE].n = size / sizeof(u64);
26855@@ -1421,7 +1435,7 @@ static void fill_sigtrap_info(struct task_struct *tsk,
26856 memset(info, 0, sizeof(*info));
26857 info->si_signo = SIGTRAP;
26858 info->si_code = si_code;
26859- info->si_addr = user_mode_vm(regs) ? (void __user *)regs->ip : NULL;
26860+ info->si_addr = user_mode(regs) ? (__force void __user *)regs->ip : NULL;
26861 }
26862
26863 void user_single_step_siginfo(struct task_struct *tsk,
26864@@ -1455,6 +1469,10 @@ static void do_audit_syscall_entry(struct pt_regs *regs, u32 arch)
26865 }
26866 }
26867
26868+#ifdef CONFIG_GRKERNSEC_SETXID
26869+extern void gr_delayed_cred_worker(void);
26870+#endif
26871+
26872 /*
26873 * We can return 0 to resume the syscall or anything else to go to phase
26874 * 2. If we resume the syscall, we need to put something appropriate in
26875@@ -1562,6 +1580,11 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
26876
26877 BUG_ON(regs != task_pt_regs(current));
26878
26879+#ifdef CONFIG_GRKERNSEC_SETXID
26880+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26881+ gr_delayed_cred_worker();
26882+#endif
26883+
26884 /*
26885 * If we stepped into a sysenter/syscall insn, it trapped in
26886 * kernel mode; do_debug() cleared TF and set TIF_SINGLESTEP.
26887@@ -1620,6 +1643,11 @@ void syscall_trace_leave(struct pt_regs *regs)
26888 */
26889 user_exit();
26890
26891+#ifdef CONFIG_GRKERNSEC_SETXID
26892+ if (unlikely(test_and_clear_thread_flag(TIF_GRSEC_SETXID)))
26893+ gr_delayed_cred_worker();
26894+#endif
26895+
26896 audit_syscall_exit(regs);
26897
26898 if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
26899diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
26900index e5ecd20..60f7eef 100644
26901--- a/arch/x86/kernel/pvclock.c
26902+++ b/arch/x86/kernel/pvclock.c
26903@@ -51,11 +51,11 @@ void pvclock_touch_watchdogs(void)
26904 reset_hung_task_detector();
26905 }
26906
26907-static atomic64_t last_value = ATOMIC64_INIT(0);
26908+static atomic64_unchecked_t last_value = ATOMIC64_INIT(0);
26909
26910 void pvclock_resume(void)
26911 {
26912- atomic64_set(&last_value, 0);
26913+ atomic64_set_unchecked(&last_value, 0);
26914 }
26915
26916 u8 pvclock_read_flags(struct pvclock_vcpu_time_info *src)
26917@@ -105,11 +105,11 @@ cycle_t pvclock_clocksource_read(struct pvclock_vcpu_time_info *src)
26918 * updating at the same time, and one of them could be slightly behind,
26919 * making the assumption that last_value always go forward fail to hold.
26920 */
26921- last = atomic64_read(&last_value);
26922+ last = atomic64_read_unchecked(&last_value);
26923 do {
26924 if (ret < last)
26925 return last;
26926- last = atomic64_cmpxchg(&last_value, last, ret);
26927+ last = atomic64_cmpxchg_unchecked(&last_value, last, ret);
26928 } while (unlikely(last != ret));
26929
26930 return ret;
26931diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
26932index 86db4bc..a50a54a 100644
26933--- a/arch/x86/kernel/reboot.c
26934+++ b/arch/x86/kernel/reboot.c
26935@@ -70,6 +70,11 @@ static int __init set_bios_reboot(const struct dmi_system_id *d)
26936
26937 void __noreturn machine_real_restart(unsigned int type)
26938 {
26939+
26940+#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF))
26941+ struct desc_struct *gdt;
26942+#endif
26943+
26944 local_irq_disable();
26945
26946 /*
26947@@ -97,7 +102,29 @@ void __noreturn machine_real_restart(unsigned int type)
26948
26949 /* Jump to the identity-mapped low memory code */
26950 #ifdef CONFIG_X86_32
26951- asm volatile("jmpl *%0" : :
26952+
26953+#if defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF)
26954+ gdt = get_cpu_gdt_table(smp_processor_id());
26955+ pax_open_kernel();
26956+#ifdef CONFIG_PAX_MEMORY_UDEREF
26957+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
26958+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
26959+ loadsegment(ds, __KERNEL_DS);
26960+ loadsegment(es, __KERNEL_DS);
26961+ loadsegment(ss, __KERNEL_DS);
26962+#endif
26963+#ifdef CONFIG_PAX_KERNEXEC
26964+ gdt[GDT_ENTRY_KERNEL_CS].base0 = 0;
26965+ gdt[GDT_ENTRY_KERNEL_CS].base1 = 0;
26966+ gdt[GDT_ENTRY_KERNEL_CS].base2 = 0;
26967+ gdt[GDT_ENTRY_KERNEL_CS].limit0 = 0xffff;
26968+ gdt[GDT_ENTRY_KERNEL_CS].limit = 0xf;
26969+ gdt[GDT_ENTRY_KERNEL_CS].g = 1;
26970+#endif
26971+ pax_close_kernel();
26972+#endif
26973+
26974+ asm volatile("ljmpl *%0" : :
26975 "rm" (real_mode_header->machine_real_restart_asm),
26976 "a" (type));
26977 #else
26978@@ -137,7 +164,7 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d)
26979 /*
26980 * This is a single dmi_table handling all reboot quirks.
26981 */
26982-static struct dmi_system_id __initdata reboot_dmi_table[] = {
26983+static const struct dmi_system_id __initconst reboot_dmi_table[] = {
26984
26985 /* Acer */
26986 { /* Handle reboot issue on Acer Aspire one */
26987@@ -511,7 +538,7 @@ void __attribute__((weak)) mach_reboot_fixups(void)
26988 * This means that this function can never return, it can misbehave
26989 * by not rebooting properly and hanging.
26990 */
26991-static void native_machine_emergency_restart(void)
26992+static void __noreturn native_machine_emergency_restart(void)
26993 {
26994 int i;
26995 int attempt = 0;
26996@@ -631,13 +658,13 @@ void native_machine_shutdown(void)
26997 #endif
26998 }
26999
27000-static void __machine_emergency_restart(int emergency)
27001+static void __noreturn __machine_emergency_restart(int emergency)
27002 {
27003 reboot_emergency = emergency;
27004 machine_ops.emergency_restart();
27005 }
27006
27007-static void native_machine_restart(char *__unused)
27008+static void __noreturn native_machine_restart(char *__unused)
27009 {
27010 pr_notice("machine restart\n");
27011
27012@@ -646,7 +673,7 @@ static void native_machine_restart(char *__unused)
27013 __machine_emergency_restart(0);
27014 }
27015
27016-static void native_machine_halt(void)
27017+static void __noreturn native_machine_halt(void)
27018 {
27019 /* Stop other cpus and apics */
27020 machine_shutdown();
27021@@ -656,7 +683,7 @@ static void native_machine_halt(void)
27022 stop_this_cpu(NULL);
27023 }
27024
27025-static void native_machine_power_off(void)
27026+static void __noreturn native_machine_power_off(void)
27027 {
27028 if (pm_power_off) {
27029 if (!reboot_force)
27030@@ -665,9 +692,10 @@ static void native_machine_power_off(void)
27031 }
27032 /* A fallback in case there is no PM info available */
27033 tboot_shutdown(TB_SHUTDOWN_HALT);
27034+ unreachable();
27035 }
27036
27037-struct machine_ops machine_ops = {
27038+struct machine_ops machine_ops __read_only = {
27039 .power_off = native_machine_power_off,
27040 .shutdown = native_machine_shutdown,
27041 .emergency_restart = native_machine_emergency_restart,
27042diff --git a/arch/x86/kernel/reboot_fixups_32.c b/arch/x86/kernel/reboot_fixups_32.c
27043index c8e41e9..64049ef 100644
27044--- a/arch/x86/kernel/reboot_fixups_32.c
27045+++ b/arch/x86/kernel/reboot_fixups_32.c
27046@@ -57,7 +57,7 @@ struct device_fixup {
27047 unsigned int vendor;
27048 unsigned int device;
27049 void (*reboot_fixup)(struct pci_dev *);
27050-};
27051+} __do_const;
27052
27053 /*
27054 * PCI ids solely used for fixups_table go here
27055diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S
27056index 3fd2c69..a444264 100644
27057--- a/arch/x86/kernel/relocate_kernel_64.S
27058+++ b/arch/x86/kernel/relocate_kernel_64.S
27059@@ -96,8 +96,7 @@ relocate_kernel:
27060
27061 /* jump to identity mapped page */
27062 addq $(identity_mapped - relocate_kernel), %r8
27063- pushq %r8
27064- ret
27065+ jmp *%r8
27066
27067 identity_mapped:
27068 /* set return address to 0 if not preserving context */
27069diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
27070index 0a2421c..11f3f36 100644
27071--- a/arch/x86/kernel/setup.c
27072+++ b/arch/x86/kernel/setup.c
27073@@ -111,6 +111,7 @@
27074 #include <asm/mce.h>
27075 #include <asm/alternative.h>
27076 #include <asm/prom.h>
27077+#include <asm/boot.h>
27078
27079 /*
27080 * max_low_pfn_mapped: highest direct mapped pfn under 4GB
27081@@ -206,10 +207,12 @@ EXPORT_SYMBOL(boot_cpu_data);
27082 #endif
27083
27084
27085-#if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
27086-__visible unsigned long mmu_cr4_features;
27087+#ifdef CONFIG_X86_64
27088+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PSE | X86_CR4_PAE | X86_CR4_PGE;
27089+#elif defined(CONFIG_X86_PAE)
27090+__visible unsigned long mmu_cr4_features __read_only = X86_CR4_PAE;
27091 #else
27092-__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
27093+__visible unsigned long mmu_cr4_features __read_only;
27094 #endif
27095
27096 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
27097@@ -771,7 +774,7 @@ static void __init trim_bios_range(void)
27098 * area (640->1Mb) as ram even though it is not.
27099 * take them out.
27100 */
27101- e820_remove_range(BIOS_BEGIN, BIOS_END - BIOS_BEGIN, E820_RAM, 1);
27102+ e820_remove_range(ISA_START_ADDRESS, ISA_END_ADDRESS - ISA_START_ADDRESS, E820_RAM, 1);
27103
27104 sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
27105 }
27106@@ -779,7 +782,7 @@ static void __init trim_bios_range(void)
27107 /* called before trim_bios_range() to spare extra sanitize */
27108 static void __init e820_add_kernel_range(void)
27109 {
27110- u64 start = __pa_symbol(_text);
27111+ u64 start = __pa_symbol(ktla_ktva(_text));
27112 u64 size = __pa_symbol(_end) - start;
27113
27114 /*
27115@@ -855,8 +858,12 @@ dump_kernel_offset(struct notifier_block *self, unsigned long v, void *p)
27116
27117 void __init setup_arch(char **cmdline_p)
27118 {
27119+#ifdef CONFIG_X86_32
27120+ memblock_reserve(LOAD_PHYSICAL_ADDR, __pa_symbol(__bss_stop) - LOAD_PHYSICAL_ADDR);
27121+#else
27122 memblock_reserve(__pa_symbol(_text),
27123 (unsigned long)__bss_stop - (unsigned long)_text);
27124+#endif
27125
27126 early_reserve_initrd();
27127
27128@@ -954,16 +961,16 @@ void __init setup_arch(char **cmdline_p)
27129
27130 if (!boot_params.hdr.root_flags)
27131 root_mountflags &= ~MS_RDONLY;
27132- init_mm.start_code = (unsigned long) _text;
27133- init_mm.end_code = (unsigned long) _etext;
27134+ init_mm.start_code = ktla_ktva((unsigned long) _text);
27135+ init_mm.end_code = ktla_ktva((unsigned long) _etext);
27136 init_mm.end_data = (unsigned long) _edata;
27137 init_mm.brk = _brk_end;
27138
27139 mpx_mm_init(&init_mm);
27140
27141- code_resource.start = __pa_symbol(_text);
27142- code_resource.end = __pa_symbol(_etext)-1;
27143- data_resource.start = __pa_symbol(_etext);
27144+ code_resource.start = __pa_symbol(ktla_ktva(_text));
27145+ code_resource.end = __pa_symbol(ktla_ktva(_etext))-1;
27146+ data_resource.start = __pa_symbol(_sdata);
27147 data_resource.end = __pa_symbol(_edata)-1;
27148 bss_resource.start = __pa_symbol(__bss_start);
27149 bss_resource.end = __pa_symbol(__bss_stop)-1;
27150diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
27151index e4fcb87..9c06c55 100644
27152--- a/arch/x86/kernel/setup_percpu.c
27153+++ b/arch/x86/kernel/setup_percpu.c
27154@@ -21,19 +21,17 @@
27155 #include <asm/cpu.h>
27156 #include <asm/stackprotector.h>
27157
27158-DEFINE_PER_CPU_READ_MOSTLY(int, cpu_number);
27159+#ifdef CONFIG_SMP
27160+DEFINE_PER_CPU_READ_MOSTLY(unsigned int, cpu_number);
27161 EXPORT_PER_CPU_SYMBOL(cpu_number);
27162+#endif
27163
27164-#ifdef CONFIG_X86_64
27165 #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load)
27166-#else
27167-#define BOOT_PERCPU_OFFSET 0
27168-#endif
27169
27170 DEFINE_PER_CPU_READ_MOSTLY(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET;
27171 EXPORT_PER_CPU_SYMBOL(this_cpu_off);
27172
27173-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = {
27174+unsigned long __per_cpu_offset[NR_CPUS] __read_only = {
27175 [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET,
27176 };
27177 EXPORT_SYMBOL(__per_cpu_offset);
27178@@ -66,7 +64,7 @@ static bool __init pcpu_need_numa(void)
27179 {
27180 #ifdef CONFIG_NEED_MULTIPLE_NODES
27181 pg_data_t *last = NULL;
27182- unsigned int cpu;
27183+ int cpu;
27184
27185 for_each_possible_cpu(cpu) {
27186 int node = early_cpu_to_node(cpu);
27187@@ -155,10 +153,10 @@ static inline void setup_percpu_segment(int cpu)
27188 {
27189 #ifdef CONFIG_X86_32
27190 struct desc_struct gdt;
27191+ unsigned long base = per_cpu_offset(cpu);
27192
27193- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF,
27194- 0x2 | DESCTYPE_S, 0x8);
27195- gdt.s = 1;
27196+ pack_descriptor(&gdt, base, (VMALLOC_END - base - 1) >> PAGE_SHIFT,
27197+ 0x83 | DESCTYPE_S, 0xC);
27198 write_gdt_entry(get_cpu_gdt_table(cpu),
27199 GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S);
27200 #endif
27201@@ -219,6 +217,11 @@ void __init setup_per_cpu_areas(void)
27202 /* alrighty, percpu areas up and running */
27203 delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;
27204 for_each_possible_cpu(cpu) {
27205+#ifdef CONFIG_CC_STACKPROTECTOR
27206+#ifdef CONFIG_X86_32
27207+ unsigned long canary = per_cpu(stack_canary.canary, cpu);
27208+#endif
27209+#endif
27210 per_cpu_offset(cpu) = delta + pcpu_unit_offsets[cpu];
27211 per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu);
27212 per_cpu(cpu_number, cpu) = cpu;
27213@@ -259,6 +262,12 @@ void __init setup_per_cpu_areas(void)
27214 */
27215 set_cpu_numa_node(cpu, early_cpu_to_node(cpu));
27216 #endif
27217+#ifdef CONFIG_CC_STACKPROTECTOR
27218+#ifdef CONFIG_X86_32
27219+ if (!cpu)
27220+ per_cpu(stack_canary.canary, cpu) = canary;
27221+#endif
27222+#endif
27223 /*
27224 * Up to this point, the boot CPU has been using .init.data
27225 * area. Reload any changed state for the boot CPU.
27226diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
27227index e504246..ba10432 100644
27228--- a/arch/x86/kernel/signal.c
27229+++ b/arch/x86/kernel/signal.c
27230@@ -190,7 +190,7 @@ static unsigned long align_sigframe(unsigned long sp)
27231 * Align the stack pointer according to the i386 ABI,
27232 * i.e. so that on function entry ((sp + 4) & 15) == 0.
27233 */
27234- sp = ((sp + 4) & -16ul) - 4;
27235+ sp = ((sp - 12) & -16ul) - 4;
27236 #else /* !CONFIG_X86_32 */
27237 sp = round_down(sp, 16) - 8;
27238 #endif
27239@@ -298,10 +298,9 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27240 }
27241
27242 if (current->mm->context.vdso)
27243- restorer = current->mm->context.vdso +
27244- selected_vdso32->sym___kernel_sigreturn;
27245+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_sigreturn);
27246 else
27247- restorer = &frame->retcode;
27248+ restorer = (void __user *)&frame->retcode;
27249 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27250 restorer = ksig->ka.sa.sa_restorer;
27251
27252@@ -315,7 +314,7 @@ __setup_frame(int sig, struct ksignal *ksig, sigset_t *set,
27253 * reasons and because gdb uses it as a signature to notice
27254 * signal handler stack frames.
27255 */
27256- err |= __put_user(*((u64 *)&retcode), (u64 *)frame->retcode);
27257+ err |= __put_user(*((u64 *)&retcode), (u64 __user *)frame->retcode);
27258
27259 if (err)
27260 return -EFAULT;
27261@@ -362,8 +361,10 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27262 save_altstack_ex(&frame->uc.uc_stack, regs->sp);
27263
27264 /* Set up to return from userspace. */
27265- restorer = current->mm->context.vdso +
27266- selected_vdso32->sym___kernel_rt_sigreturn;
27267+ if (current->mm->context.vdso)
27268+ restorer = (void __force_user *)(current->mm->context.vdso + selected_vdso32->sym___kernel_rt_sigreturn);
27269+ else
27270+ restorer = (void __user *)&frame->retcode;
27271 if (ksig->ka.sa.sa_flags & SA_RESTORER)
27272 restorer = ksig->ka.sa.sa_restorer;
27273 put_user_ex(restorer, &frame->pretcode);
27274@@ -375,7 +376,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
27275 * reasons and because gdb uses it as a signature to notice
27276 * signal handler stack frames.
27277 */
27278- put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode);
27279+ put_user_ex(*((u64 *)&rt_retcode), (u64 __user *)frame->retcode);
27280 } put_user_catch(err);
27281
27282 err |= copy_siginfo_to_user(&frame->info, &ksig->info);
27283@@ -611,7 +612,12 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27284 {
27285 int usig = signr_convert(ksig->sig);
27286 sigset_t *set = sigmask_to_save();
27287- compat_sigset_t *cset = (compat_sigset_t *) set;
27288+ sigset_t sigcopy;
27289+ compat_sigset_t *cset;
27290+
27291+ sigcopy = *set;
27292+
27293+ cset = (compat_sigset_t *) &sigcopy;
27294
27295 /* Set up the stack frame */
27296 if (is_ia32_frame()) {
27297@@ -622,7 +628,7 @@ setup_rt_frame(struct ksignal *ksig, struct pt_regs *regs)
27298 } else if (is_x32_frame()) {
27299 return x32_setup_rt_frame(ksig, cset, regs);
27300 } else {
27301- return __setup_rt_frame(ksig->sig, ksig, set, regs);
27302+ return __setup_rt_frame(ksig->sig, ksig, &sigcopy, regs);
27303 }
27304 }
27305
27306diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
27307index be8e1bd..a3d93fa 100644
27308--- a/arch/x86/kernel/smp.c
27309+++ b/arch/x86/kernel/smp.c
27310@@ -341,7 +341,7 @@ static int __init nonmi_ipi_setup(char *str)
27311
27312 __setup("nonmi_ipi", nonmi_ipi_setup);
27313
27314-struct smp_ops smp_ops = {
27315+struct smp_ops smp_ops __read_only = {
27316 .smp_prepare_boot_cpu = native_smp_prepare_boot_cpu,
27317 .smp_prepare_cpus = native_smp_prepare_cpus,
27318 .smp_cpus_done = native_smp_cpus_done,
27319diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
27320index febc6aa..37d8edf 100644
27321--- a/arch/x86/kernel/smpboot.c
27322+++ b/arch/x86/kernel/smpboot.c
27323@@ -229,14 +229,17 @@ static void notrace start_secondary(void *unused)
27324
27325 enable_start_cpu0 = 0;
27326
27327-#ifdef CONFIG_X86_32
27328+ /* otherwise gcc will move up smp_processor_id before the cpu_init */
27329+ barrier();
27330+
27331 /* switch away from the initial page table */
27332+#ifdef CONFIG_PAX_PER_CPU_PGD
27333+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
27334+#else
27335 load_cr3(swapper_pg_dir);
27336+#endif
27337 __flush_tlb_all();
27338-#endif
27339
27340- /* otherwise gcc will move up smp_processor_id before the cpu_init */
27341- barrier();
27342 /*
27343 * Check TSC synchronization with the BP:
27344 */
27345@@ -800,8 +803,9 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27346 alternatives_enable_smp();
27347
27348 idle->thread.sp = (unsigned long) (((struct pt_regs *)
27349- (THREAD_SIZE + task_stack_page(idle))) - 1);
27350+ (THREAD_SIZE - 16 + task_stack_page(idle))) - 1);
27351 per_cpu(current_task, cpu) = idle;
27352+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
27353
27354 #ifdef CONFIG_X86_32
27355 /* Stack for startup_32 can be just as for start_secondary onwards */
27356@@ -810,10 +814,10 @@ static int do_boot_cpu(int apicid, int cpu, struct task_struct *idle)
27357 clear_tsk_thread_flag(idle, TIF_FORK);
27358 initial_gs = per_cpu_offset(cpu);
27359 #endif
27360- per_cpu(kernel_stack, cpu) =
27361- (unsigned long)task_stack_page(idle) -
27362- KERNEL_STACK_OFFSET + THREAD_SIZE;
27363+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
27364+ pax_open_kernel();
27365 early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu);
27366+ pax_close_kernel();
27367 initial_code = (unsigned long)start_secondary;
27368 stack_start = idle->thread.sp;
27369
27370@@ -953,6 +957,15 @@ int native_cpu_up(unsigned int cpu, struct task_struct *tidle)
27371 /* the FPU context is blank, nobody can own it */
27372 __cpu_disable_lazy_restore(cpu);
27373
27374+#ifdef CONFIG_PAX_PER_CPU_PGD
27375+ clone_pgd_range(get_cpu_pgd(cpu, kernel) + KERNEL_PGD_BOUNDARY,
27376+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27377+ KERNEL_PGD_PTRS);
27378+ clone_pgd_range(get_cpu_pgd(cpu, user) + KERNEL_PGD_BOUNDARY,
27379+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
27380+ KERNEL_PGD_PTRS);
27381+#endif
27382+
27383 err = do_boot_cpu(apicid, cpu, tidle);
27384 if (err) {
27385 pr_err("do_boot_cpu failed(%d) to wakeup CPU#%u\n", err, cpu);
27386diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
27387index 9b4d51d..5d28b58 100644
27388--- a/arch/x86/kernel/step.c
27389+++ b/arch/x86/kernel/step.c
27390@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27391 struct desc_struct *desc;
27392 unsigned long base;
27393
27394- seg &= ~7UL;
27395+ seg >>= 3;
27396
27397 mutex_lock(&child->mm->context.lock);
27398- if (unlikely((seg >> 3) >= child->mm->context.size))
27399+ if (unlikely(seg >= child->mm->context.size))
27400 addr = -1L; /* bogus selector, access would fault */
27401 else {
27402 desc = child->mm->context.ldt + seg;
27403@@ -42,7 +42,8 @@ unsigned long convert_ip_to_linear(struct task_struct *child, struct pt_regs *re
27404 addr += base;
27405 }
27406 mutex_unlock(&child->mm->context.lock);
27407- }
27408+ } else if (seg == __KERNEL_CS || seg == __KERNEXEC_KERNEL_CS)
27409+ addr = ktla_ktva(addr);
27410
27411 return addr;
27412 }
27413@@ -53,6 +54,9 @@ static int is_setting_trap_flag(struct task_struct *child, struct pt_regs *regs)
27414 unsigned char opcode[15];
27415 unsigned long addr = convert_ip_to_linear(child, regs);
27416
27417+ if (addr == -EINVAL)
27418+ return 0;
27419+
27420 copied = access_process_vm(child, addr, opcode, sizeof(opcode), 0);
27421 for (i = 0; i < copied; i++) {
27422 switch (opcode[i]) {
27423diff --git a/arch/x86/kernel/sys_i386_32.c b/arch/x86/kernel/sys_i386_32.c
27424new file mode 100644
27425index 0000000..5877189
27426--- /dev/null
27427+++ b/arch/x86/kernel/sys_i386_32.c
27428@@ -0,0 +1,189 @@
27429+/*
27430+ * This file contains various random system calls that
27431+ * have a non-standard calling sequence on the Linux/i386
27432+ * platform.
27433+ */
27434+
27435+#include <linux/errno.h>
27436+#include <linux/sched.h>
27437+#include <linux/mm.h>
27438+#include <linux/fs.h>
27439+#include <linux/smp.h>
27440+#include <linux/sem.h>
27441+#include <linux/msg.h>
27442+#include <linux/shm.h>
27443+#include <linux/stat.h>
27444+#include <linux/syscalls.h>
27445+#include <linux/mman.h>
27446+#include <linux/file.h>
27447+#include <linux/utsname.h>
27448+#include <linux/ipc.h>
27449+#include <linux/elf.h>
27450+
27451+#include <linux/uaccess.h>
27452+#include <linux/unistd.h>
27453+
27454+#include <asm/syscalls.h>
27455+
27456+int i386_mmap_check(unsigned long addr, unsigned long len, unsigned long flags)
27457+{
27458+ unsigned long pax_task_size = TASK_SIZE;
27459+
27460+#ifdef CONFIG_PAX_SEGMEXEC
27461+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
27462+ pax_task_size = SEGMEXEC_TASK_SIZE;
27463+#endif
27464+
27465+ if (flags & MAP_FIXED)
27466+ if (len > pax_task_size || addr > pax_task_size - len)
27467+ return -EINVAL;
27468+
27469+ return 0;
27470+}
27471+
27472+/*
27473+ * Align a virtual address to avoid aliasing in the I$ on AMD F15h.
27474+ */
27475+static unsigned long get_align_mask(void)
27476+{
27477+ if (va_align.flags < 0 || !(va_align.flags & ALIGN_VA_32))
27478+ return 0;
27479+
27480+ if (!(current->flags & PF_RANDOMIZE))
27481+ return 0;
27482+
27483+ return va_align.mask;
27484+}
27485+
27486+unsigned long
27487+arch_get_unmapped_area(struct file *filp, unsigned long addr,
27488+ unsigned long len, unsigned long pgoff, unsigned long flags)
27489+{
27490+ struct mm_struct *mm = current->mm;
27491+ struct vm_area_struct *vma;
27492+ unsigned long pax_task_size = TASK_SIZE;
27493+ struct vm_unmapped_area_info info;
27494+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27495+
27496+#ifdef CONFIG_PAX_SEGMEXEC
27497+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27498+ pax_task_size = SEGMEXEC_TASK_SIZE;
27499+#endif
27500+
27501+ pax_task_size -= PAGE_SIZE;
27502+
27503+ if (len > pax_task_size)
27504+ return -ENOMEM;
27505+
27506+ if (flags & MAP_FIXED)
27507+ return addr;
27508+
27509+#ifdef CONFIG_PAX_RANDMMAP
27510+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27511+#endif
27512+
27513+ if (addr) {
27514+ addr = PAGE_ALIGN(addr);
27515+ if (pax_task_size - len >= addr) {
27516+ vma = find_vma(mm, addr);
27517+ if (check_heap_stack_gap(vma, addr, len, offset))
27518+ return addr;
27519+ }
27520+ }
27521+
27522+ info.flags = 0;
27523+ info.length = len;
27524+ info.align_mask = filp ? get_align_mask() : 0;
27525+ info.align_offset = pgoff << PAGE_SHIFT;
27526+ info.threadstack_offset = offset;
27527+
27528+#ifdef CONFIG_PAX_PAGEEXEC
27529+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE)) {
27530+ info.low_limit = 0x00110000UL;
27531+ info.high_limit = mm->start_code;
27532+
27533+#ifdef CONFIG_PAX_RANDMMAP
27534+ if (mm->pax_flags & MF_PAX_RANDMMAP)
27535+ info.low_limit += mm->delta_mmap & 0x03FFF000UL;
27536+#endif
27537+
27538+ if (info.low_limit < info.high_limit) {
27539+ addr = vm_unmapped_area(&info);
27540+ if (!IS_ERR_VALUE(addr))
27541+ return addr;
27542+ }
27543+ } else
27544+#endif
27545+
27546+ info.low_limit = mm->mmap_base;
27547+ info.high_limit = pax_task_size;
27548+
27549+ return vm_unmapped_area(&info);
27550+}
27551+
27552+unsigned long
27553+arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27554+ const unsigned long len, const unsigned long pgoff,
27555+ const unsigned long flags)
27556+{
27557+ struct vm_area_struct *vma;
27558+ struct mm_struct *mm = current->mm;
27559+ unsigned long addr = addr0, pax_task_size = TASK_SIZE;
27560+ struct vm_unmapped_area_info info;
27561+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27562+
27563+#ifdef CONFIG_PAX_SEGMEXEC
27564+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
27565+ pax_task_size = SEGMEXEC_TASK_SIZE;
27566+#endif
27567+
27568+ pax_task_size -= PAGE_SIZE;
27569+
27570+ /* requested length too big for entire address space */
27571+ if (len > pax_task_size)
27572+ return -ENOMEM;
27573+
27574+ if (flags & MAP_FIXED)
27575+ return addr;
27576+
27577+#ifdef CONFIG_PAX_PAGEEXEC
27578+ if (!(__supported_pte_mask & _PAGE_NX) && (mm->pax_flags & MF_PAX_PAGEEXEC) && (flags & MAP_EXECUTABLE))
27579+ goto bottomup;
27580+#endif
27581+
27582+#ifdef CONFIG_PAX_RANDMMAP
27583+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27584+#endif
27585+
27586+ /* requesting a specific address */
27587+ if (addr) {
27588+ addr = PAGE_ALIGN(addr);
27589+ if (pax_task_size - len >= addr) {
27590+ vma = find_vma(mm, addr);
27591+ if (check_heap_stack_gap(vma, addr, len, offset))
27592+ return addr;
27593+ }
27594+ }
27595+
27596+ info.flags = VM_UNMAPPED_AREA_TOPDOWN;
27597+ info.length = len;
27598+ info.low_limit = PAGE_SIZE;
27599+ info.high_limit = mm->mmap_base;
27600+ info.align_mask = filp ? get_align_mask() : 0;
27601+ info.align_offset = pgoff << PAGE_SHIFT;
27602+ info.threadstack_offset = offset;
27603+
27604+ addr = vm_unmapped_area(&info);
27605+ if (!(addr & ~PAGE_MASK))
27606+ return addr;
27607+ VM_BUG_ON(addr != -ENOMEM);
27608+
27609+bottomup:
27610+ /*
27611+ * A failed mmap() very likely causes application failure,
27612+ * so fall back to the bottom-up function here. This scenario
27613+ * can happen with large stack limits and large mmap()
27614+ * allocations.
27615+ */
27616+ return arch_get_unmapped_area(filp, addr0, len, pgoff, flags);
27617+}
27618diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c
27619index 30277e2..5664a29 100644
27620--- a/arch/x86/kernel/sys_x86_64.c
27621+++ b/arch/x86/kernel/sys_x86_64.c
27622@@ -81,8 +81,8 @@ out:
27623 return error;
27624 }
27625
27626-static void find_start_end(unsigned long flags, unsigned long *begin,
27627- unsigned long *end)
27628+static void find_start_end(struct mm_struct *mm, unsigned long flags,
27629+ unsigned long *begin, unsigned long *end)
27630 {
27631 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT)) {
27632 unsigned long new_begin;
27633@@ -101,7 +101,7 @@ static void find_start_end(unsigned long flags, unsigned long *begin,
27634 *begin = new_begin;
27635 }
27636 } else {
27637- *begin = current->mm->mmap_legacy_base;
27638+ *begin = mm->mmap_legacy_base;
27639 *end = TASK_SIZE;
27640 }
27641 }
27642@@ -114,20 +114,24 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27643 struct vm_area_struct *vma;
27644 struct vm_unmapped_area_info info;
27645 unsigned long begin, end;
27646+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27647
27648 if (flags & MAP_FIXED)
27649 return addr;
27650
27651- find_start_end(flags, &begin, &end);
27652+ find_start_end(mm, flags, &begin, &end);
27653
27654 if (len > end)
27655 return -ENOMEM;
27656
27657+#ifdef CONFIG_PAX_RANDMMAP
27658+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27659+#endif
27660+
27661 if (addr) {
27662 addr = PAGE_ALIGN(addr);
27663 vma = find_vma(mm, addr);
27664- if (end - len >= addr &&
27665- (!vma || addr + len <= vma->vm_start))
27666+ if (end - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27667 return addr;
27668 }
27669
27670@@ -137,6 +141,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
27671 info.high_limit = end;
27672 info.align_mask = filp ? get_align_mask() : 0;
27673 info.align_offset = pgoff << PAGE_SHIFT;
27674+ info.threadstack_offset = offset;
27675 return vm_unmapped_area(&info);
27676 }
27677
27678@@ -149,6 +154,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27679 struct mm_struct *mm = current->mm;
27680 unsigned long addr = addr0;
27681 struct vm_unmapped_area_info info;
27682+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
27683
27684 /* requested length too big for entire address space */
27685 if (len > TASK_SIZE)
27686@@ -161,12 +167,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27687 if (!test_thread_flag(TIF_ADDR32) && (flags & MAP_32BIT))
27688 goto bottomup;
27689
27690+#ifdef CONFIG_PAX_RANDMMAP
27691+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
27692+#endif
27693+
27694 /* requesting a specific address */
27695 if (addr) {
27696 addr = PAGE_ALIGN(addr);
27697 vma = find_vma(mm, addr);
27698- if (TASK_SIZE - len >= addr &&
27699- (!vma || addr + len <= vma->vm_start))
27700+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
27701 return addr;
27702 }
27703
27704@@ -176,6 +185,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
27705 info.high_limit = mm->mmap_base;
27706 info.align_mask = filp ? get_align_mask() : 0;
27707 info.align_offset = pgoff << PAGE_SHIFT;
27708+ info.threadstack_offset = offset;
27709 addr = vm_unmapped_area(&info);
27710 if (!(addr & ~PAGE_MASK))
27711 return addr;
27712diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
27713index 91a4496..42fc304 100644
27714--- a/arch/x86/kernel/tboot.c
27715+++ b/arch/x86/kernel/tboot.c
27716@@ -44,6 +44,7 @@
27717 #include <asm/setup.h>
27718 #include <asm/e820.h>
27719 #include <asm/io.h>
27720+#include <asm/tlbflush.h>
27721
27722 #include "../realmode/rm/wakeup.h"
27723
27724@@ -221,7 +222,7 @@ static int tboot_setup_sleep(void)
27725
27726 void tboot_shutdown(u32 shutdown_type)
27727 {
27728- void (*shutdown)(void);
27729+ void (* __noreturn shutdown)(void);
27730
27731 if (!tboot_enabled())
27732 return;
27733@@ -242,8 +243,9 @@ void tboot_shutdown(u32 shutdown_type)
27734 tboot->shutdown_type = shutdown_type;
27735
27736 switch_to_tboot_pt();
27737+ cr4_clear_bits(X86_CR4_PCIDE);
27738
27739- shutdown = (void(*)(void))(unsigned long)tboot->shutdown_entry;
27740+ shutdown = (void *)(unsigned long)tboot->shutdown_entry;
27741 shutdown();
27742
27743 /* should not reach here */
27744@@ -310,7 +312,7 @@ static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
27745 return -ENODEV;
27746 }
27747
27748-static atomic_t ap_wfs_count;
27749+static atomic_unchecked_t ap_wfs_count;
27750
27751 static int tboot_wait_for_aps(int num_aps)
27752 {
27753@@ -334,9 +336,9 @@ static int tboot_cpu_callback(struct notifier_block *nfb, unsigned long action,
27754 {
27755 switch (action) {
27756 case CPU_DYING:
27757- atomic_inc(&ap_wfs_count);
27758+ atomic_inc_unchecked(&ap_wfs_count);
27759 if (num_online_cpus() == 1)
27760- if (tboot_wait_for_aps(atomic_read(&ap_wfs_count)))
27761+ if (tboot_wait_for_aps(atomic_read_unchecked(&ap_wfs_count)))
27762 return NOTIFY_BAD;
27763 break;
27764 }
27765@@ -422,7 +424,7 @@ static __init int tboot_late_init(void)
27766
27767 tboot_create_trampoline();
27768
27769- atomic_set(&ap_wfs_count, 0);
27770+ atomic_set_unchecked(&ap_wfs_count, 0);
27771 register_hotcpu_notifier(&tboot_cpu_notifier);
27772
27773 #ifdef CONFIG_DEBUG_FS
27774diff --git a/arch/x86/kernel/time.c b/arch/x86/kernel/time.c
27775index 25adc0e..1df4349 100644
27776--- a/arch/x86/kernel/time.c
27777+++ b/arch/x86/kernel/time.c
27778@@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs *regs)
27779 {
27780 unsigned long pc = instruction_pointer(regs);
27781
27782- if (!user_mode_vm(regs) && in_lock_functions(pc)) {
27783+ if (!user_mode(regs) && in_lock_functions(pc)) {
27784 #ifdef CONFIG_FRAME_POINTER
27785- return *(unsigned long *)(regs->bp + sizeof(long));
27786+ return ktla_ktva(*(unsigned long *)(regs->bp + sizeof(long)));
27787 #else
27788 unsigned long *sp =
27789 (unsigned long *)kernel_stack_pointer(regs);
27790@@ -41,11 +41,17 @@ unsigned long profile_pc(struct pt_regs *regs)
27791 * or above a saved flags. Eflags has bits 22-31 zero,
27792 * kernel addresses don't.
27793 */
27794+
27795+#ifdef CONFIG_PAX_KERNEXEC
27796+ return ktla_ktva(sp[0]);
27797+#else
27798 if (sp[0] >> 22)
27799 return sp[0];
27800 if (sp[1] >> 22)
27801 return sp[1];
27802 #endif
27803+
27804+#endif
27805 }
27806 return pc;
27807 }
27808diff --git a/arch/x86/kernel/tls.c b/arch/x86/kernel/tls.c
27809index 7fc5e84..c6e445a 100644
27810--- a/arch/x86/kernel/tls.c
27811+++ b/arch/x86/kernel/tls.c
27812@@ -139,6 +139,11 @@ int do_set_thread_area(struct task_struct *p, int idx,
27813 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
27814 return -EINVAL;
27815
27816+#ifdef CONFIG_PAX_SEGMEXEC
27817+ if ((p->mm->pax_flags & MF_PAX_SEGMEXEC) && (info.contents & MODIFY_LDT_CONTENTS_CODE))
27818+ return -EINVAL;
27819+#endif
27820+
27821 set_tls_desc(p, idx, &info, 1);
27822
27823 return 0;
27824@@ -256,7 +261,7 @@ int regset_tls_set(struct task_struct *target, const struct user_regset *regset,
27825
27826 if (kbuf)
27827 info = kbuf;
27828- else if (__copy_from_user(infobuf, ubuf, count))
27829+ else if (count > sizeof infobuf || __copy_from_user(infobuf, ubuf, count))
27830 return -EFAULT;
27831 else
27832 info = infobuf;
27833diff --git a/arch/x86/kernel/tracepoint.c b/arch/x86/kernel/tracepoint.c
27834index 1c113db..287b42e 100644
27835--- a/arch/x86/kernel/tracepoint.c
27836+++ b/arch/x86/kernel/tracepoint.c
27837@@ -9,11 +9,11 @@
27838 #include <linux/atomic.h>
27839
27840 atomic_t trace_idt_ctr = ATOMIC_INIT(0);
27841-struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27842+const struct desc_ptr trace_idt_descr = { NR_VECTORS * 16 - 1,
27843 (unsigned long) trace_idt_table };
27844
27845 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27846-gate_desc trace_idt_table[NR_VECTORS] __page_aligned_bss;
27847+gate_desc trace_idt_table[NR_VECTORS] __page_aligned_rodata;
27848
27849 static int trace_irq_vector_refcount;
27850 static DEFINE_MUTEX(irq_vector_mutex);
27851diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
27852index 4ff5d16..736e3e1 100644
27853--- a/arch/x86/kernel/traps.c
27854+++ b/arch/x86/kernel/traps.c
27855@@ -68,7 +68,7 @@
27856 #include <asm/proto.h>
27857
27858 /* No need to be aligned, but done to keep all IDTs defined the same way. */
27859-gate_desc debug_idt_table[NR_VECTORS] __page_aligned_bss;
27860+gate_desc debug_idt_table[NR_VECTORS] __page_aligned_rodata;
27861 #else
27862 #include <asm/processor-flags.h>
27863 #include <asm/setup.h>
27864@@ -77,7 +77,7 @@ asmlinkage int system_call(void);
27865 #endif
27866
27867 /* Must be page-aligned because the real IDT is used in a fixmap. */
27868-gate_desc idt_table[NR_VECTORS] __page_aligned_bss;
27869+gate_desc idt_table[NR_VECTORS] __page_aligned_rodata;
27870
27871 DECLARE_BITMAP(used_vectors, NR_VECTORS);
27872 EXPORT_SYMBOL_GPL(used_vectors);
27873@@ -112,7 +112,7 @@ enum ctx_state ist_enter(struct pt_regs *regs)
27874 {
27875 enum ctx_state prev_state;
27876
27877- if (user_mode_vm(regs)) {
27878+ if (user_mode(regs)) {
27879 /* Other than that, we're just an exception. */
27880 prev_state = exception_enter();
27881 } else {
27882@@ -146,7 +146,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27883 /* Must be before exception_exit. */
27884 preempt_count_sub(HARDIRQ_OFFSET);
27885
27886- if (user_mode_vm(regs))
27887+ if (user_mode(regs))
27888 return exception_exit(prev_state);
27889 else
27890 rcu_nmi_exit();
27891@@ -158,7 +158,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27892 *
27893 * IST exception handlers normally cannot schedule. As a special
27894 * exception, if the exception interrupted userspace code (i.e.
27895- * user_mode_vm(regs) would return true) and the exception was not
27896+ * user_mode(regs) would return true) and the exception was not
27897 * a double fault, it can be safe to schedule. ist_begin_non_atomic()
27898 * begins a non-atomic section within an ist_enter()/ist_exit() region.
27899 * Callers are responsible for enabling interrupts themselves inside
27900@@ -167,7 +167,7 @@ void ist_exit(struct pt_regs *regs, enum ctx_state prev_state)
27901 */
27902 void ist_begin_non_atomic(struct pt_regs *regs)
27903 {
27904- BUG_ON(!user_mode_vm(regs));
27905+ BUG_ON(!user_mode(regs));
27906
27907 /*
27908 * Sanity check: we need to be on the normal thread stack. This
27909@@ -191,11 +191,11 @@ void ist_end_non_atomic(void)
27910 }
27911
27912 static nokprobe_inline int
27913-do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27914+do_trap_no_signal(struct task_struct *tsk, int trapnr, const char *str,
27915 struct pt_regs *regs, long error_code)
27916 {
27917 #ifdef CONFIG_X86_32
27918- if (regs->flags & X86_VM_MASK) {
27919+ if (v8086_mode(regs)) {
27920 /*
27921 * Traps 0, 1, 3, 4, and 5 should be forwarded to vm86.
27922 * On nmi (interrupt 2), do_trap should not be called.
27923@@ -208,12 +208,24 @@ do_trap_no_signal(struct task_struct *tsk, int trapnr, char *str,
27924 return -1;
27925 }
27926 #endif
27927- if (!user_mode(regs)) {
27928+ if (!user_mode_novm(regs)) {
27929 if (!fixup_exception(regs)) {
27930 tsk->thread.error_code = error_code;
27931 tsk->thread.trap_nr = trapnr;
27932+
27933+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
27934+ if (trapnr == X86_TRAP_SS && ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS))
27935+ str = "PAX: suspicious stack segment fault";
27936+#endif
27937+
27938 die(str, regs, error_code);
27939 }
27940+
27941+#ifdef CONFIG_PAX_REFCOUNT
27942+ if (trapnr == X86_TRAP_OF)
27943+ pax_report_refcount_overflow(regs);
27944+#endif
27945+
27946 return 0;
27947 }
27948
27949@@ -252,7 +264,7 @@ static siginfo_t *fill_trap_info(struct pt_regs *regs, int signr, int trapnr,
27950 }
27951
27952 static void
27953-do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27954+do_trap(int trapnr, int signr, const char *str, struct pt_regs *regs,
27955 long error_code, siginfo_t *info)
27956 {
27957 struct task_struct *tsk = current;
27958@@ -276,7 +288,7 @@ do_trap(int trapnr, int signr, char *str, struct pt_regs *regs,
27959 if (show_unhandled_signals && unhandled_signal(tsk, signr) &&
27960 printk_ratelimit()) {
27961 pr_info("%s[%d] trap %s ip:%lx sp:%lx error:%lx",
27962- tsk->comm, tsk->pid, str,
27963+ tsk->comm, task_pid_nr(tsk), str,
27964 regs->ip, regs->sp, error_code);
27965 print_vma_addr(" in ", regs->ip);
27966 pr_cont("\n");
27967@@ -358,6 +370,11 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code)
27968 tsk->thread.error_code = error_code;
27969 tsk->thread.trap_nr = X86_TRAP_DF;
27970
27971+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
27972+ if ((unsigned long)tsk->stack - regs->sp <= PAGE_SIZE)
27973+ die("grsec: kernel stack overflow detected", regs, error_code);
27974+#endif
27975+
27976 #ifdef CONFIG_DOUBLEFAULT
27977 df_debug(regs, error_code);
27978 #endif
27979@@ -384,7 +401,7 @@ dotraplinkage void do_bounds(struct pt_regs *regs, long error_code)
27980 goto exit;
27981 conditional_sti(regs);
27982
27983- if (!user_mode_vm(regs))
27984+ if (!user_mode(regs))
27985 die("bounds", regs, error_code);
27986
27987 if (!cpu_feature_enabled(X86_FEATURE_MPX)) {
27988@@ -463,7 +480,7 @@ do_general_protection(struct pt_regs *regs, long error_code)
27989 conditional_sti(regs);
27990
27991 #ifdef CONFIG_X86_32
27992- if (regs->flags & X86_VM_MASK) {
27993+ if (v8086_mode(regs)) {
27994 local_irq_enable();
27995 handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
27996 goto exit;
27997@@ -471,18 +488,42 @@ do_general_protection(struct pt_regs *regs, long error_code)
27998 #endif
27999
28000 tsk = current;
28001- if (!user_mode(regs)) {
28002+ if (!user_mode_novm(regs)) {
28003 if (fixup_exception(regs))
28004 goto exit;
28005
28006 tsk->thread.error_code = error_code;
28007 tsk->thread.trap_nr = X86_TRAP_GP;
28008 if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
28009- X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP)
28010+ X86_TRAP_GP, SIGSEGV) != NOTIFY_STOP) {
28011+
28012+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28013+ if ((regs->cs & 0xFFFF) == __KERNEL_CS || (regs->cs & 0xFFFF) == __KERNEXEC_KERNEL_CS)
28014+ die("PAX: suspicious general protection fault", regs, error_code);
28015+ else
28016+#endif
28017+
28018 die("general protection fault", regs, error_code);
28019+ }
28020 goto exit;
28021 }
28022
28023+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
28024+ if (!(__supported_pte_mask & _PAGE_NX) && tsk->mm && (tsk->mm->pax_flags & MF_PAX_PAGEEXEC)) {
28025+ struct mm_struct *mm = tsk->mm;
28026+ unsigned long limit;
28027+
28028+ down_write(&mm->mmap_sem);
28029+ limit = mm->context.user_cs_limit;
28030+ if (limit < TASK_SIZE) {
28031+ track_exec_limit(mm, limit, TASK_SIZE, VM_EXEC);
28032+ up_write(&mm->mmap_sem);
28033+ return;
28034+ }
28035+ up_write(&mm->mmap_sem);
28036+ }
28037+#endif
28038+
28039 tsk->thread.error_code = error_code;
28040 tsk->thread.trap_nr = X86_TRAP_GP;
28041
28042@@ -581,13 +622,16 @@ struct bad_iret_stack *fixup_bad_iret(struct bad_iret_stack *s)
28043 container_of(task_pt_regs(current),
28044 struct bad_iret_stack, regs);
28045
28046+ if ((current->thread.sp0 ^ (unsigned long)s) < THREAD_SIZE)
28047+ new_stack = s;
28048+
28049 /* Copy the IRET target to the new stack. */
28050 memmove(&new_stack->regs.ip, (void *)s->regs.sp, 5*8);
28051
28052 /* Copy the remainder of the stack from the current stack. */
28053 memmove(new_stack, s, offsetof(struct bad_iret_stack, regs.ip));
28054
28055- BUG_ON(!user_mode_vm(&new_stack->regs));
28056+ BUG_ON(!user_mode(&new_stack->regs));
28057 return new_stack;
28058 }
28059 NOKPROBE_SYMBOL(fixup_bad_iret);
28060@@ -637,7 +681,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28061 * then it's very likely the result of an icebp/int01 trap.
28062 * User wants a sigtrap for that.
28063 */
28064- if (!dr6 && user_mode_vm(regs))
28065+ if (!dr6 && user_mode(regs))
28066 user_icebp = 1;
28067
28068 /* Catch kmemcheck conditions first of all! */
28069@@ -673,7 +717,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28070 /* It's safe to allow irq's after DR6 has been saved */
28071 preempt_conditional_sti(regs);
28072
28073- if (regs->flags & X86_VM_MASK) {
28074+ if (v8086_mode(regs)) {
28075 handle_vm86_trap((struct kernel_vm86_regs *) regs, error_code,
28076 X86_TRAP_DB);
28077 preempt_conditional_cli(regs);
28078@@ -688,7 +732,7 @@ dotraplinkage void do_debug(struct pt_regs *regs, long error_code)
28079 * We already checked v86 mode above, so we can check for kernel mode
28080 * by just checking the CPL of CS.
28081 */
28082- if ((dr6 & DR_STEP) && !user_mode(regs)) {
28083+ if ((dr6 & DR_STEP) && !user_mode_novm(regs)) {
28084 tsk->thread.debugreg6 &= ~DR_STEP;
28085 set_tsk_thread_flag(tsk, TIF_SINGLESTEP);
28086 regs->flags &= ~X86_EFLAGS_TF;
28087@@ -721,7 +765,7 @@ static void math_error(struct pt_regs *regs, int error_code, int trapnr)
28088 return;
28089 conditional_sti(regs);
28090
28091- if (!user_mode_vm(regs))
28092+ if (!user_mode(regs))
28093 {
28094 if (!fixup_exception(regs)) {
28095 task->thread.error_code = error_code;
28096diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
28097index 5054497..139f8f8 100644
28098--- a/arch/x86/kernel/tsc.c
28099+++ b/arch/x86/kernel/tsc.c
28100@@ -150,7 +150,7 @@ static void cyc2ns_write_end(int cpu, struct cyc2ns_data *data)
28101 */
28102 smp_wmb();
28103
28104- ACCESS_ONCE(c2n->head) = data;
28105+ ACCESS_ONCE_RW(c2n->head) = data;
28106 }
28107
28108 /*
28109diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
28110index 81f8adb0..fff670e 100644
28111--- a/arch/x86/kernel/uprobes.c
28112+++ b/arch/x86/kernel/uprobes.c
28113@@ -912,7 +912,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val,
28114 int ret = NOTIFY_DONE;
28115
28116 /* We are only interested in userspace traps */
28117- if (regs && !user_mode_vm(regs))
28118+ if (regs && !user_mode(regs))
28119 return NOTIFY_DONE;
28120
28121 switch (val) {
28122@@ -986,7 +986,7 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, struct pt_regs
28123
28124 if (nleft != rasize) {
28125 pr_err("uprobe: return address clobbered: pid=%d, %%sp=%#lx, "
28126- "%%ip=%#lx\n", current->pid, regs->sp, regs->ip);
28127+ "%%ip=%#lx\n", task_pid_nr(current), regs->sp, regs->ip);
28128
28129 force_sig_info(SIGSEGV, SEND_SIG_FORCED, current);
28130 }
28131diff --git a/arch/x86/kernel/verify_cpu.S b/arch/x86/kernel/verify_cpu.S
28132index b9242ba..50c5edd 100644
28133--- a/arch/x86/kernel/verify_cpu.S
28134+++ b/arch/x86/kernel/verify_cpu.S
28135@@ -20,6 +20,7 @@
28136 * arch/x86/boot/compressed/head_64.S: Boot cpu verification
28137 * arch/x86/kernel/trampoline_64.S: secondary processor verification
28138 * arch/x86/kernel/head_32.S: processor startup
28139+ * arch/x86/kernel/acpi/realmode/wakeup.S: 32bit processor resume
28140 *
28141 * verify_cpu, returns the status of longmode and SSE in register %eax.
28142 * 0: Success 1: Failure
28143diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
28144index e8edcf5..27f9344 100644
28145--- a/arch/x86/kernel/vm86_32.c
28146+++ b/arch/x86/kernel/vm86_32.c
28147@@ -44,6 +44,7 @@
28148 #include <linux/ptrace.h>
28149 #include <linux/audit.h>
28150 #include <linux/stddef.h>
28151+#include <linux/grsecurity.h>
28152
28153 #include <asm/uaccess.h>
28154 #include <asm/io.h>
28155@@ -150,7 +151,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs)
28156 do_exit(SIGSEGV);
28157 }
28158
28159- tss = &per_cpu(init_tss, get_cpu());
28160+ tss = init_tss + get_cpu();
28161 current->thread.sp0 = current->thread.saved_sp0;
28162 current->thread.sysenter_cs = __KERNEL_CS;
28163 load_sp0(tss, &current->thread);
28164@@ -214,6 +215,14 @@ SYSCALL_DEFINE1(vm86old, struct vm86_struct __user *, v86)
28165
28166 if (tsk->thread.saved_sp0)
28167 return -EPERM;
28168+
28169+#ifdef CONFIG_GRKERNSEC_VM86
28170+ if (!capable(CAP_SYS_RAWIO)) {
28171+ gr_handle_vm86();
28172+ return -EPERM;
28173+ }
28174+#endif
28175+
28176 tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs,
28177 offsetof(struct kernel_vm86_struct, vm86plus) -
28178 sizeof(info.regs));
28179@@ -238,6 +247,13 @@ SYSCALL_DEFINE2(vm86, unsigned long, cmd, unsigned long, arg)
28180 int tmp;
28181 struct vm86plus_struct __user *v86;
28182
28183+#ifdef CONFIG_GRKERNSEC_VM86
28184+ if (!capable(CAP_SYS_RAWIO)) {
28185+ gr_handle_vm86();
28186+ return -EPERM;
28187+ }
28188+#endif
28189+
28190 tsk = current;
28191 switch (cmd) {
28192 case VM86_REQUEST_IRQ:
28193@@ -318,7 +334,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
28194 tsk->thread.saved_fs = info->regs32->fs;
28195 tsk->thread.saved_gs = get_user_gs(info->regs32);
28196
28197- tss = &per_cpu(init_tss, get_cpu());
28198+ tss = init_tss + get_cpu();
28199 tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0;
28200 if (cpu_has_sep)
28201 tsk->thread.sysenter_cs = 0;
28202@@ -525,7 +541,7 @@ static void do_int(struct kernel_vm86_regs *regs, int i,
28203 goto cannot_handle;
28204 if (i == 0x21 && is_revectored(AH(regs), &KVM86->int21_revectored))
28205 goto cannot_handle;
28206- intr_ptr = (unsigned long __user *) (i << 2);
28207+ intr_ptr = (__force unsigned long __user *) (i << 2);
28208 if (get_user(segoffs, intr_ptr))
28209 goto cannot_handle;
28210 if ((segoffs >> 16) == BIOSSEG)
28211diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
28212index 00bf300..129df8e 100644
28213--- a/arch/x86/kernel/vmlinux.lds.S
28214+++ b/arch/x86/kernel/vmlinux.lds.S
28215@@ -26,6 +26,13 @@
28216 #include <asm/page_types.h>
28217 #include <asm/cache.h>
28218 #include <asm/boot.h>
28219+#include <asm/segment.h>
28220+
28221+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28222+#define __KERNEL_TEXT_OFFSET (LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR)
28223+#else
28224+#define __KERNEL_TEXT_OFFSET 0
28225+#endif
28226
28227 #undef i386 /* in case the preprocessor is a 32bit one */
28228
28229@@ -69,30 +76,43 @@ jiffies_64 = jiffies;
28230
28231 PHDRS {
28232 text PT_LOAD FLAGS(5); /* R_E */
28233+#ifdef CONFIG_X86_32
28234+ module PT_LOAD FLAGS(5); /* R_E */
28235+#endif
28236+#ifdef CONFIG_XEN
28237+ rodata PT_LOAD FLAGS(5); /* R_E */
28238+#else
28239+ rodata PT_LOAD FLAGS(4); /* R__ */
28240+#endif
28241 data PT_LOAD FLAGS(6); /* RW_ */
28242-#ifdef CONFIG_X86_64
28243+ init.begin PT_LOAD FLAGS(6); /* RW_ */
28244 #ifdef CONFIG_SMP
28245 percpu PT_LOAD FLAGS(6); /* RW_ */
28246 #endif
28247+ text.init PT_LOAD FLAGS(5); /* R_E */
28248+ text.exit PT_LOAD FLAGS(5); /* R_E */
28249 init PT_LOAD FLAGS(7); /* RWE */
28250-#endif
28251 note PT_NOTE FLAGS(0); /* ___ */
28252 }
28253
28254 SECTIONS
28255 {
28256 #ifdef CONFIG_X86_32
28257- . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
28258- phys_startup_32 = startup_32 - LOAD_OFFSET;
28259+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR;
28260 #else
28261- . = __START_KERNEL;
28262- phys_startup_64 = startup_64 - LOAD_OFFSET;
28263+ . = __START_KERNEL;
28264 #endif
28265
28266 /* Text and read-only data */
28267- .text : AT(ADDR(.text) - LOAD_OFFSET) {
28268- _text = .;
28269+ .text (. - __KERNEL_TEXT_OFFSET): AT(ADDR(.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28270 /* bootstrapping code */
28271+#ifdef CONFIG_X86_32
28272+ phys_startup_32 = startup_32 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28273+#else
28274+ phys_startup_64 = startup_64 - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28275+#endif
28276+ __LOAD_PHYSICAL_ADDR = . - LOAD_OFFSET + __KERNEL_TEXT_OFFSET;
28277+ _text = .;
28278 HEAD_TEXT
28279 . = ALIGN(8);
28280 _stext = .;
28281@@ -104,13 +124,47 @@ SECTIONS
28282 IRQENTRY_TEXT
28283 *(.fixup)
28284 *(.gnu.warning)
28285- /* End of text section */
28286- _etext = .;
28287 } :text = 0x9090
28288
28289- NOTES :text :note
28290+ . += __KERNEL_TEXT_OFFSET;
28291
28292- EXCEPTION_TABLE(16) :text = 0x9090
28293+#ifdef CONFIG_X86_32
28294+ . = ALIGN(PAGE_SIZE);
28295+ .module.text : AT(ADDR(.module.text) - LOAD_OFFSET) {
28296+
28297+#ifdef CONFIG_PAX_KERNEXEC
28298+ MODULES_EXEC_VADDR = .;
28299+ BYTE(0)
28300+ . += (CONFIG_PAX_KERNEXEC_MODULE_TEXT * 1024 * 1024);
28301+ . = ALIGN(HPAGE_SIZE) - 1;
28302+ MODULES_EXEC_END = .;
28303+#endif
28304+
28305+ } :module
28306+#endif
28307+
28308+ .text.end : AT(ADDR(.text.end) - LOAD_OFFSET) {
28309+ /* End of text section */
28310+ BYTE(0)
28311+ _etext = . - __KERNEL_TEXT_OFFSET;
28312+ }
28313+
28314+#ifdef CONFIG_X86_32
28315+ . = ALIGN(PAGE_SIZE);
28316+ .rodata.page_aligned : AT(ADDR(.rodata.page_aligned) - LOAD_OFFSET) {
28317+ . = ALIGN(PAGE_SIZE);
28318+ *(.empty_zero_page)
28319+ *(.initial_pg_fixmap)
28320+ *(.initial_pg_pmd)
28321+ *(.initial_page_table)
28322+ *(.swapper_pg_dir)
28323+ } :rodata
28324+#endif
28325+
28326+ . = ALIGN(PAGE_SIZE);
28327+ NOTES :rodata :note
28328+
28329+ EXCEPTION_TABLE(16) :rodata
28330
28331 #if defined(CONFIG_DEBUG_RODATA)
28332 /* .text should occupy whole number of pages */
28333@@ -122,16 +176,20 @@ SECTIONS
28334
28335 /* Data */
28336 .data : AT(ADDR(.data) - LOAD_OFFSET) {
28337+
28338+#ifdef CONFIG_PAX_KERNEXEC
28339+ . = ALIGN(HPAGE_SIZE);
28340+#else
28341+ . = ALIGN(PAGE_SIZE);
28342+#endif
28343+
28344 /* Start of data section */
28345 _sdata = .;
28346
28347 /* init_task */
28348 INIT_TASK_DATA(THREAD_SIZE)
28349
28350-#ifdef CONFIG_X86_32
28351- /* 32 bit has nosave before _edata */
28352 NOSAVE_DATA
28353-#endif
28354
28355 PAGE_ALIGNED_DATA(PAGE_SIZE)
28356
28357@@ -174,12 +232,19 @@ SECTIONS
28358 . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
28359
28360 /* Init code and data - will be freed after init */
28361- . = ALIGN(PAGE_SIZE);
28362 .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {
28363+ BYTE(0)
28364+
28365+#ifdef CONFIG_PAX_KERNEXEC
28366+ . = ALIGN(HPAGE_SIZE);
28367+#else
28368+ . = ALIGN(PAGE_SIZE);
28369+#endif
28370+
28371 __init_begin = .; /* paired with __init_end */
28372- }
28373+ } :init.begin
28374
28375-#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
28376+#ifdef CONFIG_SMP
28377 /*
28378 * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
28379 * output PHDR, so the next output section - .init.text - should
28380@@ -190,12 +255,27 @@ SECTIONS
28381 "per-CPU data too large - increase CONFIG_PHYSICAL_START")
28382 #endif
28383
28384- INIT_TEXT_SECTION(PAGE_SIZE)
28385-#ifdef CONFIG_X86_64
28386- :init
28387-#endif
28388+ . = ALIGN(PAGE_SIZE);
28389+ init_begin = .;
28390+ .init.text (. - __KERNEL_TEXT_OFFSET): AT(init_begin - LOAD_OFFSET) {
28391+ VMLINUX_SYMBOL(_sinittext) = .;
28392+ INIT_TEXT
28393+ . = ALIGN(PAGE_SIZE);
28394+ } :text.init
28395
28396- INIT_DATA_SECTION(16)
28397+ /*
28398+ * .exit.text is discard at runtime, not link time, to deal with
28399+ * references from .altinstructions and .eh_frame
28400+ */
28401+ .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) {
28402+ EXIT_TEXT
28403+ VMLINUX_SYMBOL(_einittext) = .;
28404+ . = ALIGN(16);
28405+ } :text.exit
28406+ . = init_begin + SIZEOF(.init.text) + SIZEOF(.exit.text);
28407+
28408+ . = ALIGN(PAGE_SIZE);
28409+ INIT_DATA_SECTION(16) :init
28410
28411 .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
28412 __x86_cpu_dev_start = .;
28413@@ -266,19 +346,12 @@ SECTIONS
28414 }
28415
28416 . = ALIGN(8);
28417- /*
28418- * .exit.text is discard at runtime, not link time, to deal with
28419- * references from .altinstructions and .eh_frame
28420- */
28421- .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
28422- EXIT_TEXT
28423- }
28424
28425 .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
28426 EXIT_DATA
28427 }
28428
28429-#if !defined(CONFIG_X86_64) || !defined(CONFIG_SMP)
28430+#ifndef CONFIG_SMP
28431 PERCPU_SECTION(INTERNODE_CACHE_BYTES)
28432 #endif
28433
28434@@ -297,16 +370,10 @@ SECTIONS
28435 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
28436 __smp_locks = .;
28437 *(.smp_locks)
28438- . = ALIGN(PAGE_SIZE);
28439 __smp_locks_end = .;
28440+ . = ALIGN(PAGE_SIZE);
28441 }
28442
28443-#ifdef CONFIG_X86_64
28444- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
28445- NOSAVE_DATA
28446- }
28447-#endif
28448-
28449 /* BSS */
28450 . = ALIGN(PAGE_SIZE);
28451 .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
28452@@ -322,6 +389,7 @@ SECTIONS
28453 __brk_base = .;
28454 . += 64 * 1024; /* 64k alignment slop space */
28455 *(.brk_reservation) /* areas brk users have reserved */
28456+ . = ALIGN(HPAGE_SIZE);
28457 __brk_limit = .;
28458 }
28459
28460@@ -348,13 +416,12 @@ SECTIONS
28461 * for the boot processor.
28462 */
28463 #define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
28464-INIT_PER_CPU(gdt_page);
28465 INIT_PER_CPU(irq_stack_union);
28466
28467 /*
28468 * Build-time check on the image size:
28469 */
28470-. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
28471+. = ASSERT((_end - _text - __KERNEL_TEXT_OFFSET <= KERNEL_IMAGE_SIZE),
28472 "kernel image bigger than KERNEL_IMAGE_SIZE");
28473
28474 #ifdef CONFIG_SMP
28475diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
28476index 2dcc6ff..082dc7a 100644
28477--- a/arch/x86/kernel/vsyscall_64.c
28478+++ b/arch/x86/kernel/vsyscall_64.c
28479@@ -38,15 +38,13 @@
28480 #define CREATE_TRACE_POINTS
28481 #include "vsyscall_trace.h"
28482
28483-static enum { EMULATE, NATIVE, NONE } vsyscall_mode = EMULATE;
28484+static enum { EMULATE, NONE } vsyscall_mode = EMULATE;
28485
28486 static int __init vsyscall_setup(char *str)
28487 {
28488 if (str) {
28489 if (!strcmp("emulate", str))
28490 vsyscall_mode = EMULATE;
28491- else if (!strcmp("native", str))
28492- vsyscall_mode = NATIVE;
28493 else if (!strcmp("none", str))
28494 vsyscall_mode = NONE;
28495 else
28496@@ -264,8 +262,7 @@ do_ret:
28497 return true;
28498
28499 sigsegv:
28500- force_sig(SIGSEGV, current);
28501- return true;
28502+ do_group_exit(SIGKILL);
28503 }
28504
28505 /*
28506@@ -283,8 +280,8 @@ static struct vm_operations_struct gate_vma_ops = {
28507 static struct vm_area_struct gate_vma = {
28508 .vm_start = VSYSCALL_ADDR,
28509 .vm_end = VSYSCALL_ADDR + PAGE_SIZE,
28510- .vm_page_prot = PAGE_READONLY_EXEC,
28511- .vm_flags = VM_READ | VM_EXEC,
28512+ .vm_page_prot = PAGE_READONLY,
28513+ .vm_flags = VM_READ,
28514 .vm_ops = &gate_vma_ops,
28515 };
28516
28517@@ -325,10 +322,7 @@ void __init map_vsyscall(void)
28518 unsigned long physaddr_vsyscall = __pa_symbol(&__vsyscall_page);
28519
28520 if (vsyscall_mode != NONE)
28521- __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall,
28522- vsyscall_mode == NATIVE
28523- ? PAGE_KERNEL_VSYSCALL
28524- : PAGE_KERNEL_VVAR);
28525+ __set_fixmap(VSYSCALL_PAGE, physaddr_vsyscall, PAGE_KERNEL_VVAR);
28526
28527 BUILD_BUG_ON((unsigned long)__fix_to_virt(VSYSCALL_PAGE) !=
28528 (unsigned long)VSYSCALL_ADDR);
28529diff --git a/arch/x86/kernel/x8664_ksyms_64.c b/arch/x86/kernel/x8664_ksyms_64.c
28530index 37d8fa4..66e319a 100644
28531--- a/arch/x86/kernel/x8664_ksyms_64.c
28532+++ b/arch/x86/kernel/x8664_ksyms_64.c
28533@@ -34,8 +34,6 @@ EXPORT_SYMBOL(copy_user_generic_string);
28534 EXPORT_SYMBOL(copy_user_generic_unrolled);
28535 EXPORT_SYMBOL(copy_user_enhanced_fast_string);
28536 EXPORT_SYMBOL(__copy_user_nocache);
28537-EXPORT_SYMBOL(_copy_from_user);
28538-EXPORT_SYMBOL(_copy_to_user);
28539
28540 EXPORT_SYMBOL(copy_page);
28541 EXPORT_SYMBOL(clear_page);
28542@@ -79,3 +77,7 @@ EXPORT_SYMBOL(___preempt_schedule);
28543 EXPORT_SYMBOL(___preempt_schedule_context);
28544 #endif
28545 #endif
28546+
28547+#ifdef CONFIG_PAX_PER_CPU_PGD
28548+EXPORT_SYMBOL(cpu_pgd);
28549+#endif
28550diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
28551index 234b072..b7ab191 100644
28552--- a/arch/x86/kernel/x86_init.c
28553+++ b/arch/x86/kernel/x86_init.c
28554@@ -93,7 +93,7 @@ struct x86_cpuinit_ops x86_cpuinit = {
28555 static void default_nmi_init(void) { };
28556 static int default_i8042_detect(void) { return 1; };
28557
28558-struct x86_platform_ops x86_platform = {
28559+struct x86_platform_ops x86_platform __read_only = {
28560 .calibrate_tsc = native_calibrate_tsc,
28561 .get_wallclock = mach_get_cmos_time,
28562 .set_wallclock = mach_set_rtc_mmss,
28563@@ -109,7 +109,7 @@ struct x86_platform_ops x86_platform = {
28564 EXPORT_SYMBOL_GPL(x86_platform);
28565
28566 #if defined(CONFIG_PCI_MSI)
28567-struct x86_msi_ops x86_msi = {
28568+struct x86_msi_ops x86_msi __read_only = {
28569 .setup_msi_irqs = native_setup_msi_irqs,
28570 .compose_msi_msg = native_compose_msi_msg,
28571 .teardown_msi_irq = native_teardown_msi_irq,
28572@@ -140,7 +140,7 @@ void arch_restore_msi_irqs(struct pci_dev *dev)
28573 }
28574 #endif
28575
28576-struct x86_io_apic_ops x86_io_apic_ops = {
28577+struct x86_io_apic_ops x86_io_apic_ops __read_only = {
28578 .init = native_io_apic_init_mappings,
28579 .read = native_io_apic_read,
28580 .write = native_io_apic_write,
28581diff --git a/arch/x86/kernel/xsave.c b/arch/x86/kernel/xsave.c
28582index cdc6cf9..e04f495 100644
28583--- a/arch/x86/kernel/xsave.c
28584+++ b/arch/x86/kernel/xsave.c
28585@@ -168,18 +168,18 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28586
28587 /* Setup the bytes not touched by the [f]xsave and reserved for SW. */
28588 sw_bytes = ia32_frame ? &fx_sw_reserved_ia32 : &fx_sw_reserved;
28589- err = __copy_to_user(&x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28590+ err = __copy_to_user(x->i387.sw_reserved, sw_bytes, sizeof(*sw_bytes));
28591
28592 if (!use_xsave())
28593 return err;
28594
28595- err |= __put_user(FP_XSTATE_MAGIC2, (__u32 *)(buf + xstate_size));
28596+ err |= __put_user(FP_XSTATE_MAGIC2, (__u32 __user *)(buf + xstate_size));
28597
28598 /*
28599 * Read the xstate_bv which we copied (directly from the cpu or
28600 * from the state in task struct) to the user buffers.
28601 */
28602- err |= __get_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28603+ err |= __get_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28604
28605 /*
28606 * For legacy compatible, we always set FP/SSE bits in the bit
28607@@ -194,7 +194,7 @@ static inline int save_xstate_epilog(void __user *buf, int ia32_frame)
28608 */
28609 xstate_bv |= XSTATE_FPSSE;
28610
28611- err |= __put_user(xstate_bv, (__u32 *)&x->xsave_hdr.xstate_bv);
28612+ err |= __put_user(xstate_bv, (__u32 __user *)&x->xsave_hdr.xstate_bv);
28613
28614 return err;
28615 }
28616@@ -203,6 +203,7 @@ static inline int save_user_xstate(struct xsave_struct __user *buf)
28617 {
28618 int err;
28619
28620+ buf = (struct xsave_struct __user *)____m(buf);
28621 if (use_xsave())
28622 err = xsave_user(buf);
28623 else if (use_fxsr())
28624@@ -313,6 +314,7 @@ sanitize_restored_xstate(struct task_struct *tsk,
28625 */
28626 static inline int restore_user_xstate(void __user *buf, u64 xbv, int fx_only)
28627 {
28628+ buf = (void __user *)____m(buf);
28629 if (use_xsave()) {
28630 if ((unsigned long)buf % 64 || fx_only) {
28631 u64 init_bv = pcntxt_mask & ~XSTATE_FPSSE;
28632diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
28633index 8a80737..bac4961 100644
28634--- a/arch/x86/kvm/cpuid.c
28635+++ b/arch/x86/kvm/cpuid.c
28636@@ -182,15 +182,20 @@ int kvm_vcpu_ioctl_set_cpuid2(struct kvm_vcpu *vcpu,
28637 struct kvm_cpuid2 *cpuid,
28638 struct kvm_cpuid_entry2 __user *entries)
28639 {
28640- int r;
28641+ int r, i;
28642
28643 r = -E2BIG;
28644 if (cpuid->nent > KVM_MAX_CPUID_ENTRIES)
28645 goto out;
28646 r = -EFAULT;
28647- if (copy_from_user(&vcpu->arch.cpuid_entries, entries,
28648- cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28649+ if (!access_ok(VERIFY_READ, entries, cpuid->nent * sizeof(struct kvm_cpuid_entry2)))
28650 goto out;
28651+ for (i = 0; i < cpuid->nent; ++i) {
28652+ struct kvm_cpuid_entry2 cpuid_entry;
28653+ if (__copy_from_user(&cpuid_entry, entries + i, sizeof(cpuid_entry)))
28654+ goto out;
28655+ vcpu->arch.cpuid_entries[i] = cpuid_entry;
28656+ }
28657 vcpu->arch.cpuid_nent = cpuid->nent;
28658 kvm_apic_set_version(vcpu);
28659 kvm_x86_ops->cpuid_update(vcpu);
28660@@ -203,15 +208,19 @@ int kvm_vcpu_ioctl_get_cpuid2(struct kvm_vcpu *vcpu,
28661 struct kvm_cpuid2 *cpuid,
28662 struct kvm_cpuid_entry2 __user *entries)
28663 {
28664- int r;
28665+ int r, i;
28666
28667 r = -E2BIG;
28668 if (cpuid->nent < vcpu->arch.cpuid_nent)
28669 goto out;
28670 r = -EFAULT;
28671- if (copy_to_user(entries, &vcpu->arch.cpuid_entries,
28672- vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28673+ if (!access_ok(VERIFY_WRITE, entries, vcpu->arch.cpuid_nent * sizeof(struct kvm_cpuid_entry2)))
28674 goto out;
28675+ for (i = 0; i < vcpu->arch.cpuid_nent; ++i) {
28676+ struct kvm_cpuid_entry2 cpuid_entry = vcpu->arch.cpuid_entries[i];
28677+ if (__copy_to_user(entries + i, &cpuid_entry, sizeof(cpuid_entry)))
28678+ goto out;
28679+ }
28680 return 0;
28681
28682 out:
28683diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
28684index 106c015..2db7161 100644
28685--- a/arch/x86/kvm/emulate.c
28686+++ b/arch/x86/kvm/emulate.c
28687@@ -3572,7 +3572,7 @@ static int check_cr_write(struct x86_emulate_ctxt *ctxt)
28688 int cr = ctxt->modrm_reg;
28689 u64 efer = 0;
28690
28691- static u64 cr_reserved_bits[] = {
28692+ static const u64 cr_reserved_bits[] = {
28693 0xffffffff00000000ULL,
28694 0, 0, 0, /* CR3 checked later */
28695 CR4_RESERVED_BITS,
28696diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
28697index 4ee827d..a14eff9 100644
28698--- a/arch/x86/kvm/lapic.c
28699+++ b/arch/x86/kvm/lapic.c
28700@@ -56,7 +56,7 @@
28701 #define APIC_BUS_CYCLE_NS 1
28702
28703 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
28704-#define apic_debug(fmt, arg...)
28705+#define apic_debug(fmt, arg...) do {} while (0)
28706
28707 #define APIC_LVT_NUM 6
28708 /* 14 is the version for Xeon and Pentium 8.4.8*/
28709diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
28710index fd49c86..77e1aa0 100644
28711--- a/arch/x86/kvm/paging_tmpl.h
28712+++ b/arch/x86/kvm/paging_tmpl.h
28713@@ -343,7 +343,7 @@ retry_walk:
28714 if (unlikely(kvm_is_error_hva(host_addr)))
28715 goto error;
28716
28717- ptep_user = (pt_element_t __user *)((void *)host_addr + offset);
28718+ ptep_user = (pt_element_t __force_user *)((void *)host_addr + offset);
28719 if (unlikely(__copy_from_user(&pte, ptep_user, sizeof(pte))))
28720 goto error;
28721 walker->ptep_user[walker->level - 1] = ptep_user;
28722diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
28723index cc618c8..3f72f76 100644
28724--- a/arch/x86/kvm/svm.c
28725+++ b/arch/x86/kvm/svm.c
28726@@ -3568,7 +3568,11 @@ static void reload_tss(struct kvm_vcpu *vcpu)
28727 int cpu = raw_smp_processor_id();
28728
28729 struct svm_cpu_data *sd = per_cpu(svm_data, cpu);
28730+
28731+ pax_open_kernel();
28732 sd->tss_desc->type = 9; /* available 32/64-bit TSS */
28733+ pax_close_kernel();
28734+
28735 load_TR_desc();
28736 }
28737
28738@@ -3964,6 +3968,10 @@ static void svm_vcpu_run(struct kvm_vcpu *vcpu)
28739 #endif
28740 #endif
28741
28742+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
28743+ __set_fs(current_thread_info()->addr_limit);
28744+#endif
28745+
28746 reload_tss(vcpu);
28747
28748 local_irq_disable();
28749diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
28750index a60bd3a..748e856 100644
28751--- a/arch/x86/kvm/vmx.c
28752+++ b/arch/x86/kvm/vmx.c
28753@@ -1440,12 +1440,12 @@ static void vmcs_write64(unsigned long field, u64 value)
28754 #endif
28755 }
28756
28757-static void vmcs_clear_bits(unsigned long field, u32 mask)
28758+static void vmcs_clear_bits(unsigned long field, unsigned long mask)
28759 {
28760 vmcs_writel(field, vmcs_readl(field) & ~mask);
28761 }
28762
28763-static void vmcs_set_bits(unsigned long field, u32 mask)
28764+static void vmcs_set_bits(unsigned long field, unsigned long mask)
28765 {
28766 vmcs_writel(field, vmcs_readl(field) | mask);
28767 }
28768@@ -1705,7 +1705,11 @@ static void reload_tss(void)
28769 struct desc_struct *descs;
28770
28771 descs = (void *)gdt->address;
28772+
28773+ pax_open_kernel();
28774 descs[GDT_ENTRY_TSS].type = 9; /* available TSS */
28775+ pax_close_kernel();
28776+
28777 load_TR_desc();
28778 }
28779
28780@@ -1941,6 +1945,10 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu)
28781 vmcs_writel(HOST_TR_BASE, kvm_read_tr_base()); /* 22.2.4 */
28782 vmcs_writel(HOST_GDTR_BASE, gdt->address); /* 22.2.4 */
28783
28784+#ifdef CONFIG_PAX_PER_CPU_PGD
28785+ vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28786+#endif
28787+
28788 rdmsrl(MSR_IA32_SYSENTER_ESP, sysenter_esp);
28789 vmcs_writel(HOST_IA32_SYSENTER_ESP, sysenter_esp); /* 22.2.3 */
28790 vmx->loaded_vmcs->cpu = cpu;
28791@@ -2233,7 +2241,7 @@ static void setup_msrs(struct vcpu_vmx *vmx)
28792 * reads and returns guest's timestamp counter "register"
28793 * guest_tsc = host_tsc + tsc_offset -- 21.3
28794 */
28795-static u64 guest_read_tsc(void)
28796+static u64 __intentional_overflow(-1) guest_read_tsc(void)
28797 {
28798 u64 host_tsc, tsc_offset;
28799
28800@@ -4466,7 +4474,10 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28801 unsigned long cr4;
28802
28803 vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS); /* 22.2.3 */
28804+
28805+#ifndef CONFIG_PAX_PER_CPU_PGD
28806 vmcs_writel(HOST_CR3, read_cr3()); /* 22.2.3 FIXME: shadow tables */
28807+#endif
28808
28809 /* Save the most likely value for this task's CR4 in the VMCS. */
28810 cr4 = cr4_read_shadow();
28811@@ -4493,7 +4504,7 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
28812 vmcs_writel(HOST_IDTR_BASE, dt.address); /* 22.2.4 */
28813 vmx->host_idt_base = dt.address;
28814
28815- vmcs_writel(HOST_RIP, vmx_return); /* 22.2.5 */
28816+ vmcs_writel(HOST_RIP, ktla_ktva(vmx_return)); /* 22.2.5 */
28817
28818 rdmsr(MSR_IA32_SYSENTER_CS, low32, high32);
28819 vmcs_write32(HOST_IA32_SYSENTER_CS, low32);
28820@@ -6104,11 +6115,17 @@ static __init int hardware_setup(void)
28821 * page upon invalidation. No need to do anything if not
28822 * using the APIC_ACCESS_ADDR VMCS field.
28823 */
28824- if (!flexpriority_enabled)
28825- kvm_x86_ops->set_apic_access_page_addr = NULL;
28826+ if (!flexpriority_enabled) {
28827+ pax_open_kernel();
28828+ *(void **)&kvm_x86_ops->set_apic_access_page_addr = NULL;
28829+ pax_close_kernel();
28830+ }
28831
28832- if (!cpu_has_vmx_tpr_shadow())
28833- kvm_x86_ops->update_cr8_intercept = NULL;
28834+ if (!cpu_has_vmx_tpr_shadow()) {
28835+ pax_open_kernel();
28836+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28837+ pax_close_kernel();
28838+ }
28839
28840 if (enable_ept && !cpu_has_vmx_ept_2m_page())
28841 kvm_disable_largepages();
28842@@ -6119,14 +6136,16 @@ static __init int hardware_setup(void)
28843 if (!cpu_has_vmx_apicv())
28844 enable_apicv = 0;
28845
28846+ pax_open_kernel();
28847 if (enable_apicv)
28848- kvm_x86_ops->update_cr8_intercept = NULL;
28849+ *(void **)&kvm_x86_ops->update_cr8_intercept = NULL;
28850 else {
28851- kvm_x86_ops->hwapic_irr_update = NULL;
28852- kvm_x86_ops->hwapic_isr_update = NULL;
28853- kvm_x86_ops->deliver_posted_interrupt = NULL;
28854- kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28855+ *(void **)&kvm_x86_ops->hwapic_irr_update = NULL;
28856+ *(void **)&kvm_x86_ops->hwapic_isr_update = NULL;
28857+ *(void **)&kvm_x86_ops->deliver_posted_interrupt = NULL;
28858+ *(void **)&kvm_x86_ops->sync_pir_to_irr = vmx_sync_pir_to_irr_dummy;
28859 }
28860+ pax_close_kernel();
28861
28862 vmx_disable_intercept_for_msr(MSR_FS_BASE, false);
28863 vmx_disable_intercept_for_msr(MSR_GS_BASE, false);
28864@@ -6179,10 +6198,12 @@ static __init int hardware_setup(void)
28865 enable_pml = 0;
28866
28867 if (!enable_pml) {
28868- kvm_x86_ops->slot_enable_log_dirty = NULL;
28869- kvm_x86_ops->slot_disable_log_dirty = NULL;
28870- kvm_x86_ops->flush_log_dirty = NULL;
28871- kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
28872+ pax_open_kernel();
28873+ *(void **)&kvm_x86_ops->slot_enable_log_dirty = NULL;
28874+ *(void **)&kvm_x86_ops->slot_disable_log_dirty = NULL;
28875+ *(void **)&kvm_x86_ops->flush_log_dirty = NULL;
28876+ *(void **)&kvm_x86_ops->enable_log_dirty_pt_masked = NULL;
28877+ pax_close_kernel();
28878 }
28879
28880 return alloc_kvm_area();
28881@@ -8227,6 +8248,12 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28882 "jmp 2f \n\t"
28883 "1: " __ex(ASM_VMX_VMRESUME) "\n\t"
28884 "2: "
28885+
28886+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28887+ "ljmp %[cs],$3f\n\t"
28888+ "3: "
28889+#endif
28890+
28891 /* Save guest registers, load host registers, keep flags */
28892 "mov %0, %c[wordsize](%%" _ASM_SP ") \n\t"
28893 "pop %0 \n\t"
28894@@ -8279,6 +8306,11 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28895 #endif
28896 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)),
28897 [wordsize]"i"(sizeof(ulong))
28898+
28899+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
28900+ ,[cs]"i"(__KERNEL_CS)
28901+#endif
28902+
28903 : "cc", "memory"
28904 #ifdef CONFIG_X86_64
28905 , "rax", "rbx", "rdi", "rsi"
28906@@ -8292,7 +8324,7 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28907 if (debugctlmsr)
28908 update_debugctlmsr(debugctlmsr);
28909
28910-#ifndef CONFIG_X86_64
28911+#ifdef CONFIG_X86_32
28912 /*
28913 * The sysexit path does not restore ds/es, so we must set them to
28914 * a reasonable value ourselves.
28915@@ -8301,8 +8333,18 @@ static void __noclone vmx_vcpu_run(struct kvm_vcpu *vcpu)
28916 * may be executed in interrupt context, which saves and restore segments
28917 * around it, nullifying its effect.
28918 */
28919- loadsegment(ds, __USER_DS);
28920- loadsegment(es, __USER_DS);
28921+ loadsegment(ds, __KERNEL_DS);
28922+ loadsegment(es, __KERNEL_DS);
28923+ loadsegment(ss, __KERNEL_DS);
28924+
28925+#ifdef CONFIG_PAX_KERNEXEC
28926+ loadsegment(fs, __KERNEL_PERCPU);
28927+#endif
28928+
28929+#ifdef CONFIG_PAX_MEMORY_UDEREF
28930+ __set_fs(current_thread_info()->addr_limit);
28931+#endif
28932+
28933 #endif
28934
28935 vcpu->arch.regs_avail = ~((1 << VCPU_REGS_RIP) | (1 << VCPU_REGS_RSP)
28936diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
28937index e222ba5..6f0f2de 100644
28938--- a/arch/x86/kvm/x86.c
28939+++ b/arch/x86/kvm/x86.c
28940@@ -1897,8 +1897,8 @@ static int xen_hvm_config(struct kvm_vcpu *vcpu, u64 data)
28941 {
28942 struct kvm *kvm = vcpu->kvm;
28943 int lm = is_long_mode(vcpu);
28944- u8 *blob_addr = lm ? (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28945- : (u8 *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28946+ u8 __user *blob_addr = lm ? (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_64
28947+ : (u8 __user *)(long)kvm->arch.xen_hvm_config.blob_addr_32;
28948 u8 blob_size = lm ? kvm->arch.xen_hvm_config.blob_size_64
28949 : kvm->arch.xen_hvm_config.blob_size_32;
28950 u32 page_num = data & ~PAGE_MASK;
28951@@ -2835,6 +2835,8 @@ long kvm_arch_dev_ioctl(struct file *filp,
28952 if (n < msr_list.nmsrs)
28953 goto out;
28954 r = -EFAULT;
28955+ if (num_msrs_to_save > ARRAY_SIZE(msrs_to_save))
28956+ goto out;
28957 if (copy_to_user(user_msr_list->indices, &msrs_to_save,
28958 num_msrs_to_save * sizeof(u32)))
28959 goto out;
28960@@ -5739,7 +5741,7 @@ static struct notifier_block pvclock_gtod_notifier = {
28961 };
28962 #endif
28963
28964-int kvm_arch_init(void *opaque)
28965+int kvm_arch_init(const void *opaque)
28966 {
28967 int r;
28968 struct kvm_x86_ops *ops = opaque;
28969diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
28970index ac4453d..1f43bf3 100644
28971--- a/arch/x86/lguest/boot.c
28972+++ b/arch/x86/lguest/boot.c
28973@@ -1340,9 +1340,10 @@ static __init int early_put_chars(u32 vtermno, const char *buf, int count)
28974 * Rebooting also tells the Host we're finished, but the RESTART flag tells the
28975 * Launcher to reboot us.
28976 */
28977-static void lguest_restart(char *reason)
28978+static __noreturn void lguest_restart(char *reason)
28979 {
28980 hcall(LHCALL_SHUTDOWN, __pa(reason), LGUEST_SHUTDOWN_RESTART, 0, 0);
28981+ BUG();
28982 }
28983
28984 /*G:050
28985diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
28986index 00933d5..3a64af9 100644
28987--- a/arch/x86/lib/atomic64_386_32.S
28988+++ b/arch/x86/lib/atomic64_386_32.S
28989@@ -48,6 +48,10 @@ BEGIN(read)
28990 movl (v), %eax
28991 movl 4(v), %edx
28992 RET_ENDP
28993+BEGIN(read_unchecked)
28994+ movl (v), %eax
28995+ movl 4(v), %edx
28996+RET_ENDP
28997 #undef v
28998
28999 #define v %esi
29000@@ -55,6 +59,10 @@ BEGIN(set)
29001 movl %ebx, (v)
29002 movl %ecx, 4(v)
29003 RET_ENDP
29004+BEGIN(set_unchecked)
29005+ movl %ebx, (v)
29006+ movl %ecx, 4(v)
29007+RET_ENDP
29008 #undef v
29009
29010 #define v %esi
29011@@ -70,6 +78,20 @@ RET_ENDP
29012 BEGIN(add)
29013 addl %eax, (v)
29014 adcl %edx, 4(v)
29015+
29016+#ifdef CONFIG_PAX_REFCOUNT
29017+ jno 0f
29018+ subl %eax, (v)
29019+ sbbl %edx, 4(v)
29020+ int $4
29021+0:
29022+ _ASM_EXTABLE(0b, 0b)
29023+#endif
29024+
29025+RET_ENDP
29026+BEGIN(add_unchecked)
29027+ addl %eax, (v)
29028+ adcl %edx, 4(v)
29029 RET_ENDP
29030 #undef v
29031
29032@@ -77,6 +99,24 @@ RET_ENDP
29033 BEGIN(add_return)
29034 addl (v), %eax
29035 adcl 4(v), %edx
29036+
29037+#ifdef CONFIG_PAX_REFCOUNT
29038+ into
29039+1234:
29040+ _ASM_EXTABLE(1234b, 2f)
29041+#endif
29042+
29043+ movl %eax, (v)
29044+ movl %edx, 4(v)
29045+
29046+#ifdef CONFIG_PAX_REFCOUNT
29047+2:
29048+#endif
29049+
29050+RET_ENDP
29051+BEGIN(add_return_unchecked)
29052+ addl (v), %eax
29053+ adcl 4(v), %edx
29054 movl %eax, (v)
29055 movl %edx, 4(v)
29056 RET_ENDP
29057@@ -86,6 +126,20 @@ RET_ENDP
29058 BEGIN(sub)
29059 subl %eax, (v)
29060 sbbl %edx, 4(v)
29061+
29062+#ifdef CONFIG_PAX_REFCOUNT
29063+ jno 0f
29064+ addl %eax, (v)
29065+ adcl %edx, 4(v)
29066+ int $4
29067+0:
29068+ _ASM_EXTABLE(0b, 0b)
29069+#endif
29070+
29071+RET_ENDP
29072+BEGIN(sub_unchecked)
29073+ subl %eax, (v)
29074+ sbbl %edx, 4(v)
29075 RET_ENDP
29076 #undef v
29077
29078@@ -96,6 +150,27 @@ BEGIN(sub_return)
29079 sbbl $0, %edx
29080 addl (v), %eax
29081 adcl 4(v), %edx
29082+
29083+#ifdef CONFIG_PAX_REFCOUNT
29084+ into
29085+1234:
29086+ _ASM_EXTABLE(1234b, 2f)
29087+#endif
29088+
29089+ movl %eax, (v)
29090+ movl %edx, 4(v)
29091+
29092+#ifdef CONFIG_PAX_REFCOUNT
29093+2:
29094+#endif
29095+
29096+RET_ENDP
29097+BEGIN(sub_return_unchecked)
29098+ negl %edx
29099+ negl %eax
29100+ sbbl $0, %edx
29101+ addl (v), %eax
29102+ adcl 4(v), %edx
29103 movl %eax, (v)
29104 movl %edx, 4(v)
29105 RET_ENDP
29106@@ -105,6 +180,20 @@ RET_ENDP
29107 BEGIN(inc)
29108 addl $1, (v)
29109 adcl $0, 4(v)
29110+
29111+#ifdef CONFIG_PAX_REFCOUNT
29112+ jno 0f
29113+ subl $1, (v)
29114+ sbbl $0, 4(v)
29115+ int $4
29116+0:
29117+ _ASM_EXTABLE(0b, 0b)
29118+#endif
29119+
29120+RET_ENDP
29121+BEGIN(inc_unchecked)
29122+ addl $1, (v)
29123+ adcl $0, 4(v)
29124 RET_ENDP
29125 #undef v
29126
29127@@ -114,6 +203,26 @@ BEGIN(inc_return)
29128 movl 4(v), %edx
29129 addl $1, %eax
29130 adcl $0, %edx
29131+
29132+#ifdef CONFIG_PAX_REFCOUNT
29133+ into
29134+1234:
29135+ _ASM_EXTABLE(1234b, 2f)
29136+#endif
29137+
29138+ movl %eax, (v)
29139+ movl %edx, 4(v)
29140+
29141+#ifdef CONFIG_PAX_REFCOUNT
29142+2:
29143+#endif
29144+
29145+RET_ENDP
29146+BEGIN(inc_return_unchecked)
29147+ movl (v), %eax
29148+ movl 4(v), %edx
29149+ addl $1, %eax
29150+ adcl $0, %edx
29151 movl %eax, (v)
29152 movl %edx, 4(v)
29153 RET_ENDP
29154@@ -123,6 +232,20 @@ RET_ENDP
29155 BEGIN(dec)
29156 subl $1, (v)
29157 sbbl $0, 4(v)
29158+
29159+#ifdef CONFIG_PAX_REFCOUNT
29160+ jno 0f
29161+ addl $1, (v)
29162+ adcl $0, 4(v)
29163+ int $4
29164+0:
29165+ _ASM_EXTABLE(0b, 0b)
29166+#endif
29167+
29168+RET_ENDP
29169+BEGIN(dec_unchecked)
29170+ subl $1, (v)
29171+ sbbl $0, 4(v)
29172 RET_ENDP
29173 #undef v
29174
29175@@ -132,6 +255,26 @@ BEGIN(dec_return)
29176 movl 4(v), %edx
29177 subl $1, %eax
29178 sbbl $0, %edx
29179+
29180+#ifdef CONFIG_PAX_REFCOUNT
29181+ into
29182+1234:
29183+ _ASM_EXTABLE(1234b, 2f)
29184+#endif
29185+
29186+ movl %eax, (v)
29187+ movl %edx, 4(v)
29188+
29189+#ifdef CONFIG_PAX_REFCOUNT
29190+2:
29191+#endif
29192+
29193+RET_ENDP
29194+BEGIN(dec_return_unchecked)
29195+ movl (v), %eax
29196+ movl 4(v), %edx
29197+ subl $1, %eax
29198+ sbbl $0, %edx
29199 movl %eax, (v)
29200 movl %edx, 4(v)
29201 RET_ENDP
29202@@ -143,6 +286,13 @@ BEGIN(add_unless)
29203 adcl %edx, %edi
29204 addl (v), %eax
29205 adcl 4(v), %edx
29206+
29207+#ifdef CONFIG_PAX_REFCOUNT
29208+ into
29209+1234:
29210+ _ASM_EXTABLE(1234b, 2f)
29211+#endif
29212+
29213 cmpl %eax, %ecx
29214 je 3f
29215 1:
29216@@ -168,6 +318,13 @@ BEGIN(inc_not_zero)
29217 1:
29218 addl $1, %eax
29219 adcl $0, %edx
29220+
29221+#ifdef CONFIG_PAX_REFCOUNT
29222+ into
29223+1234:
29224+ _ASM_EXTABLE(1234b, 2f)
29225+#endif
29226+
29227 movl %eax, (v)
29228 movl %edx, 4(v)
29229 movl $1, %eax
29230@@ -186,6 +343,13 @@ BEGIN(dec_if_positive)
29231 movl 4(v), %edx
29232 subl $1, %eax
29233 sbbl $0, %edx
29234+
29235+#ifdef CONFIG_PAX_REFCOUNT
29236+ into
29237+1234:
29238+ _ASM_EXTABLE(1234b, 1f)
29239+#endif
29240+
29241 js 1f
29242 movl %eax, (v)
29243 movl %edx, 4(v)
29244diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
29245index f5cc9eb..51fa319 100644
29246--- a/arch/x86/lib/atomic64_cx8_32.S
29247+++ b/arch/x86/lib/atomic64_cx8_32.S
29248@@ -35,10 +35,20 @@ ENTRY(atomic64_read_cx8)
29249 CFI_STARTPROC
29250
29251 read64 %ecx
29252+ pax_force_retaddr
29253 ret
29254 CFI_ENDPROC
29255 ENDPROC(atomic64_read_cx8)
29256
29257+ENTRY(atomic64_read_unchecked_cx8)
29258+ CFI_STARTPROC
29259+
29260+ read64 %ecx
29261+ pax_force_retaddr
29262+ ret
29263+ CFI_ENDPROC
29264+ENDPROC(atomic64_read_unchecked_cx8)
29265+
29266 ENTRY(atomic64_set_cx8)
29267 CFI_STARTPROC
29268
29269@@ -48,10 +58,25 @@ ENTRY(atomic64_set_cx8)
29270 cmpxchg8b (%esi)
29271 jne 1b
29272
29273+ pax_force_retaddr
29274 ret
29275 CFI_ENDPROC
29276 ENDPROC(atomic64_set_cx8)
29277
29278+ENTRY(atomic64_set_unchecked_cx8)
29279+ CFI_STARTPROC
29280+
29281+1:
29282+/* we don't need LOCK_PREFIX since aligned 64-bit writes
29283+ * are atomic on 586 and newer */
29284+ cmpxchg8b (%esi)
29285+ jne 1b
29286+
29287+ pax_force_retaddr
29288+ ret
29289+ CFI_ENDPROC
29290+ENDPROC(atomic64_set_unchecked_cx8)
29291+
29292 ENTRY(atomic64_xchg_cx8)
29293 CFI_STARTPROC
29294
29295@@ -60,12 +85,13 @@ ENTRY(atomic64_xchg_cx8)
29296 cmpxchg8b (%esi)
29297 jne 1b
29298
29299+ pax_force_retaddr
29300 ret
29301 CFI_ENDPROC
29302 ENDPROC(atomic64_xchg_cx8)
29303
29304-.macro addsub_return func ins insc
29305-ENTRY(atomic64_\func\()_return_cx8)
29306+.macro addsub_return func ins insc unchecked=""
29307+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29308 CFI_STARTPROC
29309 SAVE ebp
29310 SAVE ebx
29311@@ -82,27 +108,44 @@ ENTRY(atomic64_\func\()_return_cx8)
29312 movl %edx, %ecx
29313 \ins\()l %esi, %ebx
29314 \insc\()l %edi, %ecx
29315+
29316+.ifb \unchecked
29317+#ifdef CONFIG_PAX_REFCOUNT
29318+ into
29319+2:
29320+ _ASM_EXTABLE(2b, 3f)
29321+#endif
29322+.endif
29323+
29324 LOCK_PREFIX
29325 cmpxchg8b (%ebp)
29326 jne 1b
29327-
29328-10:
29329 movl %ebx, %eax
29330 movl %ecx, %edx
29331+
29332+.ifb \unchecked
29333+#ifdef CONFIG_PAX_REFCOUNT
29334+3:
29335+#endif
29336+.endif
29337+
29338 RESTORE edi
29339 RESTORE esi
29340 RESTORE ebx
29341 RESTORE ebp
29342+ pax_force_retaddr
29343 ret
29344 CFI_ENDPROC
29345-ENDPROC(atomic64_\func\()_return_cx8)
29346+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29347 .endm
29348
29349 addsub_return add add adc
29350 addsub_return sub sub sbb
29351+addsub_return add add adc _unchecked
29352+addsub_return sub sub sbb _unchecked
29353
29354-.macro incdec_return func ins insc
29355-ENTRY(atomic64_\func\()_return_cx8)
29356+.macro incdec_return func ins insc unchecked=""
29357+ENTRY(atomic64_\func\()_return\unchecked\()_cx8)
29358 CFI_STARTPROC
29359 SAVE ebx
29360
29361@@ -112,21 +155,39 @@ ENTRY(atomic64_\func\()_return_cx8)
29362 movl %edx, %ecx
29363 \ins\()l $1, %ebx
29364 \insc\()l $0, %ecx
29365+
29366+.ifb \unchecked
29367+#ifdef CONFIG_PAX_REFCOUNT
29368+ into
29369+2:
29370+ _ASM_EXTABLE(2b, 3f)
29371+#endif
29372+.endif
29373+
29374 LOCK_PREFIX
29375 cmpxchg8b (%esi)
29376 jne 1b
29377
29378-10:
29379 movl %ebx, %eax
29380 movl %ecx, %edx
29381+
29382+.ifb \unchecked
29383+#ifdef CONFIG_PAX_REFCOUNT
29384+3:
29385+#endif
29386+.endif
29387+
29388 RESTORE ebx
29389+ pax_force_retaddr
29390 ret
29391 CFI_ENDPROC
29392-ENDPROC(atomic64_\func\()_return_cx8)
29393+ENDPROC(atomic64_\func\()_return\unchecked\()_cx8)
29394 .endm
29395
29396 incdec_return inc add adc
29397 incdec_return dec sub sbb
29398+incdec_return inc add adc _unchecked
29399+incdec_return dec sub sbb _unchecked
29400
29401 ENTRY(atomic64_dec_if_positive_cx8)
29402 CFI_STARTPROC
29403@@ -138,6 +199,13 @@ ENTRY(atomic64_dec_if_positive_cx8)
29404 movl %edx, %ecx
29405 subl $1, %ebx
29406 sbb $0, %ecx
29407+
29408+#ifdef CONFIG_PAX_REFCOUNT
29409+ into
29410+1234:
29411+ _ASM_EXTABLE(1234b, 2f)
29412+#endif
29413+
29414 js 2f
29415 LOCK_PREFIX
29416 cmpxchg8b (%esi)
29417@@ -147,6 +215,7 @@ ENTRY(atomic64_dec_if_positive_cx8)
29418 movl %ebx, %eax
29419 movl %ecx, %edx
29420 RESTORE ebx
29421+ pax_force_retaddr
29422 ret
29423 CFI_ENDPROC
29424 ENDPROC(atomic64_dec_if_positive_cx8)
29425@@ -171,6 +240,13 @@ ENTRY(atomic64_add_unless_cx8)
29426 movl %edx, %ecx
29427 addl %ebp, %ebx
29428 adcl %edi, %ecx
29429+
29430+#ifdef CONFIG_PAX_REFCOUNT
29431+ into
29432+1234:
29433+ _ASM_EXTABLE(1234b, 3f)
29434+#endif
29435+
29436 LOCK_PREFIX
29437 cmpxchg8b (%esi)
29438 jne 1b
29439@@ -181,6 +257,7 @@ ENTRY(atomic64_add_unless_cx8)
29440 CFI_ADJUST_CFA_OFFSET -8
29441 RESTORE ebx
29442 RESTORE ebp
29443+ pax_force_retaddr
29444 ret
29445 4:
29446 cmpl %edx, 4(%esp)
29447@@ -203,6 +280,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
29448 xorl %ecx, %ecx
29449 addl $1, %ebx
29450 adcl %edx, %ecx
29451+
29452+#ifdef CONFIG_PAX_REFCOUNT
29453+ into
29454+1234:
29455+ _ASM_EXTABLE(1234b, 3f)
29456+#endif
29457+
29458 LOCK_PREFIX
29459 cmpxchg8b (%esi)
29460 jne 1b
29461@@ -210,6 +294,7 @@ ENTRY(atomic64_inc_not_zero_cx8)
29462 movl $1, %eax
29463 3:
29464 RESTORE ebx
29465+ pax_force_retaddr
29466 ret
29467 CFI_ENDPROC
29468 ENDPROC(atomic64_inc_not_zero_cx8)
29469diff --git a/arch/x86/lib/checksum_32.S b/arch/x86/lib/checksum_32.S
29470index e78b8eee..7e173a8 100644
29471--- a/arch/x86/lib/checksum_32.S
29472+++ b/arch/x86/lib/checksum_32.S
29473@@ -29,7 +29,8 @@
29474 #include <asm/dwarf2.h>
29475 #include <asm/errno.h>
29476 #include <asm/asm.h>
29477-
29478+#include <asm/segment.h>
29479+
29480 /*
29481 * computes a partial checksum, e.g. for TCP/UDP fragments
29482 */
29483@@ -293,9 +294,24 @@ unsigned int csum_partial_copy_generic (const char *src, char *dst,
29484
29485 #define ARGBASE 16
29486 #define FP 12
29487-
29488-ENTRY(csum_partial_copy_generic)
29489+
29490+ENTRY(csum_partial_copy_generic_to_user)
29491 CFI_STARTPROC
29492+
29493+#ifdef CONFIG_PAX_MEMORY_UDEREF
29494+ pushl_cfi %gs
29495+ popl_cfi %es
29496+ jmp csum_partial_copy_generic
29497+#endif
29498+
29499+ENTRY(csum_partial_copy_generic_from_user)
29500+
29501+#ifdef CONFIG_PAX_MEMORY_UDEREF
29502+ pushl_cfi %gs
29503+ popl_cfi %ds
29504+#endif
29505+
29506+ENTRY(csum_partial_copy_generic)
29507 subl $4,%esp
29508 CFI_ADJUST_CFA_OFFSET 4
29509 pushl_cfi %edi
29510@@ -317,7 +333,7 @@ ENTRY(csum_partial_copy_generic)
29511 jmp 4f
29512 SRC(1: movw (%esi), %bx )
29513 addl $2, %esi
29514-DST( movw %bx, (%edi) )
29515+DST( movw %bx, %es:(%edi) )
29516 addl $2, %edi
29517 addw %bx, %ax
29518 adcl $0, %eax
29519@@ -329,30 +345,30 @@ DST( movw %bx, (%edi) )
29520 SRC(1: movl (%esi), %ebx )
29521 SRC( movl 4(%esi), %edx )
29522 adcl %ebx, %eax
29523-DST( movl %ebx, (%edi) )
29524+DST( movl %ebx, %es:(%edi) )
29525 adcl %edx, %eax
29526-DST( movl %edx, 4(%edi) )
29527+DST( movl %edx, %es:4(%edi) )
29528
29529 SRC( movl 8(%esi), %ebx )
29530 SRC( movl 12(%esi), %edx )
29531 adcl %ebx, %eax
29532-DST( movl %ebx, 8(%edi) )
29533+DST( movl %ebx, %es:8(%edi) )
29534 adcl %edx, %eax
29535-DST( movl %edx, 12(%edi) )
29536+DST( movl %edx, %es:12(%edi) )
29537
29538 SRC( movl 16(%esi), %ebx )
29539 SRC( movl 20(%esi), %edx )
29540 adcl %ebx, %eax
29541-DST( movl %ebx, 16(%edi) )
29542+DST( movl %ebx, %es:16(%edi) )
29543 adcl %edx, %eax
29544-DST( movl %edx, 20(%edi) )
29545+DST( movl %edx, %es:20(%edi) )
29546
29547 SRC( movl 24(%esi), %ebx )
29548 SRC( movl 28(%esi), %edx )
29549 adcl %ebx, %eax
29550-DST( movl %ebx, 24(%edi) )
29551+DST( movl %ebx, %es:24(%edi) )
29552 adcl %edx, %eax
29553-DST( movl %edx, 28(%edi) )
29554+DST( movl %edx, %es:28(%edi) )
29555
29556 lea 32(%esi), %esi
29557 lea 32(%edi), %edi
29558@@ -366,7 +382,7 @@ DST( movl %edx, 28(%edi) )
29559 shrl $2, %edx # This clears CF
29560 SRC(3: movl (%esi), %ebx )
29561 adcl %ebx, %eax
29562-DST( movl %ebx, (%edi) )
29563+DST( movl %ebx, %es:(%edi) )
29564 lea 4(%esi), %esi
29565 lea 4(%edi), %edi
29566 dec %edx
29567@@ -378,12 +394,12 @@ DST( movl %ebx, (%edi) )
29568 jb 5f
29569 SRC( movw (%esi), %cx )
29570 leal 2(%esi), %esi
29571-DST( movw %cx, (%edi) )
29572+DST( movw %cx, %es:(%edi) )
29573 leal 2(%edi), %edi
29574 je 6f
29575 shll $16,%ecx
29576 SRC(5: movb (%esi), %cl )
29577-DST( movb %cl, (%edi) )
29578+DST( movb %cl, %es:(%edi) )
29579 6: addl %ecx, %eax
29580 adcl $0, %eax
29581 7:
29582@@ -394,7 +410,7 @@ DST( movb %cl, (%edi) )
29583
29584 6001:
29585 movl ARGBASE+20(%esp), %ebx # src_err_ptr
29586- movl $-EFAULT, (%ebx)
29587+ movl $-EFAULT, %ss:(%ebx)
29588
29589 # zero the complete destination - computing the rest
29590 # is too much work
29591@@ -407,11 +423,15 @@ DST( movb %cl, (%edi) )
29592
29593 6002:
29594 movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29595- movl $-EFAULT,(%ebx)
29596+ movl $-EFAULT,%ss:(%ebx)
29597 jmp 5000b
29598
29599 .previous
29600
29601+ pushl_cfi %ss
29602+ popl_cfi %ds
29603+ pushl_cfi %ss
29604+ popl_cfi %es
29605 popl_cfi %ebx
29606 CFI_RESTORE ebx
29607 popl_cfi %esi
29608@@ -421,26 +441,43 @@ DST( movb %cl, (%edi) )
29609 popl_cfi %ecx # equivalent to addl $4,%esp
29610 ret
29611 CFI_ENDPROC
29612-ENDPROC(csum_partial_copy_generic)
29613+ENDPROC(csum_partial_copy_generic_to_user)
29614
29615 #else
29616
29617 /* Version for PentiumII/PPro */
29618
29619 #define ROUND1(x) \
29620+ nop; nop; nop; \
29621 SRC(movl x(%esi), %ebx ) ; \
29622 addl %ebx, %eax ; \
29623- DST(movl %ebx, x(%edi) ) ;
29624+ DST(movl %ebx, %es:x(%edi)) ;
29625
29626 #define ROUND(x) \
29627+ nop; nop; nop; \
29628 SRC(movl x(%esi), %ebx ) ; \
29629 adcl %ebx, %eax ; \
29630- DST(movl %ebx, x(%edi) ) ;
29631+ DST(movl %ebx, %es:x(%edi)) ;
29632
29633 #define ARGBASE 12
29634-
29635-ENTRY(csum_partial_copy_generic)
29636+
29637+ENTRY(csum_partial_copy_generic_to_user)
29638 CFI_STARTPROC
29639+
29640+#ifdef CONFIG_PAX_MEMORY_UDEREF
29641+ pushl_cfi %gs
29642+ popl_cfi %es
29643+ jmp csum_partial_copy_generic
29644+#endif
29645+
29646+ENTRY(csum_partial_copy_generic_from_user)
29647+
29648+#ifdef CONFIG_PAX_MEMORY_UDEREF
29649+ pushl_cfi %gs
29650+ popl_cfi %ds
29651+#endif
29652+
29653+ENTRY(csum_partial_copy_generic)
29654 pushl_cfi %ebx
29655 CFI_REL_OFFSET ebx, 0
29656 pushl_cfi %edi
29657@@ -461,7 +498,7 @@ ENTRY(csum_partial_copy_generic)
29658 subl %ebx, %edi
29659 lea -1(%esi),%edx
29660 andl $-32,%edx
29661- lea 3f(%ebx,%ebx), %ebx
29662+ lea 3f(%ebx,%ebx,2), %ebx
29663 testl %esi, %esi
29664 jmp *%ebx
29665 1: addl $64,%esi
29666@@ -482,19 +519,19 @@ ENTRY(csum_partial_copy_generic)
29667 jb 5f
29668 SRC( movw (%esi), %dx )
29669 leal 2(%esi), %esi
29670-DST( movw %dx, (%edi) )
29671+DST( movw %dx, %es:(%edi) )
29672 leal 2(%edi), %edi
29673 je 6f
29674 shll $16,%edx
29675 5:
29676 SRC( movb (%esi), %dl )
29677-DST( movb %dl, (%edi) )
29678+DST( movb %dl, %es:(%edi) )
29679 6: addl %edx, %eax
29680 adcl $0, %eax
29681 7:
29682 .section .fixup, "ax"
29683 6001: movl ARGBASE+20(%esp), %ebx # src_err_ptr
29684- movl $-EFAULT, (%ebx)
29685+ movl $-EFAULT, %ss:(%ebx)
29686 # zero the complete destination (computing the rest is too much work)
29687 movl ARGBASE+8(%esp),%edi # dst
29688 movl ARGBASE+12(%esp),%ecx # len
29689@@ -502,10 +539,17 @@ DST( movb %dl, (%edi) )
29690 rep; stosb
29691 jmp 7b
29692 6002: movl ARGBASE+24(%esp), %ebx # dst_err_ptr
29693- movl $-EFAULT, (%ebx)
29694+ movl $-EFAULT, %ss:(%ebx)
29695 jmp 7b
29696 .previous
29697
29698+#ifdef CONFIG_PAX_MEMORY_UDEREF
29699+ pushl_cfi %ss
29700+ popl_cfi %ds
29701+ pushl_cfi %ss
29702+ popl_cfi %es
29703+#endif
29704+
29705 popl_cfi %esi
29706 CFI_RESTORE esi
29707 popl_cfi %edi
29708@@ -514,7 +558,7 @@ DST( movb %dl, (%edi) )
29709 CFI_RESTORE ebx
29710 ret
29711 CFI_ENDPROC
29712-ENDPROC(csum_partial_copy_generic)
29713+ENDPROC(csum_partial_copy_generic_to_user)
29714
29715 #undef ROUND
29716 #undef ROUND1
29717diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
29718index f2145cf..cea889d 100644
29719--- a/arch/x86/lib/clear_page_64.S
29720+++ b/arch/x86/lib/clear_page_64.S
29721@@ -11,6 +11,7 @@ ENTRY(clear_page_c)
29722 movl $4096/8,%ecx
29723 xorl %eax,%eax
29724 rep stosq
29725+ pax_force_retaddr
29726 ret
29727 CFI_ENDPROC
29728 ENDPROC(clear_page_c)
29729@@ -20,6 +21,7 @@ ENTRY(clear_page_c_e)
29730 movl $4096,%ecx
29731 xorl %eax,%eax
29732 rep stosb
29733+ pax_force_retaddr
29734 ret
29735 CFI_ENDPROC
29736 ENDPROC(clear_page_c_e)
29737@@ -43,6 +45,7 @@ ENTRY(clear_page)
29738 leaq 64(%rdi),%rdi
29739 jnz .Lloop
29740 nop
29741+ pax_force_retaddr
29742 ret
29743 CFI_ENDPROC
29744 .Lclear_page_end:
29745@@ -58,7 +61,7 @@ ENDPROC(clear_page)
29746
29747 #include <asm/cpufeature.h>
29748
29749- .section .altinstr_replacement,"ax"
29750+ .section .altinstr_replacement,"a"
29751 1: .byte 0xeb /* jmp <disp8> */
29752 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
29753 2: .byte 0xeb /* jmp <disp8> */
29754diff --git a/arch/x86/lib/cmpxchg16b_emu.S b/arch/x86/lib/cmpxchg16b_emu.S
29755index 40a1725..5d12ac4 100644
29756--- a/arch/x86/lib/cmpxchg16b_emu.S
29757+++ b/arch/x86/lib/cmpxchg16b_emu.S
29758@@ -8,6 +8,7 @@
29759 #include <linux/linkage.h>
29760 #include <asm/dwarf2.h>
29761 #include <asm/percpu.h>
29762+#include <asm/alternative-asm.h>
29763
29764 .text
29765
29766@@ -46,12 +47,14 @@ CFI_STARTPROC
29767 CFI_REMEMBER_STATE
29768 popfq_cfi
29769 mov $1, %al
29770+ pax_force_retaddr
29771 ret
29772
29773 CFI_RESTORE_STATE
29774 .Lnot_same:
29775 popfq_cfi
29776 xor %al,%al
29777+ pax_force_retaddr
29778 ret
29779
29780 CFI_ENDPROC
29781diff --git a/arch/x86/lib/copy_page_64.S b/arch/x86/lib/copy_page_64.S
29782index 176cca6..e0d658e 100644
29783--- a/arch/x86/lib/copy_page_64.S
29784+++ b/arch/x86/lib/copy_page_64.S
29785@@ -9,6 +9,7 @@ copy_page_rep:
29786 CFI_STARTPROC
29787 movl $4096/8, %ecx
29788 rep movsq
29789+ pax_force_retaddr
29790 ret
29791 CFI_ENDPROC
29792 ENDPROC(copy_page_rep)
29793@@ -24,8 +25,8 @@ ENTRY(copy_page)
29794 CFI_ADJUST_CFA_OFFSET 2*8
29795 movq %rbx, (%rsp)
29796 CFI_REL_OFFSET rbx, 0
29797- movq %r12, 1*8(%rsp)
29798- CFI_REL_OFFSET r12, 1*8
29799+ movq %r13, 1*8(%rsp)
29800+ CFI_REL_OFFSET r13, 1*8
29801
29802 movl $(4096/64)-5, %ecx
29803 .p2align 4
29804@@ -38,7 +39,7 @@ ENTRY(copy_page)
29805 movq 0x8*4(%rsi), %r9
29806 movq 0x8*5(%rsi), %r10
29807 movq 0x8*6(%rsi), %r11
29808- movq 0x8*7(%rsi), %r12
29809+ movq 0x8*7(%rsi), %r13
29810
29811 prefetcht0 5*64(%rsi)
29812
29813@@ -49,7 +50,7 @@ ENTRY(copy_page)
29814 movq %r9, 0x8*4(%rdi)
29815 movq %r10, 0x8*5(%rdi)
29816 movq %r11, 0x8*6(%rdi)
29817- movq %r12, 0x8*7(%rdi)
29818+ movq %r13, 0x8*7(%rdi)
29819
29820 leaq 64 (%rsi), %rsi
29821 leaq 64 (%rdi), %rdi
29822@@ -68,7 +69,7 @@ ENTRY(copy_page)
29823 movq 0x8*4(%rsi), %r9
29824 movq 0x8*5(%rsi), %r10
29825 movq 0x8*6(%rsi), %r11
29826- movq 0x8*7(%rsi), %r12
29827+ movq 0x8*7(%rsi), %r13
29828
29829 movq %rax, 0x8*0(%rdi)
29830 movq %rbx, 0x8*1(%rdi)
29831@@ -77,7 +78,7 @@ ENTRY(copy_page)
29832 movq %r9, 0x8*4(%rdi)
29833 movq %r10, 0x8*5(%rdi)
29834 movq %r11, 0x8*6(%rdi)
29835- movq %r12, 0x8*7(%rdi)
29836+ movq %r13, 0x8*7(%rdi)
29837
29838 leaq 64(%rdi), %rdi
29839 leaq 64(%rsi), %rsi
29840@@ -85,10 +86,11 @@ ENTRY(copy_page)
29841
29842 movq (%rsp), %rbx
29843 CFI_RESTORE rbx
29844- movq 1*8(%rsp), %r12
29845- CFI_RESTORE r12
29846+ movq 1*8(%rsp), %r13
29847+ CFI_RESTORE r13
29848 addq $2*8, %rsp
29849 CFI_ADJUST_CFA_OFFSET -2*8
29850+ pax_force_retaddr
29851 ret
29852 .Lcopy_page_end:
29853 CFI_ENDPROC
29854@@ -99,7 +101,7 @@ ENDPROC(copy_page)
29855
29856 #include <asm/cpufeature.h>
29857
29858- .section .altinstr_replacement,"ax"
29859+ .section .altinstr_replacement,"a"
29860 1: .byte 0xeb /* jmp <disp8> */
29861 .byte (copy_page_rep - copy_page) - (2f - 1b) /* offset */
29862 2:
29863diff --git a/arch/x86/lib/copy_user_64.S b/arch/x86/lib/copy_user_64.S
29864index dee945d..a84067b 100644
29865--- a/arch/x86/lib/copy_user_64.S
29866+++ b/arch/x86/lib/copy_user_64.S
29867@@ -18,31 +18,7 @@
29868 #include <asm/alternative-asm.h>
29869 #include <asm/asm.h>
29870 #include <asm/smap.h>
29871-
29872-/*
29873- * By placing feature2 after feature1 in altinstructions section, we logically
29874- * implement:
29875- * If CPU has feature2, jmp to alt2 is used
29876- * else if CPU has feature1, jmp to alt1 is used
29877- * else jmp to orig is used.
29878- */
29879- .macro ALTERNATIVE_JUMP feature1,feature2,orig,alt1,alt2
29880-0:
29881- .byte 0xe9 /* 32bit jump */
29882- .long \orig-1f /* by default jump to orig */
29883-1:
29884- .section .altinstr_replacement,"ax"
29885-2: .byte 0xe9 /* near jump with 32bit immediate */
29886- .long \alt1-1b /* offset */ /* or alternatively to alt1 */
29887-3: .byte 0xe9 /* near jump with 32bit immediate */
29888- .long \alt2-1b /* offset */ /* or alternatively to alt2 */
29889- .previous
29890-
29891- .section .altinstructions,"a"
29892- altinstruction_entry 0b,2b,\feature1,5,5
29893- altinstruction_entry 0b,3b,\feature2,5,5
29894- .previous
29895- .endm
29896+#include <asm/pgtable.h>
29897
29898 .macro ALIGN_DESTINATION
29899 #ifdef FIX_ALIGNMENT
29900@@ -70,52 +46,6 @@
29901 #endif
29902 .endm
29903
29904-/* Standard copy_to_user with segment limit checking */
29905-ENTRY(_copy_to_user)
29906- CFI_STARTPROC
29907- GET_THREAD_INFO(%rax)
29908- movq %rdi,%rcx
29909- addq %rdx,%rcx
29910- jc bad_to_user
29911- cmpq TI_addr_limit(%rax),%rcx
29912- ja bad_to_user
29913- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29914- copy_user_generic_unrolled,copy_user_generic_string, \
29915- copy_user_enhanced_fast_string
29916- CFI_ENDPROC
29917-ENDPROC(_copy_to_user)
29918-
29919-/* Standard copy_from_user with segment limit checking */
29920-ENTRY(_copy_from_user)
29921- CFI_STARTPROC
29922- GET_THREAD_INFO(%rax)
29923- movq %rsi,%rcx
29924- addq %rdx,%rcx
29925- jc bad_from_user
29926- cmpq TI_addr_limit(%rax),%rcx
29927- ja bad_from_user
29928- ALTERNATIVE_JUMP X86_FEATURE_REP_GOOD,X86_FEATURE_ERMS, \
29929- copy_user_generic_unrolled,copy_user_generic_string, \
29930- copy_user_enhanced_fast_string
29931- CFI_ENDPROC
29932-ENDPROC(_copy_from_user)
29933-
29934- .section .fixup,"ax"
29935- /* must zero dest */
29936-ENTRY(bad_from_user)
29937-bad_from_user:
29938- CFI_STARTPROC
29939- movl %edx,%ecx
29940- xorl %eax,%eax
29941- rep
29942- stosb
29943-bad_to_user:
29944- movl %edx,%eax
29945- ret
29946- CFI_ENDPROC
29947-ENDPROC(bad_from_user)
29948- .previous
29949-
29950 /*
29951 * copy_user_generic_unrolled - memory copy with exception handling.
29952 * This version is for CPUs like P4 that don't have efficient micro
29953@@ -131,6 +61,7 @@ ENDPROC(bad_from_user)
29954 */
29955 ENTRY(copy_user_generic_unrolled)
29956 CFI_STARTPROC
29957+ ASM_PAX_OPEN_USERLAND
29958 ASM_STAC
29959 cmpl $8,%edx
29960 jb 20f /* less then 8 bytes, go to byte copy loop */
29961@@ -180,6 +111,8 @@ ENTRY(copy_user_generic_unrolled)
29962 jnz 21b
29963 23: xor %eax,%eax
29964 ASM_CLAC
29965+ ASM_PAX_CLOSE_USERLAND
29966+ pax_force_retaddr
29967 ret
29968
29969 .section .fixup,"ax"
29970@@ -235,6 +168,7 @@ ENDPROC(copy_user_generic_unrolled)
29971 */
29972 ENTRY(copy_user_generic_string)
29973 CFI_STARTPROC
29974+ ASM_PAX_OPEN_USERLAND
29975 ASM_STAC
29976 cmpl $8,%edx
29977 jb 2f /* less than 8 bytes, go to byte copy loop */
29978@@ -249,6 +183,8 @@ ENTRY(copy_user_generic_string)
29979 movsb
29980 xorl %eax,%eax
29981 ASM_CLAC
29982+ ASM_PAX_CLOSE_USERLAND
29983+ pax_force_retaddr
29984 ret
29985
29986 .section .fixup,"ax"
29987@@ -276,12 +212,15 @@ ENDPROC(copy_user_generic_string)
29988 */
29989 ENTRY(copy_user_enhanced_fast_string)
29990 CFI_STARTPROC
29991+ ASM_PAX_OPEN_USERLAND
29992 ASM_STAC
29993 movl %edx,%ecx
29994 1: rep
29995 movsb
29996 xorl %eax,%eax
29997 ASM_CLAC
29998+ ASM_PAX_CLOSE_USERLAND
29999+ pax_force_retaddr
30000 ret
30001
30002 .section .fixup,"ax"
30003diff --git a/arch/x86/lib/copy_user_nocache_64.S b/arch/x86/lib/copy_user_nocache_64.S
30004index 6a4f43c..c70fb52 100644
30005--- a/arch/x86/lib/copy_user_nocache_64.S
30006+++ b/arch/x86/lib/copy_user_nocache_64.S
30007@@ -8,6 +8,7 @@
30008
30009 #include <linux/linkage.h>
30010 #include <asm/dwarf2.h>
30011+#include <asm/alternative-asm.h>
30012
30013 #define FIX_ALIGNMENT 1
30014
30015@@ -16,6 +17,7 @@
30016 #include <asm/thread_info.h>
30017 #include <asm/asm.h>
30018 #include <asm/smap.h>
30019+#include <asm/pgtable.h>
30020
30021 .macro ALIGN_DESTINATION
30022 #ifdef FIX_ALIGNMENT
30023@@ -49,6 +51,16 @@
30024 */
30025 ENTRY(__copy_user_nocache)
30026 CFI_STARTPROC
30027+
30028+#ifdef CONFIG_PAX_MEMORY_UDEREF
30029+ mov pax_user_shadow_base,%rcx
30030+ cmp %rcx,%rsi
30031+ jae 1f
30032+ add %rcx,%rsi
30033+1:
30034+#endif
30035+
30036+ ASM_PAX_OPEN_USERLAND
30037 ASM_STAC
30038 cmpl $8,%edx
30039 jb 20f /* less then 8 bytes, go to byte copy loop */
30040@@ -98,7 +110,9 @@ ENTRY(__copy_user_nocache)
30041 jnz 21b
30042 23: xorl %eax,%eax
30043 ASM_CLAC
30044+ ASM_PAX_CLOSE_USERLAND
30045 sfence
30046+ pax_force_retaddr
30047 ret
30048
30049 .section .fixup,"ax"
30050diff --git a/arch/x86/lib/csum-copy_64.S b/arch/x86/lib/csum-copy_64.S
30051index 2419d5f..fe52d0e 100644
30052--- a/arch/x86/lib/csum-copy_64.S
30053+++ b/arch/x86/lib/csum-copy_64.S
30054@@ -9,6 +9,7 @@
30055 #include <asm/dwarf2.h>
30056 #include <asm/errno.h>
30057 #include <asm/asm.h>
30058+#include <asm/alternative-asm.h>
30059
30060 /*
30061 * Checksum copy with exception handling.
30062@@ -56,8 +57,8 @@ ENTRY(csum_partial_copy_generic)
30063 CFI_ADJUST_CFA_OFFSET 7*8
30064 movq %rbx, 2*8(%rsp)
30065 CFI_REL_OFFSET rbx, 2*8
30066- movq %r12, 3*8(%rsp)
30067- CFI_REL_OFFSET r12, 3*8
30068+ movq %r15, 3*8(%rsp)
30069+ CFI_REL_OFFSET r15, 3*8
30070 movq %r14, 4*8(%rsp)
30071 CFI_REL_OFFSET r14, 4*8
30072 movq %r13, 5*8(%rsp)
30073@@ -72,16 +73,16 @@ ENTRY(csum_partial_copy_generic)
30074 movl %edx, %ecx
30075
30076 xorl %r9d, %r9d
30077- movq %rcx, %r12
30078+ movq %rcx, %r15
30079
30080- shrq $6, %r12
30081+ shrq $6, %r15
30082 jz .Lhandle_tail /* < 64 */
30083
30084 clc
30085
30086 /* main loop. clear in 64 byte blocks */
30087 /* r9: zero, r8: temp2, rbx: temp1, rax: sum, rcx: saved length */
30088- /* r11: temp3, rdx: temp4, r12 loopcnt */
30089+ /* r11: temp3, rdx: temp4, r15 loopcnt */
30090 /* r10: temp5, rbp: temp6, r14 temp7, r13 temp8 */
30091 .p2align 4
30092 .Lloop:
30093@@ -115,7 +116,7 @@ ENTRY(csum_partial_copy_generic)
30094 adcq %r14, %rax
30095 adcq %r13, %rax
30096
30097- decl %r12d
30098+ decl %r15d
30099
30100 dest
30101 movq %rbx, (%rsi)
30102@@ -210,8 +211,8 @@ ENTRY(csum_partial_copy_generic)
30103 .Lende:
30104 movq 2*8(%rsp), %rbx
30105 CFI_RESTORE rbx
30106- movq 3*8(%rsp), %r12
30107- CFI_RESTORE r12
30108+ movq 3*8(%rsp), %r15
30109+ CFI_RESTORE r15
30110 movq 4*8(%rsp), %r14
30111 CFI_RESTORE r14
30112 movq 5*8(%rsp), %r13
30113@@ -220,6 +221,7 @@ ENTRY(csum_partial_copy_generic)
30114 CFI_RESTORE rbp
30115 addq $7*8, %rsp
30116 CFI_ADJUST_CFA_OFFSET -7*8
30117+ pax_force_retaddr
30118 ret
30119 CFI_RESTORE_STATE
30120
30121diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
30122index 1318f75..44c30fd 100644
30123--- a/arch/x86/lib/csum-wrappers_64.c
30124+++ b/arch/x86/lib/csum-wrappers_64.c
30125@@ -52,10 +52,12 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
30126 len -= 2;
30127 }
30128 }
30129+ pax_open_userland();
30130 stac();
30131- isum = csum_partial_copy_generic((__force const void *)src,
30132+ isum = csum_partial_copy_generic((const void __force_kernel *)____m(src),
30133 dst, len, isum, errp, NULL);
30134 clac();
30135+ pax_close_userland();
30136 if (unlikely(*errp))
30137 goto out_err;
30138
30139@@ -109,10 +111,12 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
30140 }
30141
30142 *errp = 0;
30143+ pax_open_userland();
30144 stac();
30145- ret = csum_partial_copy_generic(src, (void __force *)dst,
30146+ ret = csum_partial_copy_generic(src, (void __force_kernel *)____m(dst),
30147 len, isum, NULL, errp);
30148 clac();
30149+ pax_close_userland();
30150 return ret;
30151 }
30152 EXPORT_SYMBOL(csum_partial_copy_to_user);
30153diff --git a/arch/x86/lib/getuser.S b/arch/x86/lib/getuser.S
30154index a451235..a74bfa3 100644
30155--- a/arch/x86/lib/getuser.S
30156+++ b/arch/x86/lib/getuser.S
30157@@ -33,17 +33,40 @@
30158 #include <asm/thread_info.h>
30159 #include <asm/asm.h>
30160 #include <asm/smap.h>
30161+#include <asm/segment.h>
30162+#include <asm/pgtable.h>
30163+#include <asm/alternative-asm.h>
30164+
30165+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30166+#define __copyuser_seg gs;
30167+#else
30168+#define __copyuser_seg
30169+#endif
30170
30171 .text
30172 ENTRY(__get_user_1)
30173 CFI_STARTPROC
30174+
30175+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30176 GET_THREAD_INFO(%_ASM_DX)
30177 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30178 jae bad_get_user
30179+
30180+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30181+ mov pax_user_shadow_base,%_ASM_DX
30182+ cmp %_ASM_DX,%_ASM_AX
30183+ jae 1234f
30184+ add %_ASM_DX,%_ASM_AX
30185+1234:
30186+#endif
30187+
30188+#endif
30189+
30190 ASM_STAC
30191-1: movzbl (%_ASM_AX),%edx
30192+1: __copyuser_seg movzbl (%_ASM_AX),%edx
30193 xor %eax,%eax
30194 ASM_CLAC
30195+ pax_force_retaddr
30196 ret
30197 CFI_ENDPROC
30198 ENDPROC(__get_user_1)
30199@@ -51,14 +74,28 @@ ENDPROC(__get_user_1)
30200 ENTRY(__get_user_2)
30201 CFI_STARTPROC
30202 add $1,%_ASM_AX
30203+
30204+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30205 jc bad_get_user
30206 GET_THREAD_INFO(%_ASM_DX)
30207 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30208 jae bad_get_user
30209+
30210+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30211+ mov pax_user_shadow_base,%_ASM_DX
30212+ cmp %_ASM_DX,%_ASM_AX
30213+ jae 1234f
30214+ add %_ASM_DX,%_ASM_AX
30215+1234:
30216+#endif
30217+
30218+#endif
30219+
30220 ASM_STAC
30221-2: movzwl -1(%_ASM_AX),%edx
30222+2: __copyuser_seg movzwl -1(%_ASM_AX),%edx
30223 xor %eax,%eax
30224 ASM_CLAC
30225+ pax_force_retaddr
30226 ret
30227 CFI_ENDPROC
30228 ENDPROC(__get_user_2)
30229@@ -66,14 +103,28 @@ ENDPROC(__get_user_2)
30230 ENTRY(__get_user_4)
30231 CFI_STARTPROC
30232 add $3,%_ASM_AX
30233+
30234+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30235 jc bad_get_user
30236 GET_THREAD_INFO(%_ASM_DX)
30237 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30238 jae bad_get_user
30239+
30240+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30241+ mov pax_user_shadow_base,%_ASM_DX
30242+ cmp %_ASM_DX,%_ASM_AX
30243+ jae 1234f
30244+ add %_ASM_DX,%_ASM_AX
30245+1234:
30246+#endif
30247+
30248+#endif
30249+
30250 ASM_STAC
30251-3: movl -3(%_ASM_AX),%edx
30252+3: __copyuser_seg movl -3(%_ASM_AX),%edx
30253 xor %eax,%eax
30254 ASM_CLAC
30255+ pax_force_retaddr
30256 ret
30257 CFI_ENDPROC
30258 ENDPROC(__get_user_4)
30259@@ -86,10 +137,20 @@ ENTRY(__get_user_8)
30260 GET_THREAD_INFO(%_ASM_DX)
30261 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30262 jae bad_get_user
30263+
30264+#ifdef CONFIG_PAX_MEMORY_UDEREF
30265+ mov pax_user_shadow_base,%_ASM_DX
30266+ cmp %_ASM_DX,%_ASM_AX
30267+ jae 1234f
30268+ add %_ASM_DX,%_ASM_AX
30269+1234:
30270+#endif
30271+
30272 ASM_STAC
30273 4: movq -7(%_ASM_AX),%rdx
30274 xor %eax,%eax
30275 ASM_CLAC
30276+ pax_force_retaddr
30277 ret
30278 #else
30279 add $7,%_ASM_AX
30280@@ -98,10 +159,11 @@ ENTRY(__get_user_8)
30281 cmp TI_addr_limit(%_ASM_DX),%_ASM_AX
30282 jae bad_get_user_8
30283 ASM_STAC
30284-4: movl -7(%_ASM_AX),%edx
30285-5: movl -3(%_ASM_AX),%ecx
30286+4: __copyuser_seg movl -7(%_ASM_AX),%edx
30287+5: __copyuser_seg movl -3(%_ASM_AX),%ecx
30288 xor %eax,%eax
30289 ASM_CLAC
30290+ pax_force_retaddr
30291 ret
30292 #endif
30293 CFI_ENDPROC
30294@@ -113,6 +175,7 @@ bad_get_user:
30295 xor %edx,%edx
30296 mov $(-EFAULT),%_ASM_AX
30297 ASM_CLAC
30298+ pax_force_retaddr
30299 ret
30300 CFI_ENDPROC
30301 END(bad_get_user)
30302@@ -124,6 +187,7 @@ bad_get_user_8:
30303 xor %ecx,%ecx
30304 mov $(-EFAULT),%_ASM_AX
30305 ASM_CLAC
30306+ pax_force_retaddr
30307 ret
30308 CFI_ENDPROC
30309 END(bad_get_user_8)
30310diff --git a/arch/x86/lib/insn.c b/arch/x86/lib/insn.c
30311index 85994f5..9929d7f 100644
30312--- a/arch/x86/lib/insn.c
30313+++ b/arch/x86/lib/insn.c
30314@@ -20,8 +20,10 @@
30315
30316 #ifdef __KERNEL__
30317 #include <linux/string.h>
30318+#include <asm/pgtable_types.h>
30319 #else
30320 #include <string.h>
30321+#define ktla_ktva(addr) addr
30322 #endif
30323 #include <asm/inat.h>
30324 #include <asm/insn.h>
30325@@ -60,9 +62,9 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64)
30326 buf_len = MAX_INSN_SIZE;
30327
30328 memset(insn, 0, sizeof(*insn));
30329- insn->kaddr = kaddr;
30330- insn->end_kaddr = kaddr + buf_len;
30331- insn->next_byte = kaddr;
30332+ insn->kaddr = ktla_ktva(kaddr);
30333+ insn->end_kaddr = insn->kaddr + buf_len;
30334+ insn->next_byte = insn->kaddr;
30335 insn->x86_64 = x86_64 ? 1 : 0;
30336 insn->opnd_bytes = 4;
30337 if (x86_64)
30338diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S
30339index 05a95e7..326f2fa 100644
30340--- a/arch/x86/lib/iomap_copy_64.S
30341+++ b/arch/x86/lib/iomap_copy_64.S
30342@@ -17,6 +17,7 @@
30343
30344 #include <linux/linkage.h>
30345 #include <asm/dwarf2.h>
30346+#include <asm/alternative-asm.h>
30347
30348 /*
30349 * override generic version in lib/iomap_copy.c
30350@@ -25,6 +26,7 @@ ENTRY(__iowrite32_copy)
30351 CFI_STARTPROC
30352 movl %edx,%ecx
30353 rep movsd
30354+ pax_force_retaddr
30355 ret
30356 CFI_ENDPROC
30357 ENDPROC(__iowrite32_copy)
30358diff --git a/arch/x86/lib/memcpy_64.S b/arch/x86/lib/memcpy_64.S
30359index 89b53c9..97357ca 100644
30360--- a/arch/x86/lib/memcpy_64.S
30361+++ b/arch/x86/lib/memcpy_64.S
30362@@ -24,7 +24,7 @@
30363 * This gets patched over the unrolled variant (below) via the
30364 * alternative instructions framework:
30365 */
30366- .section .altinstr_replacement, "ax", @progbits
30367+ .section .altinstr_replacement, "a", @progbits
30368 .Lmemcpy_c:
30369 movq %rdi, %rax
30370 movq %rdx, %rcx
30371@@ -33,6 +33,7 @@
30372 rep movsq
30373 movl %edx, %ecx
30374 rep movsb
30375+ pax_force_retaddr
30376 ret
30377 .Lmemcpy_e:
30378 .previous
30379@@ -44,11 +45,12 @@
30380 * This gets patched over the unrolled variant (below) via the
30381 * alternative instructions framework:
30382 */
30383- .section .altinstr_replacement, "ax", @progbits
30384+ .section .altinstr_replacement, "a", @progbits
30385 .Lmemcpy_c_e:
30386 movq %rdi, %rax
30387 movq %rdx, %rcx
30388 rep movsb
30389+ pax_force_retaddr
30390 ret
30391 .Lmemcpy_e_e:
30392 .previous
30393@@ -138,6 +140,7 @@ ENTRY(memcpy)
30394 movq %r9, 1*8(%rdi)
30395 movq %r10, -2*8(%rdi, %rdx)
30396 movq %r11, -1*8(%rdi, %rdx)
30397+ pax_force_retaddr
30398 retq
30399 .p2align 4
30400 .Lless_16bytes:
30401@@ -150,6 +153,7 @@ ENTRY(memcpy)
30402 movq -1*8(%rsi, %rdx), %r9
30403 movq %r8, 0*8(%rdi)
30404 movq %r9, -1*8(%rdi, %rdx)
30405+ pax_force_retaddr
30406 retq
30407 .p2align 4
30408 .Lless_8bytes:
30409@@ -163,6 +167,7 @@ ENTRY(memcpy)
30410 movl -4(%rsi, %rdx), %r8d
30411 movl %ecx, (%rdi)
30412 movl %r8d, -4(%rdi, %rdx)
30413+ pax_force_retaddr
30414 retq
30415 .p2align 4
30416 .Lless_3bytes:
30417@@ -181,6 +186,7 @@ ENTRY(memcpy)
30418 movb %cl, (%rdi)
30419
30420 .Lend:
30421+ pax_force_retaddr
30422 retq
30423 CFI_ENDPROC
30424 ENDPROC(memcpy)
30425diff --git a/arch/x86/lib/memmove_64.S b/arch/x86/lib/memmove_64.S
30426index 9c4b530..830b77a 100644
30427--- a/arch/x86/lib/memmove_64.S
30428+++ b/arch/x86/lib/memmove_64.S
30429@@ -205,14 +205,16 @@ ENTRY(__memmove)
30430 movb (%rsi), %r11b
30431 movb %r11b, (%rdi)
30432 13:
30433+ pax_force_retaddr
30434 retq
30435 CFI_ENDPROC
30436
30437- .section .altinstr_replacement,"ax"
30438+ .section .altinstr_replacement,"a"
30439 .Lmemmove_begin_forward_efs:
30440 /* Forward moving data. */
30441 movq %rdx, %rcx
30442 rep movsb
30443+ pax_force_retaddr
30444 retq
30445 .Lmemmove_end_forward_efs:
30446 .previous
30447diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S
30448index 6f44935..fbf5f6d 100644
30449--- a/arch/x86/lib/memset_64.S
30450+++ b/arch/x86/lib/memset_64.S
30451@@ -16,7 +16,7 @@
30452 *
30453 * rax original destination
30454 */
30455- .section .altinstr_replacement, "ax", @progbits
30456+ .section .altinstr_replacement, "a", @progbits
30457 .Lmemset_c:
30458 movq %rdi,%r9
30459 movq %rdx,%rcx
30460@@ -30,6 +30,7 @@
30461 movl %edx,%ecx
30462 rep stosb
30463 movq %r9,%rax
30464+ pax_force_retaddr
30465 ret
30466 .Lmemset_e:
30467 .previous
30468@@ -45,13 +46,14 @@
30469 *
30470 * rax original destination
30471 */
30472- .section .altinstr_replacement, "ax", @progbits
30473+ .section .altinstr_replacement, "a", @progbits
30474 .Lmemset_c_e:
30475 movq %rdi,%r9
30476 movb %sil,%al
30477 movq %rdx,%rcx
30478 rep stosb
30479 movq %r9,%rax
30480+ pax_force_retaddr
30481 ret
30482 .Lmemset_e_e:
30483 .previous
30484@@ -120,6 +122,7 @@ ENTRY(__memset)
30485
30486 .Lende:
30487 movq %r10,%rax
30488+ pax_force_retaddr
30489 ret
30490
30491 CFI_RESTORE_STATE
30492diff --git a/arch/x86/lib/mmx_32.c b/arch/x86/lib/mmx_32.c
30493index c9f2d9b..e7fd2c0 100644
30494--- a/arch/x86/lib/mmx_32.c
30495+++ b/arch/x86/lib/mmx_32.c
30496@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30497 {
30498 void *p;
30499 int i;
30500+ unsigned long cr0;
30501
30502 if (unlikely(in_interrupt()))
30503 return __memcpy(to, from, len);
30504@@ -39,44 +40,72 @@ void *_mmx_memcpy(void *to, const void *from, size_t len)
30505 kernel_fpu_begin();
30506
30507 __asm__ __volatile__ (
30508- "1: prefetch (%0)\n" /* This set is 28 bytes */
30509- " prefetch 64(%0)\n"
30510- " prefetch 128(%0)\n"
30511- " prefetch 192(%0)\n"
30512- " prefetch 256(%0)\n"
30513+ "1: prefetch (%1)\n" /* This set is 28 bytes */
30514+ " prefetch 64(%1)\n"
30515+ " prefetch 128(%1)\n"
30516+ " prefetch 192(%1)\n"
30517+ " prefetch 256(%1)\n"
30518 "2: \n"
30519 ".section .fixup, \"ax\"\n"
30520- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30521+ "3: \n"
30522+
30523+#ifdef CONFIG_PAX_KERNEXEC
30524+ " movl %%cr0, %0\n"
30525+ " movl %0, %%eax\n"
30526+ " andl $0xFFFEFFFF, %%eax\n"
30527+ " movl %%eax, %%cr0\n"
30528+#endif
30529+
30530+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30531+
30532+#ifdef CONFIG_PAX_KERNEXEC
30533+ " movl %0, %%cr0\n"
30534+#endif
30535+
30536 " jmp 2b\n"
30537 ".previous\n"
30538 _ASM_EXTABLE(1b, 3b)
30539- : : "r" (from));
30540+ : "=&r" (cr0) : "r" (from) : "ax");
30541
30542 for ( ; i > 5; i--) {
30543 __asm__ __volatile__ (
30544- "1: prefetch 320(%0)\n"
30545- "2: movq (%0), %%mm0\n"
30546- " movq 8(%0), %%mm1\n"
30547- " movq 16(%0), %%mm2\n"
30548- " movq 24(%0), %%mm3\n"
30549- " movq %%mm0, (%1)\n"
30550- " movq %%mm1, 8(%1)\n"
30551- " movq %%mm2, 16(%1)\n"
30552- " movq %%mm3, 24(%1)\n"
30553- " movq 32(%0), %%mm0\n"
30554- " movq 40(%0), %%mm1\n"
30555- " movq 48(%0), %%mm2\n"
30556- " movq 56(%0), %%mm3\n"
30557- " movq %%mm0, 32(%1)\n"
30558- " movq %%mm1, 40(%1)\n"
30559- " movq %%mm2, 48(%1)\n"
30560- " movq %%mm3, 56(%1)\n"
30561+ "1: prefetch 320(%1)\n"
30562+ "2: movq (%1), %%mm0\n"
30563+ " movq 8(%1), %%mm1\n"
30564+ " movq 16(%1), %%mm2\n"
30565+ " movq 24(%1), %%mm3\n"
30566+ " movq %%mm0, (%2)\n"
30567+ " movq %%mm1, 8(%2)\n"
30568+ " movq %%mm2, 16(%2)\n"
30569+ " movq %%mm3, 24(%2)\n"
30570+ " movq 32(%1), %%mm0\n"
30571+ " movq 40(%1), %%mm1\n"
30572+ " movq 48(%1), %%mm2\n"
30573+ " movq 56(%1), %%mm3\n"
30574+ " movq %%mm0, 32(%2)\n"
30575+ " movq %%mm1, 40(%2)\n"
30576+ " movq %%mm2, 48(%2)\n"
30577+ " movq %%mm3, 56(%2)\n"
30578 ".section .fixup, \"ax\"\n"
30579- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30580+ "3:\n"
30581+
30582+#ifdef CONFIG_PAX_KERNEXEC
30583+ " movl %%cr0, %0\n"
30584+ " movl %0, %%eax\n"
30585+ " andl $0xFFFEFFFF, %%eax\n"
30586+ " movl %%eax, %%cr0\n"
30587+#endif
30588+
30589+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30590+
30591+#ifdef CONFIG_PAX_KERNEXEC
30592+ " movl %0, %%cr0\n"
30593+#endif
30594+
30595 " jmp 2b\n"
30596 ".previous\n"
30597 _ASM_EXTABLE(1b, 3b)
30598- : : "r" (from), "r" (to) : "memory");
30599+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30600
30601 from += 64;
30602 to += 64;
30603@@ -158,6 +187,7 @@ static void fast_clear_page(void *page)
30604 static void fast_copy_page(void *to, void *from)
30605 {
30606 int i;
30607+ unsigned long cr0;
30608
30609 kernel_fpu_begin();
30610
30611@@ -166,42 +196,70 @@ static void fast_copy_page(void *to, void *from)
30612 * but that is for later. -AV
30613 */
30614 __asm__ __volatile__(
30615- "1: prefetch (%0)\n"
30616- " prefetch 64(%0)\n"
30617- " prefetch 128(%0)\n"
30618- " prefetch 192(%0)\n"
30619- " prefetch 256(%0)\n"
30620+ "1: prefetch (%1)\n"
30621+ " prefetch 64(%1)\n"
30622+ " prefetch 128(%1)\n"
30623+ " prefetch 192(%1)\n"
30624+ " prefetch 256(%1)\n"
30625 "2: \n"
30626 ".section .fixup, \"ax\"\n"
30627- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30628+ "3: \n"
30629+
30630+#ifdef CONFIG_PAX_KERNEXEC
30631+ " movl %%cr0, %0\n"
30632+ " movl %0, %%eax\n"
30633+ " andl $0xFFFEFFFF, %%eax\n"
30634+ " movl %%eax, %%cr0\n"
30635+#endif
30636+
30637+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30638+
30639+#ifdef CONFIG_PAX_KERNEXEC
30640+ " movl %0, %%cr0\n"
30641+#endif
30642+
30643 " jmp 2b\n"
30644 ".previous\n"
30645- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30646+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30647
30648 for (i = 0; i < (4096-320)/64; i++) {
30649 __asm__ __volatile__ (
30650- "1: prefetch 320(%0)\n"
30651- "2: movq (%0), %%mm0\n"
30652- " movntq %%mm0, (%1)\n"
30653- " movq 8(%0), %%mm1\n"
30654- " movntq %%mm1, 8(%1)\n"
30655- " movq 16(%0), %%mm2\n"
30656- " movntq %%mm2, 16(%1)\n"
30657- " movq 24(%0), %%mm3\n"
30658- " movntq %%mm3, 24(%1)\n"
30659- " movq 32(%0), %%mm4\n"
30660- " movntq %%mm4, 32(%1)\n"
30661- " movq 40(%0), %%mm5\n"
30662- " movntq %%mm5, 40(%1)\n"
30663- " movq 48(%0), %%mm6\n"
30664- " movntq %%mm6, 48(%1)\n"
30665- " movq 56(%0), %%mm7\n"
30666- " movntq %%mm7, 56(%1)\n"
30667+ "1: prefetch 320(%1)\n"
30668+ "2: movq (%1), %%mm0\n"
30669+ " movntq %%mm0, (%2)\n"
30670+ " movq 8(%1), %%mm1\n"
30671+ " movntq %%mm1, 8(%2)\n"
30672+ " movq 16(%1), %%mm2\n"
30673+ " movntq %%mm2, 16(%2)\n"
30674+ " movq 24(%1), %%mm3\n"
30675+ " movntq %%mm3, 24(%2)\n"
30676+ " movq 32(%1), %%mm4\n"
30677+ " movntq %%mm4, 32(%2)\n"
30678+ " movq 40(%1), %%mm5\n"
30679+ " movntq %%mm5, 40(%2)\n"
30680+ " movq 48(%1), %%mm6\n"
30681+ " movntq %%mm6, 48(%2)\n"
30682+ " movq 56(%1), %%mm7\n"
30683+ " movntq %%mm7, 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) : : "r" (from), "r" (to) : "memory");
30704+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30705
30706 from += 64;
30707 to += 64;
30708@@ -280,47 +338,76 @@ static void fast_clear_page(void *page)
30709 static void fast_copy_page(void *to, void *from)
30710 {
30711 int i;
30712+ unsigned long cr0;
30713
30714 kernel_fpu_begin();
30715
30716 __asm__ __volatile__ (
30717- "1: prefetch (%0)\n"
30718- " prefetch 64(%0)\n"
30719- " prefetch 128(%0)\n"
30720- " prefetch 192(%0)\n"
30721- " prefetch 256(%0)\n"
30722+ "1: prefetch (%1)\n"
30723+ " prefetch 64(%1)\n"
30724+ " prefetch 128(%1)\n"
30725+ " prefetch 192(%1)\n"
30726+ " prefetch 256(%1)\n"
30727 "2: \n"
30728 ".section .fixup, \"ax\"\n"
30729- "3: movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30730+ "3: \n"
30731+
30732+#ifdef CONFIG_PAX_KERNEXEC
30733+ " movl %%cr0, %0\n"
30734+ " movl %0, %%eax\n"
30735+ " andl $0xFFFEFFFF, %%eax\n"
30736+ " movl %%eax, %%cr0\n"
30737+#endif
30738+
30739+ " movw $0x1AEB, 1b\n" /* jmp on 26 bytes */
30740+
30741+#ifdef CONFIG_PAX_KERNEXEC
30742+ " movl %0, %%cr0\n"
30743+#endif
30744+
30745 " jmp 2b\n"
30746 ".previous\n"
30747- _ASM_EXTABLE(1b, 3b) : : "r" (from));
30748+ _ASM_EXTABLE(1b, 3b) : "=&r" (cr0) : "r" (from) : "ax");
30749
30750 for (i = 0; i < 4096/64; i++) {
30751 __asm__ __volatile__ (
30752- "1: prefetch 320(%0)\n"
30753- "2: movq (%0), %%mm0\n"
30754- " movq 8(%0), %%mm1\n"
30755- " movq 16(%0), %%mm2\n"
30756- " movq 24(%0), %%mm3\n"
30757- " movq %%mm0, (%1)\n"
30758- " movq %%mm1, 8(%1)\n"
30759- " movq %%mm2, 16(%1)\n"
30760- " movq %%mm3, 24(%1)\n"
30761- " movq 32(%0), %%mm0\n"
30762- " movq 40(%0), %%mm1\n"
30763- " movq 48(%0), %%mm2\n"
30764- " movq 56(%0), %%mm3\n"
30765- " movq %%mm0, 32(%1)\n"
30766- " movq %%mm1, 40(%1)\n"
30767- " movq %%mm2, 48(%1)\n"
30768- " movq %%mm3, 56(%1)\n"
30769+ "1: prefetch 320(%1)\n"
30770+ "2: movq (%1), %%mm0\n"
30771+ " movq 8(%1), %%mm1\n"
30772+ " movq 16(%1), %%mm2\n"
30773+ " movq 24(%1), %%mm3\n"
30774+ " movq %%mm0, (%2)\n"
30775+ " movq %%mm1, 8(%2)\n"
30776+ " movq %%mm2, 16(%2)\n"
30777+ " movq %%mm3, 24(%2)\n"
30778+ " movq 32(%1), %%mm0\n"
30779+ " movq 40(%1), %%mm1\n"
30780+ " movq 48(%1), %%mm2\n"
30781+ " movq 56(%1), %%mm3\n"
30782+ " movq %%mm0, 32(%2)\n"
30783+ " movq %%mm1, 40(%2)\n"
30784+ " movq %%mm2, 48(%2)\n"
30785+ " movq %%mm3, 56(%2)\n"
30786 ".section .fixup, \"ax\"\n"
30787- "3: movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30788+ "3:\n"
30789+
30790+#ifdef CONFIG_PAX_KERNEXEC
30791+ " movl %%cr0, %0\n"
30792+ " movl %0, %%eax\n"
30793+ " andl $0xFFFEFFFF, %%eax\n"
30794+ " movl %%eax, %%cr0\n"
30795+#endif
30796+
30797+ " movw $0x05EB, 1b\n" /* jmp on 5 bytes */
30798+
30799+#ifdef CONFIG_PAX_KERNEXEC
30800+ " movl %0, %%cr0\n"
30801+#endif
30802+
30803 " jmp 2b\n"
30804 ".previous\n"
30805 _ASM_EXTABLE(1b, 3b)
30806- : : "r" (from), "r" (to) : "memory");
30807+ : "=&r" (cr0) : "r" (from), "r" (to) : "memory", "ax");
30808
30809 from += 64;
30810 to += 64;
30811diff --git a/arch/x86/lib/msr-reg.S b/arch/x86/lib/msr-reg.S
30812index f6d13ee..d789440 100644
30813--- a/arch/x86/lib/msr-reg.S
30814+++ b/arch/x86/lib/msr-reg.S
30815@@ -3,6 +3,7 @@
30816 #include <asm/dwarf2.h>
30817 #include <asm/asm.h>
30818 #include <asm/msr.h>
30819+#include <asm/alternative-asm.h>
30820
30821 #ifdef CONFIG_X86_64
30822 /*
30823@@ -37,6 +38,7 @@ ENTRY(\op\()_safe_regs)
30824 movl %edi, 28(%r10)
30825 popq_cfi %rbp
30826 popq_cfi %rbx
30827+ pax_force_retaddr
30828 ret
30829 3:
30830 CFI_RESTORE_STATE
30831diff --git a/arch/x86/lib/putuser.S b/arch/x86/lib/putuser.S
30832index fc6ba17..14ad9a5 100644
30833--- a/arch/x86/lib/putuser.S
30834+++ b/arch/x86/lib/putuser.S
30835@@ -16,7 +16,9 @@
30836 #include <asm/errno.h>
30837 #include <asm/asm.h>
30838 #include <asm/smap.h>
30839-
30840+#include <asm/segment.h>
30841+#include <asm/pgtable.h>
30842+#include <asm/alternative-asm.h>
30843
30844 /*
30845 * __put_user_X
30846@@ -30,57 +32,125 @@
30847 * as they get called from within inline assembly.
30848 */
30849
30850-#define ENTER CFI_STARTPROC ; \
30851- GET_THREAD_INFO(%_ASM_BX)
30852-#define EXIT ASM_CLAC ; \
30853- ret ; \
30854+#define ENTER CFI_STARTPROC
30855+#define EXIT ASM_CLAC ; \
30856+ pax_force_retaddr ; \
30857+ ret ; \
30858 CFI_ENDPROC
30859
30860+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30861+#define _DEST %_ASM_CX,%_ASM_BX
30862+#else
30863+#define _DEST %_ASM_CX
30864+#endif
30865+
30866+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_MEMORY_UDEREF)
30867+#define __copyuser_seg gs;
30868+#else
30869+#define __copyuser_seg
30870+#endif
30871+
30872 .text
30873 ENTRY(__put_user_1)
30874 ENTER
30875+
30876+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30877+ GET_THREAD_INFO(%_ASM_BX)
30878 cmp TI_addr_limit(%_ASM_BX),%_ASM_CX
30879 jae bad_put_user
30880+
30881+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30882+ mov pax_user_shadow_base,%_ASM_BX
30883+ cmp %_ASM_BX,%_ASM_CX
30884+ jb 1234f
30885+ xor %ebx,%ebx
30886+1234:
30887+#endif
30888+
30889+#endif
30890+
30891 ASM_STAC
30892-1: movb %al,(%_ASM_CX)
30893+1: __copyuser_seg movb %al,(_DEST)
30894 xor %eax,%eax
30895 EXIT
30896 ENDPROC(__put_user_1)
30897
30898 ENTRY(__put_user_2)
30899 ENTER
30900+
30901+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30902+ GET_THREAD_INFO(%_ASM_BX)
30903 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30904 sub $1,%_ASM_BX
30905 cmp %_ASM_BX,%_ASM_CX
30906 jae bad_put_user
30907+
30908+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30909+ mov pax_user_shadow_base,%_ASM_BX
30910+ cmp %_ASM_BX,%_ASM_CX
30911+ jb 1234f
30912+ xor %ebx,%ebx
30913+1234:
30914+#endif
30915+
30916+#endif
30917+
30918 ASM_STAC
30919-2: movw %ax,(%_ASM_CX)
30920+2: __copyuser_seg movw %ax,(_DEST)
30921 xor %eax,%eax
30922 EXIT
30923 ENDPROC(__put_user_2)
30924
30925 ENTRY(__put_user_4)
30926 ENTER
30927+
30928+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30929+ GET_THREAD_INFO(%_ASM_BX)
30930 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30931 sub $3,%_ASM_BX
30932 cmp %_ASM_BX,%_ASM_CX
30933 jae bad_put_user
30934+
30935+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30936+ mov pax_user_shadow_base,%_ASM_BX
30937+ cmp %_ASM_BX,%_ASM_CX
30938+ jb 1234f
30939+ xor %ebx,%ebx
30940+1234:
30941+#endif
30942+
30943+#endif
30944+
30945 ASM_STAC
30946-3: movl %eax,(%_ASM_CX)
30947+3: __copyuser_seg movl %eax,(_DEST)
30948 xor %eax,%eax
30949 EXIT
30950 ENDPROC(__put_user_4)
30951
30952 ENTRY(__put_user_8)
30953 ENTER
30954+
30955+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_MEMORY_UDEREF)
30956+ GET_THREAD_INFO(%_ASM_BX)
30957 mov TI_addr_limit(%_ASM_BX),%_ASM_BX
30958 sub $7,%_ASM_BX
30959 cmp %_ASM_BX,%_ASM_CX
30960 jae bad_put_user
30961+
30962+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
30963+ mov pax_user_shadow_base,%_ASM_BX
30964+ cmp %_ASM_BX,%_ASM_CX
30965+ jb 1234f
30966+ xor %ebx,%ebx
30967+1234:
30968+#endif
30969+
30970+#endif
30971+
30972 ASM_STAC
30973-4: mov %_ASM_AX,(%_ASM_CX)
30974+4: __copyuser_seg mov %_ASM_AX,(_DEST)
30975 #ifdef CONFIG_X86_32
30976-5: movl %edx,4(%_ASM_CX)
30977+5: __copyuser_seg movl %edx,4(_DEST)
30978 #endif
30979 xor %eax,%eax
30980 EXIT
30981diff --git a/arch/x86/lib/rwsem.S b/arch/x86/lib/rwsem.S
30982index 5dff5f0..cadebf4 100644
30983--- a/arch/x86/lib/rwsem.S
30984+++ b/arch/x86/lib/rwsem.S
30985@@ -94,6 +94,7 @@ ENTRY(call_rwsem_down_read_failed)
30986 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
30987 CFI_RESTORE __ASM_REG(dx)
30988 restore_common_regs
30989+ pax_force_retaddr
30990 ret
30991 CFI_ENDPROC
30992 ENDPROC(call_rwsem_down_read_failed)
30993@@ -104,6 +105,7 @@ ENTRY(call_rwsem_down_write_failed)
30994 movq %rax,%rdi
30995 call rwsem_down_write_failed
30996 restore_common_regs
30997+ pax_force_retaddr
30998 ret
30999 CFI_ENDPROC
31000 ENDPROC(call_rwsem_down_write_failed)
31001@@ -117,7 +119,8 @@ ENTRY(call_rwsem_wake)
31002 movq %rax,%rdi
31003 call rwsem_wake
31004 restore_common_regs
31005-1: ret
31006+1: pax_force_retaddr
31007+ ret
31008 CFI_ENDPROC
31009 ENDPROC(call_rwsem_wake)
31010
31011@@ -131,6 +134,7 @@ ENTRY(call_rwsem_downgrade_wake)
31012 __ASM_SIZE(pop,_cfi) %__ASM_REG(dx)
31013 CFI_RESTORE __ASM_REG(dx)
31014 restore_common_regs
31015+ pax_force_retaddr
31016 ret
31017 CFI_ENDPROC
31018 ENDPROC(call_rwsem_downgrade_wake)
31019diff --git a/arch/x86/lib/thunk_64.S b/arch/x86/lib/thunk_64.S
31020index b30b5eb..2b57052 100644
31021--- a/arch/x86/lib/thunk_64.S
31022+++ b/arch/x86/lib/thunk_64.S
31023@@ -9,6 +9,7 @@
31024 #include <asm/dwarf2.h>
31025 #include <asm/calling.h>
31026 #include <asm/asm.h>
31027+#include <asm/alternative-asm.h>
31028
31029 /* rdi: arg1 ... normal C conventions. rax is saved/restored. */
31030 .macro THUNK name, func, put_ret_addr_in_rdi=0
31031@@ -16,11 +17,11 @@
31032 \name:
31033 CFI_STARTPROC
31034
31035- /* this one pushes 9 elems, the next one would be %rIP */
31036- SAVE_ARGS
31037+ /* this one pushes 15+1 elems, the next one would be %rIP */
31038+ SAVE_ARGS 8
31039
31040 .if \put_ret_addr_in_rdi
31041- movq_cfi_restore 9*8, rdi
31042+ movq_cfi_restore RIP, rdi
31043 .endif
31044
31045 call \func
31046@@ -47,9 +48,10 @@
31047
31048 /* SAVE_ARGS below is used only for the .cfi directives it contains. */
31049 CFI_STARTPROC
31050- SAVE_ARGS
31051+ SAVE_ARGS 8
31052 restore:
31053- RESTORE_ARGS
31054+ RESTORE_ARGS 1,8
31055+ pax_force_retaddr
31056 ret
31057 CFI_ENDPROC
31058 _ASM_NOKPROBE(restore)
31059diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
31060index e2f5e21..4b22130 100644
31061--- a/arch/x86/lib/usercopy_32.c
31062+++ b/arch/x86/lib/usercopy_32.c
31063@@ -42,11 +42,13 @@ do { \
31064 int __d0; \
31065 might_fault(); \
31066 __asm__ __volatile__( \
31067+ __COPYUSER_SET_ES \
31068 ASM_STAC "\n" \
31069 "0: rep; stosl\n" \
31070 " movl %2,%0\n" \
31071 "1: rep; stosb\n" \
31072 "2: " ASM_CLAC "\n" \
31073+ __COPYUSER_RESTORE_ES \
31074 ".section .fixup,\"ax\"\n" \
31075 "3: lea 0(%2,%0,4),%0\n" \
31076 " jmp 2b\n" \
31077@@ -98,7 +100,7 @@ EXPORT_SYMBOL(__clear_user);
31078
31079 #ifdef CONFIG_X86_INTEL_USERCOPY
31080 static unsigned long
31081-__copy_user_intel(void __user *to, const void *from, unsigned long size)
31082+__generic_copy_to_user_intel(void __user *to, const void *from, unsigned long size)
31083 {
31084 int d0, d1;
31085 __asm__ __volatile__(
31086@@ -110,36 +112,36 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31087 " .align 2,0x90\n"
31088 "3: movl 0(%4), %%eax\n"
31089 "4: movl 4(%4), %%edx\n"
31090- "5: movl %%eax, 0(%3)\n"
31091- "6: movl %%edx, 4(%3)\n"
31092+ "5: "__copyuser_seg" movl %%eax, 0(%3)\n"
31093+ "6: "__copyuser_seg" movl %%edx, 4(%3)\n"
31094 "7: movl 8(%4), %%eax\n"
31095 "8: movl 12(%4),%%edx\n"
31096- "9: movl %%eax, 8(%3)\n"
31097- "10: movl %%edx, 12(%3)\n"
31098+ "9: "__copyuser_seg" movl %%eax, 8(%3)\n"
31099+ "10: "__copyuser_seg" movl %%edx, 12(%3)\n"
31100 "11: movl 16(%4), %%eax\n"
31101 "12: movl 20(%4), %%edx\n"
31102- "13: movl %%eax, 16(%3)\n"
31103- "14: movl %%edx, 20(%3)\n"
31104+ "13: "__copyuser_seg" movl %%eax, 16(%3)\n"
31105+ "14: "__copyuser_seg" movl %%edx, 20(%3)\n"
31106 "15: movl 24(%4), %%eax\n"
31107 "16: movl 28(%4), %%edx\n"
31108- "17: movl %%eax, 24(%3)\n"
31109- "18: movl %%edx, 28(%3)\n"
31110+ "17: "__copyuser_seg" movl %%eax, 24(%3)\n"
31111+ "18: "__copyuser_seg" movl %%edx, 28(%3)\n"
31112 "19: movl 32(%4), %%eax\n"
31113 "20: movl 36(%4), %%edx\n"
31114- "21: movl %%eax, 32(%3)\n"
31115- "22: movl %%edx, 36(%3)\n"
31116+ "21: "__copyuser_seg" movl %%eax, 32(%3)\n"
31117+ "22: "__copyuser_seg" movl %%edx, 36(%3)\n"
31118 "23: movl 40(%4), %%eax\n"
31119 "24: movl 44(%4), %%edx\n"
31120- "25: movl %%eax, 40(%3)\n"
31121- "26: movl %%edx, 44(%3)\n"
31122+ "25: "__copyuser_seg" movl %%eax, 40(%3)\n"
31123+ "26: "__copyuser_seg" movl %%edx, 44(%3)\n"
31124 "27: movl 48(%4), %%eax\n"
31125 "28: movl 52(%4), %%edx\n"
31126- "29: movl %%eax, 48(%3)\n"
31127- "30: movl %%edx, 52(%3)\n"
31128+ "29: "__copyuser_seg" movl %%eax, 48(%3)\n"
31129+ "30: "__copyuser_seg" movl %%edx, 52(%3)\n"
31130 "31: movl 56(%4), %%eax\n"
31131 "32: movl 60(%4), %%edx\n"
31132- "33: movl %%eax, 56(%3)\n"
31133- "34: movl %%edx, 60(%3)\n"
31134+ "33: "__copyuser_seg" movl %%eax, 56(%3)\n"
31135+ "34: "__copyuser_seg" movl %%edx, 60(%3)\n"
31136 " addl $-64, %0\n"
31137 " addl $64, %4\n"
31138 " addl $64, %3\n"
31139@@ -149,10 +151,116 @@ __copy_user_intel(void __user *to, const void *from, unsigned long size)
31140 " shrl $2, %0\n"
31141 " andl $3, %%eax\n"
31142 " cld\n"
31143+ __COPYUSER_SET_ES
31144 "99: rep; movsl\n"
31145 "36: movl %%eax, %0\n"
31146 "37: rep; movsb\n"
31147 "100:\n"
31148+ __COPYUSER_RESTORE_ES
31149+ ".section .fixup,\"ax\"\n"
31150+ "101: lea 0(%%eax,%0,4),%0\n"
31151+ " jmp 100b\n"
31152+ ".previous\n"
31153+ _ASM_EXTABLE(1b,100b)
31154+ _ASM_EXTABLE(2b,100b)
31155+ _ASM_EXTABLE(3b,100b)
31156+ _ASM_EXTABLE(4b,100b)
31157+ _ASM_EXTABLE(5b,100b)
31158+ _ASM_EXTABLE(6b,100b)
31159+ _ASM_EXTABLE(7b,100b)
31160+ _ASM_EXTABLE(8b,100b)
31161+ _ASM_EXTABLE(9b,100b)
31162+ _ASM_EXTABLE(10b,100b)
31163+ _ASM_EXTABLE(11b,100b)
31164+ _ASM_EXTABLE(12b,100b)
31165+ _ASM_EXTABLE(13b,100b)
31166+ _ASM_EXTABLE(14b,100b)
31167+ _ASM_EXTABLE(15b,100b)
31168+ _ASM_EXTABLE(16b,100b)
31169+ _ASM_EXTABLE(17b,100b)
31170+ _ASM_EXTABLE(18b,100b)
31171+ _ASM_EXTABLE(19b,100b)
31172+ _ASM_EXTABLE(20b,100b)
31173+ _ASM_EXTABLE(21b,100b)
31174+ _ASM_EXTABLE(22b,100b)
31175+ _ASM_EXTABLE(23b,100b)
31176+ _ASM_EXTABLE(24b,100b)
31177+ _ASM_EXTABLE(25b,100b)
31178+ _ASM_EXTABLE(26b,100b)
31179+ _ASM_EXTABLE(27b,100b)
31180+ _ASM_EXTABLE(28b,100b)
31181+ _ASM_EXTABLE(29b,100b)
31182+ _ASM_EXTABLE(30b,100b)
31183+ _ASM_EXTABLE(31b,100b)
31184+ _ASM_EXTABLE(32b,100b)
31185+ _ASM_EXTABLE(33b,100b)
31186+ _ASM_EXTABLE(34b,100b)
31187+ _ASM_EXTABLE(35b,100b)
31188+ _ASM_EXTABLE(36b,100b)
31189+ _ASM_EXTABLE(37b,100b)
31190+ _ASM_EXTABLE(99b,101b)
31191+ : "=&c"(size), "=&D" (d0), "=&S" (d1)
31192+ : "1"(to), "2"(from), "0"(size)
31193+ : "eax", "edx", "memory");
31194+ return size;
31195+}
31196+
31197+static unsigned long
31198+__generic_copy_from_user_intel(void *to, const void __user *from, unsigned long size)
31199+{
31200+ int d0, d1;
31201+ __asm__ __volatile__(
31202+ " .align 2,0x90\n"
31203+ "1: "__copyuser_seg" movl 32(%4), %%eax\n"
31204+ " cmpl $67, %0\n"
31205+ " jbe 3f\n"
31206+ "2: "__copyuser_seg" movl 64(%4), %%eax\n"
31207+ " .align 2,0x90\n"
31208+ "3: "__copyuser_seg" movl 0(%4), %%eax\n"
31209+ "4: "__copyuser_seg" movl 4(%4), %%edx\n"
31210+ "5: movl %%eax, 0(%3)\n"
31211+ "6: movl %%edx, 4(%3)\n"
31212+ "7: "__copyuser_seg" movl 8(%4), %%eax\n"
31213+ "8: "__copyuser_seg" movl 12(%4),%%edx\n"
31214+ "9: movl %%eax, 8(%3)\n"
31215+ "10: movl %%edx, 12(%3)\n"
31216+ "11: "__copyuser_seg" movl 16(%4), %%eax\n"
31217+ "12: "__copyuser_seg" movl 20(%4), %%edx\n"
31218+ "13: movl %%eax, 16(%3)\n"
31219+ "14: movl %%edx, 20(%3)\n"
31220+ "15: "__copyuser_seg" movl 24(%4), %%eax\n"
31221+ "16: "__copyuser_seg" movl 28(%4), %%edx\n"
31222+ "17: movl %%eax, 24(%3)\n"
31223+ "18: movl %%edx, 28(%3)\n"
31224+ "19: "__copyuser_seg" movl 32(%4), %%eax\n"
31225+ "20: "__copyuser_seg" movl 36(%4), %%edx\n"
31226+ "21: movl %%eax, 32(%3)\n"
31227+ "22: movl %%edx, 36(%3)\n"
31228+ "23: "__copyuser_seg" movl 40(%4), %%eax\n"
31229+ "24: "__copyuser_seg" movl 44(%4), %%edx\n"
31230+ "25: movl %%eax, 40(%3)\n"
31231+ "26: movl %%edx, 44(%3)\n"
31232+ "27: "__copyuser_seg" movl 48(%4), %%eax\n"
31233+ "28: "__copyuser_seg" movl 52(%4), %%edx\n"
31234+ "29: movl %%eax, 48(%3)\n"
31235+ "30: movl %%edx, 52(%3)\n"
31236+ "31: "__copyuser_seg" movl 56(%4), %%eax\n"
31237+ "32: "__copyuser_seg" movl 60(%4), %%edx\n"
31238+ "33: movl %%eax, 56(%3)\n"
31239+ "34: movl %%edx, 60(%3)\n"
31240+ " addl $-64, %0\n"
31241+ " addl $64, %4\n"
31242+ " addl $64, %3\n"
31243+ " cmpl $63, %0\n"
31244+ " ja 1b\n"
31245+ "35: movl %0, %%eax\n"
31246+ " shrl $2, %0\n"
31247+ " andl $3, %%eax\n"
31248+ " cld\n"
31249+ "99: rep; "__copyuser_seg" movsl\n"
31250+ "36: movl %%eax, %0\n"
31251+ "37: rep; "__copyuser_seg" movsb\n"
31252+ "100:\n"
31253 ".section .fixup,\"ax\"\n"
31254 "101: lea 0(%%eax,%0,4),%0\n"
31255 " jmp 100b\n"
31256@@ -207,41 +315,41 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31257 int d0, d1;
31258 __asm__ __volatile__(
31259 " .align 2,0x90\n"
31260- "0: movl 32(%4), %%eax\n"
31261+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31262 " cmpl $67, %0\n"
31263 " jbe 2f\n"
31264- "1: movl 64(%4), %%eax\n"
31265+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31266 " .align 2,0x90\n"
31267- "2: movl 0(%4), %%eax\n"
31268- "21: movl 4(%4), %%edx\n"
31269+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31270+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31271 " movl %%eax, 0(%3)\n"
31272 " movl %%edx, 4(%3)\n"
31273- "3: movl 8(%4), %%eax\n"
31274- "31: movl 12(%4),%%edx\n"
31275+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31276+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31277 " movl %%eax, 8(%3)\n"
31278 " movl %%edx, 12(%3)\n"
31279- "4: movl 16(%4), %%eax\n"
31280- "41: movl 20(%4), %%edx\n"
31281+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31282+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31283 " movl %%eax, 16(%3)\n"
31284 " movl %%edx, 20(%3)\n"
31285- "10: movl 24(%4), %%eax\n"
31286- "51: movl 28(%4), %%edx\n"
31287+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31288+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31289 " movl %%eax, 24(%3)\n"
31290 " movl %%edx, 28(%3)\n"
31291- "11: movl 32(%4), %%eax\n"
31292- "61: movl 36(%4), %%edx\n"
31293+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31294+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31295 " movl %%eax, 32(%3)\n"
31296 " movl %%edx, 36(%3)\n"
31297- "12: movl 40(%4), %%eax\n"
31298- "71: movl 44(%4), %%edx\n"
31299+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31300+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31301 " movl %%eax, 40(%3)\n"
31302 " movl %%edx, 44(%3)\n"
31303- "13: movl 48(%4), %%eax\n"
31304- "81: movl 52(%4), %%edx\n"
31305+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31306+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31307 " movl %%eax, 48(%3)\n"
31308 " movl %%edx, 52(%3)\n"
31309- "14: movl 56(%4), %%eax\n"
31310- "91: movl 60(%4), %%edx\n"
31311+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31312+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31313 " movl %%eax, 56(%3)\n"
31314 " movl %%edx, 60(%3)\n"
31315 " addl $-64, %0\n"
31316@@ -253,9 +361,9 @@ __copy_user_zeroing_intel(void *to, const void __user *from, unsigned long size)
31317 " shrl $2, %0\n"
31318 " andl $3, %%eax\n"
31319 " cld\n"
31320- "6: rep; movsl\n"
31321+ "6: rep; "__copyuser_seg" movsl\n"
31322 " movl %%eax,%0\n"
31323- "7: rep; movsb\n"
31324+ "7: rep; "__copyuser_seg" movsb\n"
31325 "8:\n"
31326 ".section .fixup,\"ax\"\n"
31327 "9: lea 0(%%eax,%0,4),%0\n"
31328@@ -305,41 +413,41 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31329
31330 __asm__ __volatile__(
31331 " .align 2,0x90\n"
31332- "0: movl 32(%4), %%eax\n"
31333+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31334 " cmpl $67, %0\n"
31335 " jbe 2f\n"
31336- "1: movl 64(%4), %%eax\n"
31337+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31338 " .align 2,0x90\n"
31339- "2: movl 0(%4), %%eax\n"
31340- "21: movl 4(%4), %%edx\n"
31341+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31342+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31343 " movnti %%eax, 0(%3)\n"
31344 " movnti %%edx, 4(%3)\n"
31345- "3: movl 8(%4), %%eax\n"
31346- "31: movl 12(%4),%%edx\n"
31347+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31348+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31349 " movnti %%eax, 8(%3)\n"
31350 " movnti %%edx, 12(%3)\n"
31351- "4: movl 16(%4), %%eax\n"
31352- "41: movl 20(%4), %%edx\n"
31353+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31354+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31355 " movnti %%eax, 16(%3)\n"
31356 " movnti %%edx, 20(%3)\n"
31357- "10: movl 24(%4), %%eax\n"
31358- "51: movl 28(%4), %%edx\n"
31359+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31360+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31361 " movnti %%eax, 24(%3)\n"
31362 " movnti %%edx, 28(%3)\n"
31363- "11: movl 32(%4), %%eax\n"
31364- "61: movl 36(%4), %%edx\n"
31365+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31366+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31367 " movnti %%eax, 32(%3)\n"
31368 " movnti %%edx, 36(%3)\n"
31369- "12: movl 40(%4), %%eax\n"
31370- "71: movl 44(%4), %%edx\n"
31371+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31372+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31373 " movnti %%eax, 40(%3)\n"
31374 " movnti %%edx, 44(%3)\n"
31375- "13: movl 48(%4), %%eax\n"
31376- "81: movl 52(%4), %%edx\n"
31377+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31378+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31379 " movnti %%eax, 48(%3)\n"
31380 " movnti %%edx, 52(%3)\n"
31381- "14: movl 56(%4), %%eax\n"
31382- "91: movl 60(%4), %%edx\n"
31383+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31384+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31385 " movnti %%eax, 56(%3)\n"
31386 " movnti %%edx, 60(%3)\n"
31387 " addl $-64, %0\n"
31388@@ -352,9 +460,9 @@ static unsigned long __copy_user_zeroing_intel_nocache(void *to,
31389 " shrl $2, %0\n"
31390 " andl $3, %%eax\n"
31391 " cld\n"
31392- "6: rep; movsl\n"
31393+ "6: rep; "__copyuser_seg" movsl\n"
31394 " movl %%eax,%0\n"
31395- "7: rep; movsb\n"
31396+ "7: rep; "__copyuser_seg" movsb\n"
31397 "8:\n"
31398 ".section .fixup,\"ax\"\n"
31399 "9: lea 0(%%eax,%0,4),%0\n"
31400@@ -399,41 +507,41 @@ static unsigned long __copy_user_intel_nocache(void *to,
31401
31402 __asm__ __volatile__(
31403 " .align 2,0x90\n"
31404- "0: movl 32(%4), %%eax\n"
31405+ "0: "__copyuser_seg" movl 32(%4), %%eax\n"
31406 " cmpl $67, %0\n"
31407 " jbe 2f\n"
31408- "1: movl 64(%4), %%eax\n"
31409+ "1: "__copyuser_seg" movl 64(%4), %%eax\n"
31410 " .align 2,0x90\n"
31411- "2: movl 0(%4), %%eax\n"
31412- "21: movl 4(%4), %%edx\n"
31413+ "2: "__copyuser_seg" movl 0(%4), %%eax\n"
31414+ "21: "__copyuser_seg" movl 4(%4), %%edx\n"
31415 " movnti %%eax, 0(%3)\n"
31416 " movnti %%edx, 4(%3)\n"
31417- "3: movl 8(%4), %%eax\n"
31418- "31: movl 12(%4),%%edx\n"
31419+ "3: "__copyuser_seg" movl 8(%4), %%eax\n"
31420+ "31: "__copyuser_seg" movl 12(%4),%%edx\n"
31421 " movnti %%eax, 8(%3)\n"
31422 " movnti %%edx, 12(%3)\n"
31423- "4: movl 16(%4), %%eax\n"
31424- "41: movl 20(%4), %%edx\n"
31425+ "4: "__copyuser_seg" movl 16(%4), %%eax\n"
31426+ "41: "__copyuser_seg" movl 20(%4), %%edx\n"
31427 " movnti %%eax, 16(%3)\n"
31428 " movnti %%edx, 20(%3)\n"
31429- "10: movl 24(%4), %%eax\n"
31430- "51: movl 28(%4), %%edx\n"
31431+ "10: "__copyuser_seg" movl 24(%4), %%eax\n"
31432+ "51: "__copyuser_seg" movl 28(%4), %%edx\n"
31433 " movnti %%eax, 24(%3)\n"
31434 " movnti %%edx, 28(%3)\n"
31435- "11: movl 32(%4), %%eax\n"
31436- "61: movl 36(%4), %%edx\n"
31437+ "11: "__copyuser_seg" movl 32(%4), %%eax\n"
31438+ "61: "__copyuser_seg" movl 36(%4), %%edx\n"
31439 " movnti %%eax, 32(%3)\n"
31440 " movnti %%edx, 36(%3)\n"
31441- "12: movl 40(%4), %%eax\n"
31442- "71: movl 44(%4), %%edx\n"
31443+ "12: "__copyuser_seg" movl 40(%4), %%eax\n"
31444+ "71: "__copyuser_seg" movl 44(%4), %%edx\n"
31445 " movnti %%eax, 40(%3)\n"
31446 " movnti %%edx, 44(%3)\n"
31447- "13: movl 48(%4), %%eax\n"
31448- "81: movl 52(%4), %%edx\n"
31449+ "13: "__copyuser_seg" movl 48(%4), %%eax\n"
31450+ "81: "__copyuser_seg" movl 52(%4), %%edx\n"
31451 " movnti %%eax, 48(%3)\n"
31452 " movnti %%edx, 52(%3)\n"
31453- "14: movl 56(%4), %%eax\n"
31454- "91: movl 60(%4), %%edx\n"
31455+ "14: "__copyuser_seg" movl 56(%4), %%eax\n"
31456+ "91: "__copyuser_seg" movl 60(%4), %%edx\n"
31457 " movnti %%eax, 56(%3)\n"
31458 " movnti %%edx, 60(%3)\n"
31459 " addl $-64, %0\n"
31460@@ -446,9 +554,9 @@ static unsigned long __copy_user_intel_nocache(void *to,
31461 " shrl $2, %0\n"
31462 " andl $3, %%eax\n"
31463 " cld\n"
31464- "6: rep; movsl\n"
31465+ "6: rep; "__copyuser_seg" movsl\n"
31466 " movl %%eax,%0\n"
31467- "7: rep; movsb\n"
31468+ "7: rep; "__copyuser_seg" movsb\n"
31469 "8:\n"
31470 ".section .fixup,\"ax\"\n"
31471 "9: lea 0(%%eax,%0,4),%0\n"
31472@@ -488,32 +596,36 @@ static unsigned long __copy_user_intel_nocache(void *to,
31473 */
31474 unsigned long __copy_user_zeroing_intel(void *to, const void __user *from,
31475 unsigned long size);
31476-unsigned long __copy_user_intel(void __user *to, const void *from,
31477+unsigned long __generic_copy_to_user_intel(void __user *to, const void *from,
31478+ unsigned long size);
31479+unsigned long __generic_copy_from_user_intel(void *to, const void __user *from,
31480 unsigned long size);
31481 unsigned long __copy_user_zeroing_intel_nocache(void *to,
31482 const void __user *from, unsigned long size);
31483 #endif /* CONFIG_X86_INTEL_USERCOPY */
31484
31485 /* Generic arbitrary sized copy. */
31486-#define __copy_user(to, from, size) \
31487+#define __copy_user(to, from, size, prefix, set, restore) \
31488 do { \
31489 int __d0, __d1, __d2; \
31490 __asm__ __volatile__( \
31491+ set \
31492 " cmp $7,%0\n" \
31493 " jbe 1f\n" \
31494 " movl %1,%0\n" \
31495 " negl %0\n" \
31496 " andl $7,%0\n" \
31497 " subl %0,%3\n" \
31498- "4: rep; movsb\n" \
31499+ "4: rep; "prefix"movsb\n" \
31500 " movl %3,%0\n" \
31501 " shrl $2,%0\n" \
31502 " andl $3,%3\n" \
31503 " .align 2,0x90\n" \
31504- "0: rep; movsl\n" \
31505+ "0: rep; "prefix"movsl\n" \
31506 " movl %3,%0\n" \
31507- "1: rep; movsb\n" \
31508+ "1: rep; "prefix"movsb\n" \
31509 "2:\n" \
31510+ restore \
31511 ".section .fixup,\"ax\"\n" \
31512 "5: addl %3,%0\n" \
31513 " jmp 2b\n" \
31514@@ -538,14 +650,14 @@ do { \
31515 " negl %0\n" \
31516 " andl $7,%0\n" \
31517 " subl %0,%3\n" \
31518- "4: rep; movsb\n" \
31519+ "4: rep; "__copyuser_seg"movsb\n" \
31520 " movl %3,%0\n" \
31521 " shrl $2,%0\n" \
31522 " andl $3,%3\n" \
31523 " .align 2,0x90\n" \
31524- "0: rep; movsl\n" \
31525+ "0: rep; "__copyuser_seg"movsl\n" \
31526 " movl %3,%0\n" \
31527- "1: rep; movsb\n" \
31528+ "1: rep; "__copyuser_seg"movsb\n" \
31529 "2:\n" \
31530 ".section .fixup,\"ax\"\n" \
31531 "5: addl %3,%0\n" \
31532@@ -572,9 +684,9 @@ unsigned long __copy_to_user_ll(void __user *to, const void *from,
31533 {
31534 stac();
31535 if (movsl_is_ok(to, from, n))
31536- __copy_user(to, from, n);
31537+ __copy_user(to, from, n, "", __COPYUSER_SET_ES, __COPYUSER_RESTORE_ES);
31538 else
31539- n = __copy_user_intel(to, from, n);
31540+ n = __generic_copy_to_user_intel(to, from, n);
31541 clac();
31542 return n;
31543 }
31544@@ -598,10 +710,9 @@ unsigned long __copy_from_user_ll_nozero(void *to, const void __user *from,
31545 {
31546 stac();
31547 if (movsl_is_ok(to, from, n))
31548- __copy_user(to, from, n);
31549+ __copy_user(to, from, n, __copyuser_seg, "", "");
31550 else
31551- n = __copy_user_intel((void __user *)to,
31552- (const void *)from, n);
31553+ n = __generic_copy_from_user_intel(to, from, n);
31554 clac();
31555 return n;
31556 }
31557@@ -632,58 +743,38 @@ unsigned long __copy_from_user_ll_nocache_nozero(void *to, const void __user *fr
31558 if (n > 64 && cpu_has_xmm2)
31559 n = __copy_user_intel_nocache(to, from, n);
31560 else
31561- __copy_user(to, from, n);
31562+ __copy_user(to, from, n, __copyuser_seg, "", "");
31563 #else
31564- __copy_user(to, from, n);
31565+ __copy_user(to, from, n, __copyuser_seg, "", "");
31566 #endif
31567 clac();
31568 return n;
31569 }
31570 EXPORT_SYMBOL(__copy_from_user_ll_nocache_nozero);
31571
31572-/**
31573- * copy_to_user: - Copy a block of data into user space.
31574- * @to: Destination address, in user space.
31575- * @from: Source address, in kernel space.
31576- * @n: Number of bytes to copy.
31577- *
31578- * Context: User context only. This function may sleep.
31579- *
31580- * Copy data from kernel space to user space.
31581- *
31582- * Returns number of bytes that could not be copied.
31583- * On success, this will be zero.
31584- */
31585-unsigned long _copy_to_user(void __user *to, const void *from, unsigned n)
31586+#ifdef CONFIG_PAX_MEMORY_UDEREF
31587+void __set_fs(mm_segment_t x)
31588 {
31589- if (access_ok(VERIFY_WRITE, to, n))
31590- n = __copy_to_user(to, from, n);
31591- return n;
31592+ switch (x.seg) {
31593+ case 0:
31594+ loadsegment(gs, 0);
31595+ break;
31596+ case TASK_SIZE_MAX:
31597+ loadsegment(gs, __USER_DS);
31598+ break;
31599+ case -1UL:
31600+ loadsegment(gs, __KERNEL_DS);
31601+ break;
31602+ default:
31603+ BUG();
31604+ }
31605 }
31606-EXPORT_SYMBOL(_copy_to_user);
31607+EXPORT_SYMBOL(__set_fs);
31608
31609-/**
31610- * copy_from_user: - Copy a block of data from user space.
31611- * @to: Destination address, in kernel space.
31612- * @from: Source address, in user space.
31613- * @n: Number of bytes to copy.
31614- *
31615- * Context: User context only. This function may sleep.
31616- *
31617- * Copy data from user space to kernel space.
31618- *
31619- * Returns number of bytes that could not be copied.
31620- * On success, this will be zero.
31621- *
31622- * If some data could not be copied, this function will pad the copied
31623- * data to the requested size using zero bytes.
31624- */
31625-unsigned long _copy_from_user(void *to, const void __user *from, unsigned n)
31626+void set_fs(mm_segment_t x)
31627 {
31628- if (access_ok(VERIFY_READ, from, n))
31629- n = __copy_from_user(to, from, n);
31630- else
31631- memset(to, 0, n);
31632- return n;
31633+ current_thread_info()->addr_limit = x;
31634+ __set_fs(x);
31635 }
31636-EXPORT_SYMBOL(_copy_from_user);
31637+EXPORT_SYMBOL(set_fs);
31638+#endif
31639diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
31640index 0a42327..1c3a136 100644
31641--- a/arch/x86/lib/usercopy_64.c
31642+++ b/arch/x86/lib/usercopy_64.c
31643@@ -18,6 +18,7 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31644 might_fault();
31645 /* no memory constraint because it doesn't change any memory gcc knows
31646 about */
31647+ pax_open_userland();
31648 stac();
31649 asm volatile(
31650 " testq %[size8],%[size8]\n"
31651@@ -39,9 +40,10 @@ unsigned long __clear_user(void __user *addr, unsigned long size)
31652 _ASM_EXTABLE(0b,3b)
31653 _ASM_EXTABLE(1b,2b)
31654 : [size8] "=&c"(size), [dst] "=&D" (__d0)
31655- : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(addr),
31656+ : [size1] "r"(size & 7), "[size8]" (size / 8), "[dst]"(____m(addr)),
31657 [zero] "r" (0UL), [eight] "r" (8UL));
31658 clac();
31659+ pax_close_userland();
31660 return size;
31661 }
31662 EXPORT_SYMBOL(__clear_user);
31663@@ -54,12 +56,11 @@ unsigned long clear_user(void __user *to, unsigned long n)
31664 }
31665 EXPORT_SYMBOL(clear_user);
31666
31667-unsigned long copy_in_user(void __user *to, const void __user *from, unsigned len)
31668+unsigned long copy_in_user(void __user *to, const void __user *from, unsigned long len)
31669 {
31670- if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len)) {
31671- return copy_user_generic((__force void *)to, (__force void *)from, len);
31672- }
31673- return len;
31674+ if (access_ok(VERIFY_WRITE, to, len) && access_ok(VERIFY_READ, from, len))
31675+ return copy_user_generic((void __force_kernel *)____m(to), (void __force_kernel *)____m(from), len);
31676+ return len;
31677 }
31678 EXPORT_SYMBOL(copy_in_user);
31679
31680@@ -69,8 +70,10 @@ EXPORT_SYMBOL(copy_in_user);
31681 * it is not necessary to optimize tail handling.
31682 */
31683 __visible unsigned long
31684-copy_user_handle_tail(char *to, char *from, unsigned len)
31685+copy_user_handle_tail(char __user *to, char __user *from, unsigned long len)
31686 {
31687+ clac();
31688+ pax_close_userland();
31689 for (; len; --len, to++) {
31690 char c;
31691
31692@@ -79,7 +82,6 @@ copy_user_handle_tail(char *to, char *from, unsigned len)
31693 if (__put_user_nocheck(c, to, sizeof(char)))
31694 break;
31695 }
31696- clac();
31697
31698 /* If the destination is a kernel buffer, we always clear the end */
31699 if (!__addr_ok(to))
31700diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile
31701index c4cc740..60a7362 100644
31702--- a/arch/x86/mm/Makefile
31703+++ b/arch/x86/mm/Makefile
31704@@ -35,3 +35,7 @@ obj-$(CONFIG_NUMA_EMU) += numa_emulation.o
31705 obj-$(CONFIG_MEMTEST) += memtest.o
31706
31707 obj-$(CONFIG_X86_INTEL_MPX) += mpx.o
31708+
31709+quote:="
31710+obj-$(CONFIG_X86_64) += uderef_64.o
31711+CFLAGS_uderef_64.o := $(subst $(quote),,$(CONFIG_ARCH_HWEIGHT_CFLAGS))
31712diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c
31713index 903ec1e..c4166b2 100644
31714--- a/arch/x86/mm/extable.c
31715+++ b/arch/x86/mm/extable.c
31716@@ -6,12 +6,24 @@
31717 static inline unsigned long
31718 ex_insn_addr(const struct exception_table_entry *x)
31719 {
31720- return (unsigned long)&x->insn + x->insn;
31721+ unsigned long reloc = 0;
31722+
31723+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31724+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31725+#endif
31726+
31727+ return (unsigned long)&x->insn + x->insn + reloc;
31728 }
31729 static inline unsigned long
31730 ex_fixup_addr(const struct exception_table_entry *x)
31731 {
31732- return (unsigned long)&x->fixup + x->fixup;
31733+ unsigned long reloc = 0;
31734+
31735+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31736+ reloc = ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31737+#endif
31738+
31739+ return (unsigned long)&x->fixup + x->fixup + reloc;
31740 }
31741
31742 int fixup_exception(struct pt_regs *regs)
31743@@ -20,7 +32,7 @@ int fixup_exception(struct pt_regs *regs)
31744 unsigned long new_ip;
31745
31746 #ifdef CONFIG_PNPBIOS
31747- if (unlikely(SEGMENT_IS_PNP_CODE(regs->cs))) {
31748+ if (unlikely(!v8086_mode(regs) && SEGMENT_IS_PNP_CODE(regs->cs))) {
31749 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
31750 extern u32 pnp_bios_is_utter_crap;
31751 pnp_bios_is_utter_crap = 1;
31752@@ -145,6 +157,13 @@ void sort_extable(struct exception_table_entry *start,
31753 i += 4;
31754 p->fixup -= i;
31755 i += 4;
31756+
31757+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
31758+ BUILD_BUG_ON(!IS_ENABLED(CONFIG_BUILDTIME_EXTABLE_SORT));
31759+ p->insn -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31760+ p->fixup -= ____LOAD_PHYSICAL_ADDR - LOAD_PHYSICAL_ADDR;
31761+#endif
31762+
31763 }
31764 }
31765
31766diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
31767index ede025f..380466b 100644
31768--- a/arch/x86/mm/fault.c
31769+++ b/arch/x86/mm/fault.c
31770@@ -13,12 +13,19 @@
31771 #include <linux/hugetlb.h> /* hstate_index_to_shift */
31772 #include <linux/prefetch.h> /* prefetchw */
31773 #include <linux/context_tracking.h> /* exception_enter(), ... */
31774+#include <linux/unistd.h>
31775+#include <linux/compiler.h>
31776
31777 #include <asm/traps.h> /* dotraplinkage, ... */
31778 #include <asm/pgalloc.h> /* pgd_*(), ... */
31779 #include <asm/kmemcheck.h> /* kmemcheck_*(), ... */
31780 #include <asm/fixmap.h> /* VSYSCALL_ADDR */
31781 #include <asm/vsyscall.h> /* emulate_vsyscall */
31782+#include <asm/tlbflush.h>
31783+
31784+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
31785+#include <asm/stacktrace.h>
31786+#endif
31787
31788 #define CREATE_TRACE_POINTS
31789 #include <asm/trace/exceptions.h>
31790@@ -59,7 +66,7 @@ static nokprobe_inline int kprobes_fault(struct pt_regs *regs)
31791 int ret = 0;
31792
31793 /* kprobe_running() needs smp_processor_id() */
31794- if (kprobes_built_in() && !user_mode_vm(regs)) {
31795+ if (kprobes_built_in() && !user_mode(regs)) {
31796 preempt_disable();
31797 if (kprobe_running() && kprobe_fault_handler(regs, 14))
31798 ret = 1;
31799@@ -120,7 +127,10 @@ check_prefetch_opcode(struct pt_regs *regs, unsigned char *instr,
31800 return !instr_lo || (instr_lo>>1) == 1;
31801 case 0x00:
31802 /* Prefetch instruction is 0x0F0D or 0x0F18 */
31803- if (probe_kernel_address(instr, opcode))
31804+ if (user_mode(regs)) {
31805+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31806+ return 0;
31807+ } else if (probe_kernel_address(instr, opcode))
31808 return 0;
31809
31810 *prefetch = (instr_lo == 0xF) &&
31811@@ -154,7 +164,10 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr)
31812 while (instr < max_instr) {
31813 unsigned char opcode;
31814
31815- if (probe_kernel_address(instr, opcode))
31816+ if (user_mode(regs)) {
31817+ if (__copy_from_user_inatomic(&opcode, (unsigned char __force_user *)(instr), 1))
31818+ break;
31819+ } else if (probe_kernel_address(instr, opcode))
31820 break;
31821
31822 instr++;
31823@@ -185,6 +198,34 @@ force_sig_info_fault(int si_signo, int si_code, unsigned long address,
31824 force_sig_info(si_signo, &info, tsk);
31825 }
31826
31827+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
31828+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address);
31829+#endif
31830+
31831+#ifdef CONFIG_PAX_EMUTRAMP
31832+static int pax_handle_fetch_fault(struct pt_regs *regs);
31833+#endif
31834+
31835+#ifdef CONFIG_PAX_PAGEEXEC
31836+static inline pmd_t * pax_get_pmd(struct mm_struct *mm, unsigned long address)
31837+{
31838+ pgd_t *pgd;
31839+ pud_t *pud;
31840+ pmd_t *pmd;
31841+
31842+ pgd = pgd_offset(mm, address);
31843+ if (!pgd_present(*pgd))
31844+ return NULL;
31845+ pud = pud_offset(pgd, address);
31846+ if (!pud_present(*pud))
31847+ return NULL;
31848+ pmd = pmd_offset(pud, address);
31849+ if (!pmd_present(*pmd))
31850+ return NULL;
31851+ return pmd;
31852+}
31853+#endif
31854+
31855 DEFINE_SPINLOCK(pgd_lock);
31856 LIST_HEAD(pgd_list);
31857
31858@@ -235,10 +276,27 @@ void vmalloc_sync_all(void)
31859 for (address = VMALLOC_START & PMD_MASK;
31860 address >= TASK_SIZE && address < FIXADDR_TOP;
31861 address += PMD_SIZE) {
31862+
31863+#ifdef CONFIG_PAX_PER_CPU_PGD
31864+ unsigned long cpu;
31865+#else
31866 struct page *page;
31867+#endif
31868
31869 spin_lock(&pgd_lock);
31870+
31871+#ifdef CONFIG_PAX_PER_CPU_PGD
31872+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
31873+ pgd_t *pgd = get_cpu_pgd(cpu, user);
31874+ pmd_t *ret;
31875+
31876+ ret = vmalloc_sync_one(pgd, address);
31877+ if (!ret)
31878+ break;
31879+ pgd = get_cpu_pgd(cpu, kernel);
31880+#else
31881 list_for_each_entry(page, &pgd_list, lru) {
31882+ pgd_t *pgd;
31883 spinlock_t *pgt_lock;
31884 pmd_t *ret;
31885
31886@@ -246,8 +304,14 @@ void vmalloc_sync_all(void)
31887 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
31888
31889 spin_lock(pgt_lock);
31890- ret = vmalloc_sync_one(page_address(page), address);
31891+ pgd = page_address(page);
31892+#endif
31893+
31894+ ret = vmalloc_sync_one(pgd, address);
31895+
31896+#ifndef CONFIG_PAX_PER_CPU_PGD
31897 spin_unlock(pgt_lock);
31898+#endif
31899
31900 if (!ret)
31901 break;
31902@@ -281,6 +345,12 @@ static noinline int vmalloc_fault(unsigned long address)
31903 * an interrupt in the middle of a task switch..
31904 */
31905 pgd_paddr = read_cr3();
31906+
31907+#ifdef CONFIG_PAX_PER_CPU_PGD
31908+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (pgd_paddr & __PHYSICAL_MASK));
31909+ vmalloc_sync_one(__va(pgd_paddr + PAGE_SIZE), address);
31910+#endif
31911+
31912 pmd_k = vmalloc_sync_one(__va(pgd_paddr), address);
31913 if (!pmd_k)
31914 return -1;
31915@@ -377,11 +447,25 @@ static noinline int vmalloc_fault(unsigned long address)
31916 * happen within a race in page table update. In the later
31917 * case just flush:
31918 */
31919- pgd = pgd_offset(current->active_mm, address);
31920+
31921 pgd_ref = pgd_offset_k(address);
31922 if (pgd_none(*pgd_ref))
31923 return -1;
31924
31925+#ifdef CONFIG_PAX_PER_CPU_PGD
31926+ BUG_ON(__pa(get_cpu_pgd(smp_processor_id(), kernel)) != (read_cr3() & __PHYSICAL_MASK));
31927+ pgd = pgd_offset_cpu(smp_processor_id(), user, address);
31928+ if (pgd_none(*pgd)) {
31929+ set_pgd(pgd, *pgd_ref);
31930+ arch_flush_lazy_mmu_mode();
31931+ } else {
31932+ BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));
31933+ }
31934+ pgd = pgd_offset_cpu(smp_processor_id(), kernel, address);
31935+#else
31936+ pgd = pgd_offset(current->active_mm, address);
31937+#endif
31938+
31939 if (pgd_none(*pgd)) {
31940 set_pgd(pgd, *pgd_ref);
31941 arch_flush_lazy_mmu_mode();
31942@@ -548,7 +632,7 @@ static int is_errata93(struct pt_regs *regs, unsigned long address)
31943 static int is_errata100(struct pt_regs *regs, unsigned long address)
31944 {
31945 #ifdef CONFIG_X86_64
31946- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32))
31947+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32))
31948 return 1;
31949 #endif
31950 return 0;
31951@@ -575,9 +659,9 @@ static int is_f00f_bug(struct pt_regs *regs, unsigned long address)
31952 }
31953
31954 static const char nx_warning[] = KERN_CRIT
31955-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n";
31956+"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n";
31957 static const char smep_warning[] = KERN_CRIT
31958-"unable to execute userspace code (SMEP?) (uid: %d)\n";
31959+"unable to execute userspace code (SMEP?) (uid: %d, task: %s, pid: %d)\n";
31960
31961 static void
31962 show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31963@@ -586,7 +670,7 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31964 if (!oops_may_print())
31965 return;
31966
31967- if (error_code & PF_INSTR) {
31968+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR)) {
31969 unsigned int level;
31970 pgd_t *pgd;
31971 pte_t *pte;
31972@@ -597,13 +681,25 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
31973 pte = lookup_address_in_pgd(pgd, address, &level);
31974
31975 if (pte && pte_present(*pte) && !pte_exec(*pte))
31976- printk(nx_warning, from_kuid(&init_user_ns, current_uid()));
31977+ printk(nx_warning, from_kuid_munged(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31978 if (pte && pte_present(*pte) && pte_exec(*pte) &&
31979 (pgd_flags(*pgd) & _PAGE_USER) &&
31980 (__read_cr4() & X86_CR4_SMEP))
31981- printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
31982+ printk(smep_warning, from_kuid(&init_user_ns, current_uid()), current->comm, task_pid_nr(current));
31983 }
31984
31985+#ifdef CONFIG_PAX_KERNEXEC
31986+ if (init_mm.start_code <= address && address < init_mm.end_code) {
31987+ if (current->signal->curr_ip)
31988+ printk(KERN_ERR "PAX: From %pI4: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n",
31989+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
31990+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31991+ else
31992+ printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", current->comm, task_pid_nr(current),
31993+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
31994+ }
31995+#endif
31996+
31997 printk(KERN_ALERT "BUG: unable to handle kernel ");
31998 if (address < PAGE_SIZE)
31999 printk(KERN_CONT "NULL pointer dereference");
32000@@ -782,6 +878,22 @@ __bad_area_nosemaphore(struct pt_regs *regs, unsigned long error_code,
32001 return;
32002 }
32003 #endif
32004+
32005+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32006+ if (pax_is_fetch_fault(regs, error_code, address)) {
32007+
32008+#ifdef CONFIG_PAX_EMUTRAMP
32009+ switch (pax_handle_fetch_fault(regs)) {
32010+ case 2:
32011+ return;
32012+ }
32013+#endif
32014+
32015+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32016+ do_group_exit(SIGKILL);
32017+ }
32018+#endif
32019+
32020 /* Kernel addresses are always protection faults: */
32021 if (address >= TASK_SIZE)
32022 error_code |= PF_PROT;
32023@@ -864,7 +976,7 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
32024 if (fault & (VM_FAULT_HWPOISON|VM_FAULT_HWPOISON_LARGE)) {
32025 printk(KERN_ERR
32026 "MCE: Killing %s:%d due to hardware memory corruption fault at %lx\n",
32027- tsk->comm, tsk->pid, address);
32028+ tsk->comm, task_pid_nr(tsk), address);
32029 code = BUS_MCEERR_AR;
32030 }
32031 #endif
32032@@ -916,6 +1028,99 @@ static int spurious_fault_check(unsigned long error_code, pte_t *pte)
32033 return 1;
32034 }
32035
32036+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32037+static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code)
32038+{
32039+ pte_t *pte;
32040+ pmd_t *pmd;
32041+ spinlock_t *ptl;
32042+ unsigned char pte_mask;
32043+
32044+ if ((__supported_pte_mask & _PAGE_NX) || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) ||
32045+ !(mm->pax_flags & MF_PAX_PAGEEXEC))
32046+ return 0;
32047+
32048+ /* PaX: it's our fault, let's handle it if we can */
32049+
32050+ /* PaX: take a look at read faults before acquiring any locks */
32051+ if (unlikely(!(error_code & PF_WRITE) && (regs->ip == address))) {
32052+ /* instruction fetch attempt from a protected page in user mode */
32053+ up_read(&mm->mmap_sem);
32054+
32055+#ifdef CONFIG_PAX_EMUTRAMP
32056+ switch (pax_handle_fetch_fault(regs)) {
32057+ case 2:
32058+ return 1;
32059+ }
32060+#endif
32061+
32062+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp);
32063+ do_group_exit(SIGKILL);
32064+ }
32065+
32066+ pmd = pax_get_pmd(mm, address);
32067+ if (unlikely(!pmd))
32068+ return 0;
32069+
32070+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
32071+ if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) {
32072+ pte_unmap_unlock(pte, ptl);
32073+ return 0;
32074+ }
32075+
32076+ if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) {
32077+ /* write attempt to a protected page in user mode */
32078+ pte_unmap_unlock(pte, ptl);
32079+ return 0;
32080+ }
32081+
32082+#ifdef CONFIG_SMP
32083+ if (likely(address > get_limit(regs->cs) && cpu_isset(smp_processor_id(), mm->context.cpu_user_cs_mask)))
32084+#else
32085+ if (likely(address > get_limit(regs->cs)))
32086+#endif
32087+ {
32088+ set_pte(pte, pte_mkread(*pte));
32089+ __flush_tlb_one(address);
32090+ pte_unmap_unlock(pte, ptl);
32091+ up_read(&mm->mmap_sem);
32092+ return 1;
32093+ }
32094+
32095+ pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1));
32096+
32097+ /*
32098+ * PaX: fill DTLB with user rights and retry
32099+ */
32100+ __asm__ __volatile__ (
32101+ "orb %2,(%1)\n"
32102+#if defined(CONFIG_M586) || defined(CONFIG_M586TSC)
32103+/*
32104+ * PaX: let this uncommented 'invlpg' remind us on the behaviour of Intel's
32105+ * (and AMD's) TLBs. namely, they do not cache PTEs that would raise *any*
32106+ * page fault when examined during a TLB load attempt. this is true not only
32107+ * for PTEs holding a non-present entry but also present entries that will
32108+ * raise a page fault (such as those set up by PaX, or the copy-on-write
32109+ * mechanism). in effect it means that we do *not* need to flush the TLBs
32110+ * for our target pages since their PTEs are simply not in the TLBs at all.
32111+
32112+ * the best thing in omitting it is that we gain around 15-20% speed in the
32113+ * fast path of the page fault handler and can get rid of tracing since we
32114+ * can no longer flush unintended entries.
32115+ */
32116+ "invlpg (%0)\n"
32117+#endif
32118+ __copyuser_seg"testb $0,(%0)\n"
32119+ "xorb %3,(%1)\n"
32120+ :
32121+ : "r" (address), "r" (pte), "q" (pte_mask), "i" (_PAGE_USER)
32122+ : "memory", "cc");
32123+ pte_unmap_unlock(pte, ptl);
32124+ up_read(&mm->mmap_sem);
32125+ return 1;
32126+}
32127+#endif
32128+
32129 /*
32130 * Handle a spurious fault caused by a stale TLB entry.
32131 *
32132@@ -1001,6 +1206,9 @@ int show_unhandled_signals = 1;
32133 static inline int
32134 access_error(unsigned long error_code, struct vm_area_struct *vma)
32135 {
32136+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC))
32137+ return 1;
32138+
32139 if (error_code & PF_WRITE) {
32140 /* write, present and write, not present: */
32141 if (unlikely(!(vma->vm_flags & VM_WRITE)))
32142@@ -1035,7 +1243,7 @@ static inline bool smap_violation(int error_code, struct pt_regs *regs)
32143 if (error_code & PF_USER)
32144 return false;
32145
32146- if (!user_mode_vm(regs) && (regs->flags & X86_EFLAGS_AC))
32147+ if (!user_mode(regs) && (regs->flags & X86_EFLAGS_AC))
32148 return false;
32149
32150 return true;
32151@@ -1063,6 +1271,22 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32152 tsk = current;
32153 mm = tsk->mm;
32154
32155+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
32156+ if (!user_mode(regs) && address < 2 * pax_user_shadow_base) {
32157+ if (!search_exception_tables(regs->ip)) {
32158+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32159+ bad_area_nosemaphore(regs, error_code, address);
32160+ return;
32161+ }
32162+ if (address < pax_user_shadow_base) {
32163+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
32164+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
32165+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
32166+ } else
32167+ address -= pax_user_shadow_base;
32168+ }
32169+#endif
32170+
32171 /*
32172 * Detect and handle instructions that would cause a page fault for
32173 * both a tracked kernel page and a userspace page.
32174@@ -1140,7 +1364,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code,
32175 * User-mode registers count as a user access even for any
32176 * potential system fault or CPU buglet:
32177 */
32178- if (user_mode_vm(regs)) {
32179+ if (user_mode(regs)) {
32180 local_irq_enable();
32181 error_code |= PF_USER;
32182 flags |= FAULT_FLAG_USER;
32183@@ -1187,6 +1411,11 @@ retry:
32184 might_sleep();
32185 }
32186
32187+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC)
32188+ if (pax_handle_pageexec_fault(regs, mm, address, error_code))
32189+ return;
32190+#endif
32191+
32192 vma = find_vma(mm, address);
32193 if (unlikely(!vma)) {
32194 bad_area(regs, error_code, address);
32195@@ -1198,18 +1427,24 @@ retry:
32196 bad_area(regs, error_code, address);
32197 return;
32198 }
32199- if (error_code & PF_USER) {
32200- /*
32201- * Accessing the stack below %sp is always a bug.
32202- * The large cushion allows instructions like enter
32203- * and pusha to work. ("enter $65535, $31" pushes
32204- * 32 pointers and then decrements %sp by 65535.)
32205- */
32206- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) {
32207- bad_area(regs, error_code, address);
32208- return;
32209- }
32210+ /*
32211+ * Accessing the stack below %sp is always a bug.
32212+ * The large cushion allows instructions like enter
32213+ * and pusha to work. ("enter $65535, $31" pushes
32214+ * 32 pointers and then decrements %sp by 65535.)
32215+ */
32216+ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) {
32217+ bad_area(regs, error_code, address);
32218+ return;
32219 }
32220+
32221+#ifdef CONFIG_PAX_SEGMEXEC
32222+ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) {
32223+ bad_area(regs, error_code, address);
32224+ return;
32225+ }
32226+#endif
32227+
32228 if (unlikely(expand_stack(vma, address))) {
32229 bad_area(regs, error_code, address);
32230 return;
32231@@ -1329,3 +1564,292 @@ trace_do_page_fault(struct pt_regs *regs, unsigned long error_code)
32232 }
32233 NOKPROBE_SYMBOL(trace_do_page_fault);
32234 #endif /* CONFIG_TRACING */
32235+
32236+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32237+static bool pax_is_fetch_fault(struct pt_regs *regs, unsigned long error_code, unsigned long address)
32238+{
32239+ struct mm_struct *mm = current->mm;
32240+ unsigned long ip = regs->ip;
32241+
32242+ if (v8086_mode(regs))
32243+ ip = ((regs->cs & 0xffff) << 4) + (ip & 0xffff);
32244+
32245+#ifdef CONFIG_PAX_PAGEEXEC
32246+ if (mm->pax_flags & MF_PAX_PAGEEXEC) {
32247+ if ((__supported_pte_mask & _PAGE_NX) && (error_code & PF_INSTR))
32248+ return true;
32249+ if (!(error_code & (PF_PROT | PF_WRITE)) && ip == address)
32250+ return true;
32251+ return false;
32252+ }
32253+#endif
32254+
32255+#ifdef CONFIG_PAX_SEGMEXEC
32256+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
32257+ if (!(error_code & (PF_PROT | PF_WRITE)) && (ip + SEGMEXEC_TASK_SIZE == address))
32258+ return true;
32259+ return false;
32260+ }
32261+#endif
32262+
32263+ return false;
32264+}
32265+#endif
32266+
32267+#ifdef CONFIG_PAX_EMUTRAMP
32268+static int pax_handle_fetch_fault_32(struct pt_regs *regs)
32269+{
32270+ int err;
32271+
32272+ do { /* PaX: libffi trampoline emulation */
32273+ unsigned char mov, jmp;
32274+ unsigned int addr1, addr2;
32275+
32276+#ifdef CONFIG_X86_64
32277+ if ((regs->ip + 9) >> 32)
32278+ break;
32279+#endif
32280+
32281+ err = get_user(mov, (unsigned char __user *)regs->ip);
32282+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32283+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32284+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32285+
32286+ if (err)
32287+ break;
32288+
32289+ if (mov == 0xB8 && jmp == 0xE9) {
32290+ regs->ax = addr1;
32291+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32292+ return 2;
32293+ }
32294+ } while (0);
32295+
32296+ do { /* PaX: gcc trampoline emulation #1 */
32297+ unsigned char mov1, mov2;
32298+ unsigned short jmp;
32299+ unsigned int addr1, addr2;
32300+
32301+#ifdef CONFIG_X86_64
32302+ if ((regs->ip + 11) >> 32)
32303+ break;
32304+#endif
32305+
32306+ err = get_user(mov1, (unsigned char __user *)regs->ip);
32307+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32308+ err |= get_user(mov2, (unsigned char __user *)(regs->ip + 5));
32309+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32310+ err |= get_user(jmp, (unsigned short __user *)(regs->ip + 10));
32311+
32312+ if (err)
32313+ break;
32314+
32315+ if (mov1 == 0xB9 && mov2 == 0xB8 && jmp == 0xE0FF) {
32316+ regs->cx = addr1;
32317+ regs->ax = addr2;
32318+ regs->ip = addr2;
32319+ return 2;
32320+ }
32321+ } while (0);
32322+
32323+ do { /* PaX: gcc trampoline emulation #2 */
32324+ unsigned char mov, jmp;
32325+ unsigned int addr1, addr2;
32326+
32327+#ifdef CONFIG_X86_64
32328+ if ((regs->ip + 9) >> 32)
32329+ break;
32330+#endif
32331+
32332+ err = get_user(mov, (unsigned char __user *)regs->ip);
32333+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 1));
32334+ err |= get_user(jmp, (unsigned char __user *)(regs->ip + 5));
32335+ err |= get_user(addr2, (unsigned int __user *)(regs->ip + 6));
32336+
32337+ if (err)
32338+ break;
32339+
32340+ if (mov == 0xB9 && jmp == 0xE9) {
32341+ regs->cx = addr1;
32342+ regs->ip = (unsigned int)(regs->ip + addr2 + 10);
32343+ return 2;
32344+ }
32345+ } while (0);
32346+
32347+ return 1; /* PaX in action */
32348+}
32349+
32350+#ifdef CONFIG_X86_64
32351+static int pax_handle_fetch_fault_64(struct pt_regs *regs)
32352+{
32353+ int err;
32354+
32355+ do { /* PaX: libffi trampoline emulation */
32356+ unsigned short mov1, mov2, jmp1;
32357+ unsigned char stcclc, jmp2;
32358+ unsigned long addr1, addr2;
32359+
32360+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32361+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32362+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32363+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32364+ err |= get_user(stcclc, (unsigned char __user *)(regs->ip + 20));
32365+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 21));
32366+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 23));
32367+
32368+ if (err)
32369+ break;
32370+
32371+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && (stcclc == 0xF8 || stcclc == 0xF9) && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32372+ regs->r11 = addr1;
32373+ regs->r10 = addr2;
32374+ if (stcclc == 0xF8)
32375+ regs->flags &= ~X86_EFLAGS_CF;
32376+ else
32377+ regs->flags |= X86_EFLAGS_CF;
32378+ regs->ip = addr1;
32379+ return 2;
32380+ }
32381+ } while (0);
32382+
32383+ do { /* PaX: gcc trampoline emulation #1 */
32384+ unsigned short mov1, mov2, jmp1;
32385+ unsigned char jmp2;
32386+ unsigned int addr1;
32387+ unsigned long addr2;
32388+
32389+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32390+ err |= get_user(addr1, (unsigned int __user *)(regs->ip + 2));
32391+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 6));
32392+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 8));
32393+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 16));
32394+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 18));
32395+
32396+ if (err)
32397+ break;
32398+
32399+ if (mov1 == 0xBB41 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32400+ regs->r11 = addr1;
32401+ regs->r10 = addr2;
32402+ regs->ip = addr1;
32403+ return 2;
32404+ }
32405+ } while (0);
32406+
32407+ do { /* PaX: gcc trampoline emulation #2 */
32408+ unsigned short mov1, mov2, jmp1;
32409+ unsigned char jmp2;
32410+ unsigned long addr1, addr2;
32411+
32412+ err = get_user(mov1, (unsigned short __user *)regs->ip);
32413+ err |= get_user(addr1, (unsigned long __user *)(regs->ip + 2));
32414+ err |= get_user(mov2, (unsigned short __user *)(regs->ip + 10));
32415+ err |= get_user(addr2, (unsigned long __user *)(regs->ip + 12));
32416+ err |= get_user(jmp1, (unsigned short __user *)(regs->ip + 20));
32417+ err |= get_user(jmp2, (unsigned char __user *)(regs->ip + 22));
32418+
32419+ if (err)
32420+ break;
32421+
32422+ if (mov1 == 0xBB49 && mov2 == 0xBA49 && jmp1 == 0xFF49 && jmp2 == 0xE3) {
32423+ regs->r11 = addr1;
32424+ regs->r10 = addr2;
32425+ regs->ip = addr1;
32426+ return 2;
32427+ }
32428+ } while (0);
32429+
32430+ return 1; /* PaX in action */
32431+}
32432+#endif
32433+
32434+/*
32435+ * PaX: decide what to do with offenders (regs->ip = fault address)
32436+ *
32437+ * returns 1 when task should be killed
32438+ * 2 when gcc trampoline was detected
32439+ */
32440+static int pax_handle_fetch_fault(struct pt_regs *regs)
32441+{
32442+ if (v8086_mode(regs))
32443+ return 1;
32444+
32445+ if (!(current->mm->pax_flags & MF_PAX_EMUTRAMP))
32446+ return 1;
32447+
32448+#ifdef CONFIG_X86_32
32449+ return pax_handle_fetch_fault_32(regs);
32450+#else
32451+ if (regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))
32452+ return pax_handle_fetch_fault_32(regs);
32453+ else
32454+ return pax_handle_fetch_fault_64(regs);
32455+#endif
32456+}
32457+#endif
32458+
32459+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32460+void pax_report_insns(struct pt_regs *regs, void *pc, void *sp)
32461+{
32462+ long i;
32463+
32464+ printk(KERN_ERR "PAX: bytes at PC: ");
32465+ for (i = 0; i < 20; i++) {
32466+ unsigned char c;
32467+ if (get_user(c, (unsigned char __force_user *)pc+i))
32468+ printk(KERN_CONT "?? ");
32469+ else
32470+ printk(KERN_CONT "%02x ", c);
32471+ }
32472+ printk("\n");
32473+
32474+ printk(KERN_ERR "PAX: bytes at SP-%lu: ", (unsigned long)sizeof(long));
32475+ for (i = -1; i < 80 / (long)sizeof(long); i++) {
32476+ unsigned long c;
32477+ if (get_user(c, (unsigned long __force_user *)sp+i)) {
32478+#ifdef CONFIG_X86_32
32479+ printk(KERN_CONT "???????? ");
32480+#else
32481+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)))
32482+ printk(KERN_CONT "???????? ???????? ");
32483+ else
32484+ printk(KERN_CONT "???????????????? ");
32485+#endif
32486+ } else {
32487+#ifdef CONFIG_X86_64
32488+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT))) {
32489+ printk(KERN_CONT "%08x ", (unsigned int)c);
32490+ printk(KERN_CONT "%08x ", (unsigned int)(c >> 32));
32491+ } else
32492+#endif
32493+ printk(KERN_CONT "%0*lx ", 2 * (int)sizeof(long), c);
32494+ }
32495+ }
32496+ printk("\n");
32497+}
32498+#endif
32499+
32500+/**
32501+ * probe_kernel_write(): safely attempt to write to a location
32502+ * @dst: address to write to
32503+ * @src: pointer to the data that shall be written
32504+ * @size: size of the data chunk
32505+ *
32506+ * Safely write to address @dst from the buffer at @src. If a kernel fault
32507+ * happens, handle that and return -EFAULT.
32508+ */
32509+long notrace probe_kernel_write(void *dst, const void *src, size_t size)
32510+{
32511+ long ret;
32512+ mm_segment_t old_fs = get_fs();
32513+
32514+ set_fs(KERNEL_DS);
32515+ pagefault_disable();
32516+ pax_open_kernel();
32517+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
32518+ pax_close_kernel();
32519+ pagefault_enable();
32520+ set_fs(old_fs);
32521+
32522+ return ret ? -EFAULT : 0;
32523+}
32524diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c
32525index 81bf3d2..7ef25c2 100644
32526--- a/arch/x86/mm/gup.c
32527+++ b/arch/x86/mm/gup.c
32528@@ -268,7 +268,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
32529 addr = start;
32530 len = (unsigned long) nr_pages << PAGE_SHIFT;
32531 end = start + len;
32532- if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
32533+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32534 (void __user *)start, len)))
32535 return 0;
32536
32537@@ -344,6 +344,10 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
32538 goto slow_irqon;
32539 #endif
32540
32541+ if (unlikely(!access_ok_noprefault(write ? VERIFY_WRITE : VERIFY_READ,
32542+ (void __user *)start, len)))
32543+ return 0;
32544+
32545 /*
32546 * XXX: batch / limit 'nr', to avoid large irq off latency
32547 * needs some instrumenting to determine the common sizes used by
32548diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
32549index 4500142..53a363c 100644
32550--- a/arch/x86/mm/highmem_32.c
32551+++ b/arch/x86/mm/highmem_32.c
32552@@ -45,7 +45,11 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
32553 idx = type + KM_TYPE_NR*smp_processor_id();
32554 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
32555 BUG_ON(!pte_none(*(kmap_pte-idx)));
32556+
32557+ pax_open_kernel();
32558 set_pte(kmap_pte-idx, mk_pte(page, prot));
32559+ pax_close_kernel();
32560+
32561 arch_flush_lazy_mmu_mode();
32562
32563 return (void *)vaddr;
32564diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
32565index 42982b2..7168fc3 100644
32566--- a/arch/x86/mm/hugetlbpage.c
32567+++ b/arch/x86/mm/hugetlbpage.c
32568@@ -74,23 +74,24 @@ int pud_huge(pud_t pud)
32569 #ifdef CONFIG_HUGETLB_PAGE
32570 static unsigned long hugetlb_get_unmapped_area_bottomup(struct file *file,
32571 unsigned long addr, unsigned long len,
32572- unsigned long pgoff, unsigned long flags)
32573+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32574 {
32575 struct hstate *h = hstate_file(file);
32576 struct vm_unmapped_area_info info;
32577-
32578+
32579 info.flags = 0;
32580 info.length = len;
32581 info.low_limit = current->mm->mmap_legacy_base;
32582 info.high_limit = TASK_SIZE;
32583 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32584 info.align_offset = 0;
32585+ info.threadstack_offset = offset;
32586 return vm_unmapped_area(&info);
32587 }
32588
32589 static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32590 unsigned long addr0, unsigned long len,
32591- unsigned long pgoff, unsigned long flags)
32592+ unsigned long pgoff, unsigned long flags, unsigned long offset)
32593 {
32594 struct hstate *h = hstate_file(file);
32595 struct vm_unmapped_area_info info;
32596@@ -102,6 +103,7 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32597 info.high_limit = current->mm->mmap_base;
32598 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
32599 info.align_offset = 0;
32600+ info.threadstack_offset = offset;
32601 addr = vm_unmapped_area(&info);
32602
32603 /*
32604@@ -114,6 +116,12 @@ static unsigned long hugetlb_get_unmapped_area_topdown(struct file *file,
32605 VM_BUG_ON(addr != -ENOMEM);
32606 info.flags = 0;
32607 info.low_limit = TASK_UNMAPPED_BASE;
32608+
32609+#ifdef CONFIG_PAX_RANDMMAP
32610+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
32611+ info.low_limit += current->mm->delta_mmap;
32612+#endif
32613+
32614 info.high_limit = TASK_SIZE;
32615 addr = vm_unmapped_area(&info);
32616 }
32617@@ -128,10 +136,20 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32618 struct hstate *h = hstate_file(file);
32619 struct mm_struct *mm = current->mm;
32620 struct vm_area_struct *vma;
32621+ unsigned long pax_task_size = TASK_SIZE;
32622+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
32623
32624 if (len & ~huge_page_mask(h))
32625 return -EINVAL;
32626- if (len > TASK_SIZE)
32627+
32628+#ifdef CONFIG_PAX_SEGMEXEC
32629+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
32630+ pax_task_size = SEGMEXEC_TASK_SIZE;
32631+#endif
32632+
32633+ pax_task_size -= PAGE_SIZE;
32634+
32635+ if (len > pax_task_size)
32636 return -ENOMEM;
32637
32638 if (flags & MAP_FIXED) {
32639@@ -140,19 +158,22 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
32640 return addr;
32641 }
32642
32643+#ifdef CONFIG_PAX_RANDMMAP
32644+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
32645+#endif
32646+
32647 if (addr) {
32648 addr = ALIGN(addr, huge_page_size(h));
32649 vma = find_vma(mm, addr);
32650- if (TASK_SIZE - len >= addr &&
32651- (!vma || addr + len <= vma->vm_start))
32652+ if (pax_task_size - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
32653 return addr;
32654 }
32655 if (mm->get_unmapped_area == arch_get_unmapped_area)
32656 return hugetlb_get_unmapped_area_bottomup(file, addr, len,
32657- pgoff, flags);
32658+ pgoff, flags, offset);
32659 else
32660 return hugetlb_get_unmapped_area_topdown(file, addr, len,
32661- pgoff, flags);
32662+ pgoff, flags, offset);
32663 }
32664 #endif /* CONFIG_HUGETLB_PAGE */
32665
32666diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
32667index a110efc..a31a18f 100644
32668--- a/arch/x86/mm/init.c
32669+++ b/arch/x86/mm/init.c
32670@@ -4,6 +4,7 @@
32671 #include <linux/swap.h>
32672 #include <linux/memblock.h>
32673 #include <linux/bootmem.h> /* for max_low_pfn */
32674+#include <linux/tboot.h>
32675
32676 #include <asm/cacheflush.h>
32677 #include <asm/e820.h>
32678@@ -17,6 +18,8 @@
32679 #include <asm/proto.h>
32680 #include <asm/dma.h> /* for MAX_DMA_PFN */
32681 #include <asm/microcode.h>
32682+#include <asm/desc.h>
32683+#include <asm/bios_ebda.h>
32684
32685 /*
32686 * We need to define the tracepoints somewhere, and tlb.c
32687@@ -620,7 +623,18 @@ void __init init_mem_mapping(void)
32688 early_ioremap_page_table_range_init();
32689 #endif
32690
32691+#ifdef CONFIG_PAX_PER_CPU_PGD
32692+ clone_pgd_range(get_cpu_pgd(0, kernel) + KERNEL_PGD_BOUNDARY,
32693+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32694+ KERNEL_PGD_PTRS);
32695+ clone_pgd_range(get_cpu_pgd(0, user) + KERNEL_PGD_BOUNDARY,
32696+ swapper_pg_dir + KERNEL_PGD_BOUNDARY,
32697+ KERNEL_PGD_PTRS);
32698+ load_cr3(get_cpu_pgd(0, kernel));
32699+#else
32700 load_cr3(swapper_pg_dir);
32701+#endif
32702+
32703 __flush_tlb_all();
32704
32705 early_memtest(0, max_pfn_mapped << PAGE_SHIFT);
32706@@ -636,10 +650,40 @@ void __init init_mem_mapping(void)
32707 * Access has to be given to non-kernel-ram areas as well, these contain the PCI
32708 * mmio resources as well as potential bios/acpi data regions.
32709 */
32710+
32711+#ifdef CONFIG_GRKERNSEC_KMEM
32712+static unsigned int ebda_start __read_only;
32713+static unsigned int ebda_end __read_only;
32714+#endif
32715+
32716 int devmem_is_allowed(unsigned long pagenr)
32717 {
32718- if (pagenr < 256)
32719+#ifdef CONFIG_GRKERNSEC_KMEM
32720+ /* allow BDA */
32721+ if (!pagenr)
32722 return 1;
32723+ /* allow EBDA */
32724+ if (pagenr >= ebda_start && pagenr < ebda_end)
32725+ return 1;
32726+ /* if tboot is in use, allow access to its hardcoded serial log range */
32727+ if (tboot_enabled() && ((0x60000 >> PAGE_SHIFT) <= pagenr) && (pagenr < (0x68000 >> PAGE_SHIFT)))
32728+ return 1;
32729+#else
32730+ if (!pagenr)
32731+ return 1;
32732+#ifdef CONFIG_VM86
32733+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT))
32734+ return 1;
32735+#endif
32736+#endif
32737+
32738+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT))
32739+ return 1;
32740+#ifdef CONFIG_GRKERNSEC_KMEM
32741+ /* throw out everything else below 1MB */
32742+ if (pagenr <= 256)
32743+ return 0;
32744+#endif
32745 if (iomem_is_exclusive(pagenr << PAGE_SHIFT))
32746 return 0;
32747 if (!page_is_ram(pagenr))
32748@@ -685,8 +729,117 @@ void free_init_pages(char *what, unsigned long begin, unsigned long end)
32749 #endif
32750 }
32751
32752+#ifdef CONFIG_GRKERNSEC_KMEM
32753+static inline void gr_init_ebda(void)
32754+{
32755+ unsigned int ebda_addr;
32756+ unsigned int ebda_size = 0;
32757+
32758+ ebda_addr = get_bios_ebda();
32759+ if (ebda_addr) {
32760+ ebda_size = *(unsigned char *)phys_to_virt(ebda_addr);
32761+ ebda_size <<= 10;
32762+ }
32763+ if (ebda_addr && ebda_size) {
32764+ ebda_start = ebda_addr >> PAGE_SHIFT;
32765+ ebda_end = min((unsigned int)PAGE_ALIGN(ebda_addr + ebda_size), (unsigned int)0xa0000) >> PAGE_SHIFT;
32766+ } else {
32767+ ebda_start = 0x9f000 >> PAGE_SHIFT;
32768+ ebda_end = 0xa0000 >> PAGE_SHIFT;
32769+ }
32770+}
32771+#else
32772+static inline void gr_init_ebda(void) { }
32773+#endif
32774+
32775 void free_initmem(void)
32776 {
32777+#ifdef CONFIG_PAX_KERNEXEC
32778+#ifdef CONFIG_X86_32
32779+ /* PaX: limit KERNEL_CS to actual size */
32780+ unsigned long addr, limit;
32781+ struct desc_struct d;
32782+ int cpu;
32783+#else
32784+ pgd_t *pgd;
32785+ pud_t *pud;
32786+ pmd_t *pmd;
32787+ unsigned long addr, end;
32788+#endif
32789+#endif
32790+
32791+ gr_init_ebda();
32792+
32793+#ifdef CONFIG_PAX_KERNEXEC
32794+#ifdef CONFIG_X86_32
32795+ limit = paravirt_enabled() ? ktva_ktla(0xffffffff) : (unsigned long)&_etext;
32796+ limit = (limit - 1UL) >> PAGE_SHIFT;
32797+
32798+ memset(__LOAD_PHYSICAL_ADDR + PAGE_OFFSET, POISON_FREE_INITMEM, PAGE_SIZE);
32799+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
32800+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC);
32801+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S);
32802+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEXEC_KERNEL_CS, &d, DESCTYPE_S);
32803+ }
32804+
32805+ /* PaX: make KERNEL_CS read-only */
32806+ addr = PFN_ALIGN(ktla_ktva((unsigned long)&_text));
32807+ if (!paravirt_enabled())
32808+ set_memory_ro(addr, (PFN_ALIGN(_sdata) - addr) >> PAGE_SHIFT);
32809+/*
32810+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_sdata; addr += PMD_SIZE) {
32811+ pgd = pgd_offset_k(addr);
32812+ pud = pud_offset(pgd, addr);
32813+ pmd = pmd_offset(pud, addr);
32814+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32815+ }
32816+*/
32817+#ifdef CONFIG_X86_PAE
32818+ set_memory_nx(PFN_ALIGN(__init_begin), (PFN_ALIGN(__init_end) - PFN_ALIGN(__init_begin)) >> PAGE_SHIFT);
32819+/*
32820+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) {
32821+ pgd = pgd_offset_k(addr);
32822+ pud = pud_offset(pgd, addr);
32823+ pmd = pmd_offset(pud, addr);
32824+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32825+ }
32826+*/
32827+#endif
32828+
32829+#ifdef CONFIG_MODULES
32830+ set_memory_4k((unsigned long)MODULES_EXEC_VADDR, (MODULES_EXEC_END - MODULES_EXEC_VADDR) >> PAGE_SHIFT);
32831+#endif
32832+
32833+#else
32834+ /* PaX: make kernel code/rodata read-only, rest non-executable */
32835+ for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) {
32836+ pgd = pgd_offset_k(addr);
32837+ pud = pud_offset(pgd, addr);
32838+ pmd = pmd_offset(pud, addr);
32839+ if (!pmd_present(*pmd))
32840+ continue;
32841+ if ((unsigned long)_text <= addr && addr < (unsigned long)_sdata)
32842+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32843+ else
32844+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask)));
32845+ }
32846+
32847+ addr = (unsigned long)__va(__pa(__START_KERNEL_map));
32848+ end = addr + KERNEL_IMAGE_SIZE;
32849+ for (; addr < end; addr += PMD_SIZE) {
32850+ pgd = pgd_offset_k(addr);
32851+ pud = pud_offset(pgd, addr);
32852+ pmd = pmd_offset(pud, addr);
32853+ if (!pmd_present(*pmd))
32854+ continue;
32855+ if ((unsigned long)__va(__pa(_text)) <= addr && addr < (unsigned long)__va(__pa(_sdata)))
32856+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW));
32857+ }
32858+#endif
32859+
32860+ flush_tlb_all();
32861+#endif
32862+
32863 free_init_pages("unused kernel",
32864 (unsigned long)(&__init_begin),
32865 (unsigned long)(&__init_end));
32866diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
32867index c8140e1..59257fc 100644
32868--- a/arch/x86/mm/init_32.c
32869+++ b/arch/x86/mm/init_32.c
32870@@ -62,33 +62,6 @@ static noinline int do_test_wp_bit(void);
32871 bool __read_mostly __vmalloc_start_set = false;
32872
32873 /*
32874- * Creates a middle page table and puts a pointer to it in the
32875- * given global directory entry. This only returns the gd entry
32876- * in non-PAE compilation mode, since the middle layer is folded.
32877- */
32878-static pmd_t * __init one_md_table_init(pgd_t *pgd)
32879-{
32880- pud_t *pud;
32881- pmd_t *pmd_table;
32882-
32883-#ifdef CONFIG_X86_PAE
32884- if (!(pgd_val(*pgd) & _PAGE_PRESENT)) {
32885- pmd_table = (pmd_t *)alloc_low_page();
32886- paravirt_alloc_pmd(&init_mm, __pa(pmd_table) >> PAGE_SHIFT);
32887- set_pgd(pgd, __pgd(__pa(pmd_table) | _PAGE_PRESENT));
32888- pud = pud_offset(pgd, 0);
32889- BUG_ON(pmd_table != pmd_offset(pud, 0));
32890-
32891- return pmd_table;
32892- }
32893-#endif
32894- pud = pud_offset(pgd, 0);
32895- pmd_table = pmd_offset(pud, 0);
32896-
32897- return pmd_table;
32898-}
32899-
32900-/*
32901 * Create a page table and place a pointer to it in a middle page
32902 * directory entry:
32903 */
32904@@ -98,13 +71,28 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)
32905 pte_t *page_table = (pte_t *)alloc_low_page();
32906
32907 paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT);
32908+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
32909+ set_pmd(pmd, __pmd(__pa(page_table) | _KERNPG_TABLE));
32910+#else
32911 set_pmd(pmd, __pmd(__pa(page_table) | _PAGE_TABLE));
32912+#endif
32913 BUG_ON(page_table != pte_offset_kernel(pmd, 0));
32914 }
32915
32916 return pte_offset_kernel(pmd, 0);
32917 }
32918
32919+static pmd_t * __init one_md_table_init(pgd_t *pgd)
32920+{
32921+ pud_t *pud;
32922+ pmd_t *pmd_table;
32923+
32924+ pud = pud_offset(pgd, 0);
32925+ pmd_table = pmd_offset(pud, 0);
32926+
32927+ return pmd_table;
32928+}
32929+
32930 pmd_t * __init populate_extra_pmd(unsigned long vaddr)
32931 {
32932 int pgd_idx = pgd_index(vaddr);
32933@@ -208,6 +196,7 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32934 int pgd_idx, pmd_idx;
32935 unsigned long vaddr;
32936 pgd_t *pgd;
32937+ pud_t *pud;
32938 pmd_t *pmd;
32939 pte_t *pte = NULL;
32940 unsigned long count = page_table_range_init_count(start, end);
32941@@ -222,8 +211,13 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32942 pgd = pgd_base + pgd_idx;
32943
32944 for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) {
32945- pmd = one_md_table_init(pgd);
32946- pmd = pmd + pmd_index(vaddr);
32947+ pud = pud_offset(pgd, vaddr);
32948+ pmd = pmd_offset(pud, vaddr);
32949+
32950+#ifdef CONFIG_X86_PAE
32951+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
32952+#endif
32953+
32954 for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end);
32955 pmd++, pmd_idx++) {
32956 pte = page_table_kmap_check(one_page_table_init(pmd),
32957@@ -235,11 +229,20 @@ page_table_range_init(unsigned long start, unsigned long end, pgd_t *pgd_base)
32958 }
32959 }
32960
32961-static inline int is_kernel_text(unsigned long addr)
32962+static inline int is_kernel_text(unsigned long start, unsigned long end)
32963 {
32964- if (addr >= (unsigned long)_text && addr <= (unsigned long)__init_end)
32965- return 1;
32966- return 0;
32967+ if ((start >= ktla_ktva((unsigned long)_etext) ||
32968+ end <= ktla_ktva((unsigned long)_stext)) &&
32969+ (start >= ktla_ktva((unsigned long)_einittext) ||
32970+ end <= ktla_ktva((unsigned long)_sinittext)) &&
32971+
32972+#ifdef CONFIG_ACPI_SLEEP
32973+ (start >= (unsigned long)__va(acpi_wakeup_address) + 0x4000 || end <= (unsigned long)__va(acpi_wakeup_address)) &&
32974+#endif
32975+
32976+ (start > (unsigned long)__va(0xfffff) || end <= (unsigned long)__va(0xc0000)))
32977+ return 0;
32978+ return 1;
32979 }
32980
32981 /*
32982@@ -256,9 +259,10 @@ kernel_physical_mapping_init(unsigned long start,
32983 unsigned long last_map_addr = end;
32984 unsigned long start_pfn, end_pfn;
32985 pgd_t *pgd_base = swapper_pg_dir;
32986- int pgd_idx, pmd_idx, pte_ofs;
32987+ unsigned int pgd_idx, pmd_idx, pte_ofs;
32988 unsigned long pfn;
32989 pgd_t *pgd;
32990+ pud_t *pud;
32991 pmd_t *pmd;
32992 pte_t *pte;
32993 unsigned pages_2m, pages_4k;
32994@@ -291,8 +295,13 @@ repeat:
32995 pfn = start_pfn;
32996 pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
32997 pgd = pgd_base + pgd_idx;
32998- for (; pgd_idx < PTRS_PER_PGD; pgd++, pgd_idx++) {
32999- pmd = one_md_table_init(pgd);
33000+ for (; pgd_idx < PTRS_PER_PGD && pfn < max_low_pfn; pgd++, pgd_idx++) {
33001+ pud = pud_offset(pgd, 0);
33002+ pmd = pmd_offset(pud, 0);
33003+
33004+#ifdef CONFIG_X86_PAE
33005+ paravirt_alloc_pmd(&init_mm, __pa(pmd) >> PAGE_SHIFT);
33006+#endif
33007
33008 if (pfn >= end_pfn)
33009 continue;
33010@@ -304,14 +313,13 @@ repeat:
33011 #endif
33012 for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn;
33013 pmd++, pmd_idx++) {
33014- unsigned int addr = pfn * PAGE_SIZE + PAGE_OFFSET;
33015+ unsigned long address = pfn * PAGE_SIZE + PAGE_OFFSET;
33016
33017 /*
33018 * Map with big pages if possible, otherwise
33019 * create normal page tables:
33020 */
33021 if (use_pse) {
33022- unsigned int addr2;
33023 pgprot_t prot = PAGE_KERNEL_LARGE;
33024 /*
33025 * first pass will use the same initial
33026@@ -322,11 +330,7 @@ repeat:
33027 _PAGE_PSE);
33028
33029 pfn &= PMD_MASK >> PAGE_SHIFT;
33030- addr2 = (pfn + PTRS_PER_PTE-1) * PAGE_SIZE +
33031- PAGE_OFFSET + PAGE_SIZE-1;
33032-
33033- if (is_kernel_text(addr) ||
33034- is_kernel_text(addr2))
33035+ if (is_kernel_text(address, address + PMD_SIZE))
33036 prot = PAGE_KERNEL_LARGE_EXEC;
33037
33038 pages_2m++;
33039@@ -343,7 +347,7 @@ repeat:
33040 pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET);
33041 pte += pte_ofs;
33042 for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn;
33043- pte++, pfn++, pte_ofs++, addr += PAGE_SIZE) {
33044+ pte++, pfn++, pte_ofs++, address += PAGE_SIZE) {
33045 pgprot_t prot = PAGE_KERNEL;
33046 /*
33047 * first pass will use the same initial
33048@@ -351,7 +355,7 @@ repeat:
33049 */
33050 pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR);
33051
33052- if (is_kernel_text(addr))
33053+ if (is_kernel_text(address, address + PAGE_SIZE))
33054 prot = PAGE_KERNEL_EXEC;
33055
33056 pages_4k++;
33057@@ -474,7 +478,7 @@ void __init native_pagetable_init(void)
33058
33059 pud = pud_offset(pgd, va);
33060 pmd = pmd_offset(pud, va);
33061- if (!pmd_present(*pmd))
33062+ if (!pmd_present(*pmd)) // PAX TODO || pmd_large(*pmd))
33063 break;
33064
33065 /* should not be large page here */
33066@@ -532,12 +536,10 @@ void __init early_ioremap_page_table_range_init(void)
33067
33068 static void __init pagetable_init(void)
33069 {
33070- pgd_t *pgd_base = swapper_pg_dir;
33071-
33072- permanent_kmaps_init(pgd_base);
33073+ permanent_kmaps_init(swapper_pg_dir);
33074 }
33075
33076-pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL);
33077+pteval_t __supported_pte_mask __read_only = ~(_PAGE_NX | _PAGE_GLOBAL);
33078 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33079
33080 /* user-defined highmem size */
33081@@ -787,10 +789,10 @@ void __init mem_init(void)
33082 ((unsigned long)&__init_end -
33083 (unsigned long)&__init_begin) >> 10,
33084
33085- (unsigned long)&_etext, (unsigned long)&_edata,
33086- ((unsigned long)&_edata - (unsigned long)&_etext) >> 10,
33087+ (unsigned long)&_sdata, (unsigned long)&_edata,
33088+ ((unsigned long)&_edata - (unsigned long)&_sdata) >> 10,
33089
33090- (unsigned long)&_text, (unsigned long)&_etext,
33091+ ktla_ktva((unsigned long)&_text), ktla_ktva((unsigned long)&_etext),
33092 ((unsigned long)&_etext - (unsigned long)&_text) >> 10);
33093
33094 /*
33095@@ -884,6 +886,7 @@ void set_kernel_text_rw(void)
33096 if (!kernel_set_to_readonly)
33097 return;
33098
33099+ start = ktla_ktva(start);
33100 pr_debug("Set kernel text: %lx - %lx for read write\n",
33101 start, start+size);
33102
33103@@ -898,6 +901,7 @@ void set_kernel_text_ro(void)
33104 if (!kernel_set_to_readonly)
33105 return;
33106
33107+ start = ktla_ktva(start);
33108 pr_debug("Set kernel text: %lx - %lx for read only\n",
33109 start, start+size);
33110
33111@@ -926,6 +930,7 @@ void mark_rodata_ro(void)
33112 unsigned long start = PFN_ALIGN(_text);
33113 unsigned long size = PFN_ALIGN(_etext) - start;
33114
33115+ start = ktla_ktva(start);
33116 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
33117 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
33118 size >> 10);
33119diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
33120index 30eb05a..ae671ac 100644
33121--- a/arch/x86/mm/init_64.c
33122+++ b/arch/x86/mm/init_64.c
33123@@ -150,7 +150,7 @@ early_param("gbpages", parse_direct_gbpages_on);
33124 * around without checking the pgd every time.
33125 */
33126
33127-pteval_t __supported_pte_mask __read_mostly = ~0;
33128+pteval_t __supported_pte_mask __read_only = ~_PAGE_NX;
33129 EXPORT_SYMBOL_GPL(__supported_pte_mask);
33130
33131 int force_personality32;
33132@@ -183,7 +183,12 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33133
33134 for (address = start; address <= end; address += PGDIR_SIZE) {
33135 const pgd_t *pgd_ref = pgd_offset_k(address);
33136+
33137+#ifdef CONFIG_PAX_PER_CPU_PGD
33138+ unsigned long cpu;
33139+#else
33140 struct page *page;
33141+#endif
33142
33143 /*
33144 * When it is called after memory hot remove, pgd_none()
33145@@ -194,6 +199,25 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33146 continue;
33147
33148 spin_lock(&pgd_lock);
33149+
33150+#ifdef CONFIG_PAX_PER_CPU_PGD
33151+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33152+ pgd_t *pgd = pgd_offset_cpu(cpu, user, address);
33153+
33154+ if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33155+ BUG_ON(pgd_page_vaddr(*pgd)
33156+ != pgd_page_vaddr(*pgd_ref));
33157+
33158+ if (removed) {
33159+ if (pgd_none(*pgd_ref) && !pgd_none(*pgd))
33160+ pgd_clear(pgd);
33161+ } else {
33162+ if (pgd_none(*pgd))
33163+ set_pgd(pgd, *pgd_ref);
33164+ }
33165+
33166+ pgd = pgd_offset_cpu(cpu, kernel, address);
33167+#else
33168 list_for_each_entry(page, &pgd_list, lru) {
33169 pgd_t *pgd;
33170 spinlock_t *pgt_lock;
33171@@ -202,6 +226,7 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33172 /* the pgt_lock only for Xen */
33173 pgt_lock = &pgd_page_get_mm(page)->page_table_lock;
33174 spin_lock(pgt_lock);
33175+#endif
33176
33177 if (!pgd_none(*pgd_ref) && !pgd_none(*pgd))
33178 BUG_ON(pgd_page_vaddr(*pgd)
33179@@ -215,7 +240,10 @@ void sync_global_pgds(unsigned long start, unsigned long end, int removed)
33180 set_pgd(pgd, *pgd_ref);
33181 }
33182
33183+#ifndef CONFIG_PAX_PER_CPU_PGD
33184 spin_unlock(pgt_lock);
33185+#endif
33186+
33187 }
33188 spin_unlock(&pgd_lock);
33189 }
33190@@ -248,7 +276,7 @@ static pud_t *fill_pud(pgd_t *pgd, unsigned long vaddr)
33191 {
33192 if (pgd_none(*pgd)) {
33193 pud_t *pud = (pud_t *)spp_getpage();
33194- pgd_populate(&init_mm, pgd, pud);
33195+ pgd_populate_kernel(&init_mm, pgd, pud);
33196 if (pud != pud_offset(pgd, 0))
33197 printk(KERN_ERR "PAGETABLE BUG #00! %p <-> %p\n",
33198 pud, pud_offset(pgd, 0));
33199@@ -260,7 +288,7 @@ static pmd_t *fill_pmd(pud_t *pud, unsigned long vaddr)
33200 {
33201 if (pud_none(*pud)) {
33202 pmd_t *pmd = (pmd_t *) spp_getpage();
33203- pud_populate(&init_mm, pud, pmd);
33204+ pud_populate_kernel(&init_mm, pud, pmd);
33205 if (pmd != pmd_offset(pud, 0))
33206 printk(KERN_ERR "PAGETABLE BUG #01! %p <-> %p\n",
33207 pmd, pmd_offset(pud, 0));
33208@@ -289,7 +317,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte)
33209 pmd = fill_pmd(pud, vaddr);
33210 pte = fill_pte(pmd, vaddr);
33211
33212+ pax_open_kernel();
33213 set_pte(pte, new_pte);
33214+ pax_close_kernel();
33215
33216 /*
33217 * It's enough to flush this one mapping.
33218@@ -351,14 +381,12 @@ static void __init __init_extra_mapping(unsigned long phys, unsigned long size,
33219 pgd = pgd_offset_k((unsigned long)__va(phys));
33220 if (pgd_none(*pgd)) {
33221 pud = (pud_t *) spp_getpage();
33222- set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE |
33223- _PAGE_USER));
33224+ set_pgd(pgd, __pgd(__pa(pud) | _PAGE_TABLE));
33225 }
33226 pud = pud_offset(pgd, (unsigned long)__va(phys));
33227 if (pud_none(*pud)) {
33228 pmd = (pmd_t *) spp_getpage();
33229- set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE |
33230- _PAGE_USER));
33231+ set_pud(pud, __pud(__pa(pmd) | _PAGE_TABLE));
33232 }
33233 pmd = pmd_offset(pud, phys);
33234 BUG_ON(!pmd_none(*pmd));
33235@@ -599,7 +627,7 @@ phys_pud_init(pud_t *pud_page, unsigned long addr, unsigned long end,
33236 prot);
33237
33238 spin_lock(&init_mm.page_table_lock);
33239- pud_populate(&init_mm, pud, pmd);
33240+ pud_populate_kernel(&init_mm, pud, pmd);
33241 spin_unlock(&init_mm.page_table_lock);
33242 }
33243 __flush_tlb_all();
33244@@ -640,7 +668,7 @@ kernel_physical_mapping_init(unsigned long start,
33245 page_size_mask);
33246
33247 spin_lock(&init_mm.page_table_lock);
33248- pgd_populate(&init_mm, pgd, pud);
33249+ pgd_populate_kernel(&init_mm, pgd, pud);
33250 spin_unlock(&init_mm.page_table_lock);
33251 pgd_changed = true;
33252 }
33253diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
33254index 9ca35fc..4b2b7b7 100644
33255--- a/arch/x86/mm/iomap_32.c
33256+++ b/arch/x86/mm/iomap_32.c
33257@@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
33258 type = kmap_atomic_idx_push();
33259 idx = type + KM_TYPE_NR * smp_processor_id();
33260 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
33261+
33262+ pax_open_kernel();
33263 set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
33264+ pax_close_kernel();
33265+
33266 arch_flush_lazy_mmu_mode();
33267
33268 return (void *)vaddr;
33269diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
33270index fdf617c..b9e85bc 100644
33271--- a/arch/x86/mm/ioremap.c
33272+++ b/arch/x86/mm/ioremap.c
33273@@ -56,8 +56,8 @@ static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,
33274 unsigned long i;
33275
33276 for (i = 0; i < nr_pages; ++i)
33277- if (pfn_valid(start_pfn + i) &&
33278- !PageReserved(pfn_to_page(start_pfn + i)))
33279+ if (pfn_valid(start_pfn + i) && (start_pfn + i >= 0x100 ||
33280+ !PageReserved(pfn_to_page(start_pfn + i))))
33281 return 1;
33282
33283 WARN_ONCE(1, "ioremap on RAM pfn 0x%lx\n", start_pfn);
33284@@ -283,7 +283,7 @@ EXPORT_SYMBOL(ioremap_prot);
33285 *
33286 * Caller must ensure there is only one unmapping for the same pointer.
33287 */
33288-void iounmap(volatile void __iomem *addr)
33289+void iounmap(const volatile void __iomem *addr)
33290 {
33291 struct vm_struct *p, *o;
33292
33293@@ -332,30 +332,29 @@ EXPORT_SYMBOL(iounmap);
33294 */
33295 void *xlate_dev_mem_ptr(phys_addr_t phys)
33296 {
33297- void *addr;
33298- unsigned long start = phys & PAGE_MASK;
33299-
33300 /* If page is RAM, we can use __va. Otherwise ioremap and unmap. */
33301- if (page_is_ram(start >> PAGE_SHIFT))
33302+ if (page_is_ram(phys >> PAGE_SHIFT))
33303+#ifdef CONFIG_HIGHMEM
33304+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33305+#endif
33306 return __va(phys);
33307
33308- addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
33309- if (addr)
33310- addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));
33311-
33312- return addr;
33313+ return (void __force *)ioremap_cache(phys, PAGE_SIZE);
33314 }
33315
33316 void unxlate_dev_mem_ptr(phys_addr_t phys, void *addr)
33317 {
33318 if (page_is_ram(phys >> PAGE_SHIFT))
33319+#ifdef CONFIG_HIGHMEM
33320+ if ((phys >> PAGE_SHIFT) < max_low_pfn)
33321+#endif
33322 return;
33323
33324 iounmap((void __iomem *)((unsigned long)addr & PAGE_MASK));
33325 return;
33326 }
33327
33328-static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
33329+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __read_only __aligned(PAGE_SIZE);
33330
33331 static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
33332 {
33333@@ -391,8 +390,7 @@ void __init early_ioremap_init(void)
33334 early_ioremap_setup();
33335
33336 pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
33337- memset(bm_pte, 0, sizeof(bm_pte));
33338- pmd_populate_kernel(&init_mm, pmd, bm_pte);
33339+ pmd_populate_user(&init_mm, pmd, bm_pte);
33340
33341 /*
33342 * The boot-ioremap range spans multiple pmds, for which
33343diff --git a/arch/x86/mm/kmemcheck/kmemcheck.c b/arch/x86/mm/kmemcheck/kmemcheck.c
33344index b4f2e7e..96c9c3e 100644
33345--- a/arch/x86/mm/kmemcheck/kmemcheck.c
33346+++ b/arch/x86/mm/kmemcheck/kmemcheck.c
33347@@ -628,9 +628,9 @@ bool kmemcheck_fault(struct pt_regs *regs, unsigned long address,
33348 * memory (e.g. tracked pages)? For now, we need this to avoid
33349 * invoking kmemcheck for PnP BIOS calls.
33350 */
33351- if (regs->flags & X86_VM_MASK)
33352+ if (v8086_mode(regs))
33353 return false;
33354- if (regs->cs != __KERNEL_CS)
33355+ if (regs->cs != __KERNEL_CS && regs->cs != __KERNEXEC_KERNEL_CS)
33356 return false;
33357
33358 pte = kmemcheck_pte_lookup(address);
33359diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c
33360index df4552b..12c129c 100644
33361--- a/arch/x86/mm/mmap.c
33362+++ b/arch/x86/mm/mmap.c
33363@@ -52,7 +52,7 @@ static unsigned long stack_maxrandom_size(void)
33364 * Leave an at least ~128 MB hole with possible stack randomization.
33365 */
33366 #define MIN_GAP (128*1024*1024UL + stack_maxrandom_size())
33367-#define MAX_GAP (TASK_SIZE/6*5)
33368+#define MAX_GAP (pax_task_size/6*5)
33369
33370 static int mmap_is_legacy(void)
33371 {
33372@@ -82,27 +82,40 @@ static unsigned long mmap_rnd(void)
33373 return rnd << PAGE_SHIFT;
33374 }
33375
33376-static unsigned long mmap_base(void)
33377+static unsigned long mmap_base(struct mm_struct *mm)
33378 {
33379 unsigned long gap = rlimit(RLIMIT_STACK);
33380+ unsigned long pax_task_size = TASK_SIZE;
33381+
33382+#ifdef CONFIG_PAX_SEGMEXEC
33383+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33384+ pax_task_size = SEGMEXEC_TASK_SIZE;
33385+#endif
33386
33387 if (gap < MIN_GAP)
33388 gap = MIN_GAP;
33389 else if (gap > MAX_GAP)
33390 gap = MAX_GAP;
33391
33392- return PAGE_ALIGN(TASK_SIZE - gap - mmap_rnd());
33393+ return PAGE_ALIGN(pax_task_size - gap - mmap_rnd());
33394 }
33395
33396 /*
33397 * Bottom-up (legacy) layout on X86_32 did not support randomization, X86_64
33398 * does, but not when emulating X86_32
33399 */
33400-static unsigned long mmap_legacy_base(void)
33401+static unsigned long mmap_legacy_base(struct mm_struct *mm)
33402 {
33403- if (mmap_is_ia32())
33404+ if (mmap_is_ia32()) {
33405+
33406+#ifdef CONFIG_PAX_SEGMEXEC
33407+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
33408+ return SEGMEXEC_TASK_UNMAPPED_BASE;
33409+ else
33410+#endif
33411+
33412 return TASK_UNMAPPED_BASE;
33413- else
33414+ } else
33415 return TASK_UNMAPPED_BASE + mmap_rnd();
33416 }
33417
33418@@ -112,8 +125,15 @@ static unsigned long mmap_legacy_base(void)
33419 */
33420 void arch_pick_mmap_layout(struct mm_struct *mm)
33421 {
33422- mm->mmap_legacy_base = mmap_legacy_base();
33423- mm->mmap_base = mmap_base();
33424+ mm->mmap_legacy_base = mmap_legacy_base(mm);
33425+ mm->mmap_base = mmap_base(mm);
33426+
33427+#ifdef CONFIG_PAX_RANDMMAP
33428+ if (mm->pax_flags & MF_PAX_RANDMMAP) {
33429+ mm->mmap_legacy_base += mm->delta_mmap;
33430+ mm->mmap_base -= mm->delta_mmap + mm->delta_stack;
33431+ }
33432+#endif
33433
33434 if (mmap_is_legacy()) {
33435 mm->mmap_base = mm->mmap_legacy_base;
33436diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c
33437index 0057a7a..95c7edd 100644
33438--- a/arch/x86/mm/mmio-mod.c
33439+++ b/arch/x86/mm/mmio-mod.c
33440@@ -194,7 +194,7 @@ static void pre(struct kmmio_probe *p, struct pt_regs *regs,
33441 break;
33442 default:
33443 {
33444- unsigned char *ip = (unsigned char *)instptr;
33445+ unsigned char *ip = (unsigned char *)ktla_ktva(instptr);
33446 my_trace->opcode = MMIO_UNKNOWN_OP;
33447 my_trace->width = 0;
33448 my_trace->value = (*ip) << 16 | *(ip + 1) << 8 |
33449@@ -234,7 +234,7 @@ static void post(struct kmmio_probe *p, unsigned long condition,
33450 static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33451 void __iomem *addr)
33452 {
33453- static atomic_t next_id;
33454+ static atomic_unchecked_t next_id;
33455 struct remap_trace *trace = kmalloc(sizeof(*trace), GFP_KERNEL);
33456 /* These are page-unaligned. */
33457 struct mmiotrace_map map = {
33458@@ -258,7 +258,7 @@ static void ioremap_trace_core(resource_size_t offset, unsigned long size,
33459 .private = trace
33460 },
33461 .phys = offset,
33462- .id = atomic_inc_return(&next_id)
33463+ .id = atomic_inc_return_unchecked(&next_id)
33464 };
33465 map.map_id = trace->id;
33466
33467@@ -290,7 +290,7 @@ void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
33468 ioremap_trace_core(offset, size, addr);
33469 }
33470
33471-static void iounmap_trace_core(volatile void __iomem *addr)
33472+static void iounmap_trace_core(const volatile void __iomem *addr)
33473 {
33474 struct mmiotrace_map map = {
33475 .phys = 0,
33476@@ -328,7 +328,7 @@ not_enabled:
33477 }
33478 }
33479
33480-void mmiotrace_iounmap(volatile void __iomem *addr)
33481+void mmiotrace_iounmap(const volatile void __iomem *addr)
33482 {
33483 might_sleep();
33484 if (is_enabled()) /* recheck and proper locking in *_core() */
33485diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c
33486index cd4785b..25188b6 100644
33487--- a/arch/x86/mm/numa.c
33488+++ b/arch/x86/mm/numa.c
33489@@ -499,7 +499,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
33490 }
33491 }
33492
33493-static int __init numa_register_memblks(struct numa_meminfo *mi)
33494+static int __init __intentional_overflow(-1) numa_register_memblks(struct numa_meminfo *mi)
33495 {
33496 unsigned long uninitialized_var(pfn_align);
33497 int i, nid;
33498diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
33499index 536ea2f..f42c293 100644
33500--- a/arch/x86/mm/pageattr.c
33501+++ b/arch/x86/mm/pageattr.c
33502@@ -262,7 +262,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33503 */
33504 #ifdef CONFIG_PCI_BIOS
33505 if (pcibios_enabled && within(pfn, BIOS_BEGIN >> PAGE_SHIFT, BIOS_END >> PAGE_SHIFT))
33506- pgprot_val(forbidden) |= _PAGE_NX;
33507+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33508 #endif
33509
33510 /*
33511@@ -270,9 +270,10 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33512 * Does not cover __inittext since that is gone later on. On
33513 * 64bit we do not enforce !NX on the low mapping
33514 */
33515- if (within(address, (unsigned long)_text, (unsigned long)_etext))
33516- pgprot_val(forbidden) |= _PAGE_NX;
33517+ if (within(address, ktla_ktva((unsigned long)_text), ktla_ktva((unsigned long)_etext)))
33518+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33519
33520+#ifdef CONFIG_DEBUG_RODATA
33521 /*
33522 * The .rodata section needs to be read-only. Using the pfn
33523 * catches all aliases.
33524@@ -280,6 +281,7 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33525 if (within(pfn, __pa_symbol(__start_rodata) >> PAGE_SHIFT,
33526 __pa_symbol(__end_rodata) >> PAGE_SHIFT))
33527 pgprot_val(forbidden) |= _PAGE_RW;
33528+#endif
33529
33530 #if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
33531 /*
33532@@ -318,6 +320,13 @@ static inline pgprot_t static_protections(pgprot_t prot, unsigned long address,
33533 }
33534 #endif
33535
33536+#ifdef CONFIG_PAX_KERNEXEC
33537+ if (within(pfn, __pa(ktla_ktva((unsigned long)&_text)), __pa((unsigned long)&_sdata))) {
33538+ pgprot_val(forbidden) |= _PAGE_RW;
33539+ pgprot_val(forbidden) |= _PAGE_NX & __supported_pte_mask;
33540+ }
33541+#endif
33542+
33543 prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden));
33544
33545 return prot;
33546@@ -440,23 +449,37 @@ EXPORT_SYMBOL_GPL(slow_virt_to_phys);
33547 static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte)
33548 {
33549 /* change init_mm */
33550+ pax_open_kernel();
33551 set_pte_atomic(kpte, pte);
33552+
33553 #ifdef CONFIG_X86_32
33554 if (!SHARED_KERNEL_PMD) {
33555+
33556+#ifdef CONFIG_PAX_PER_CPU_PGD
33557+ unsigned long cpu;
33558+#else
33559 struct page *page;
33560+#endif
33561
33562+#ifdef CONFIG_PAX_PER_CPU_PGD
33563+ for (cpu = 0; cpu < nr_cpu_ids; ++cpu) {
33564+ pgd_t *pgd = get_cpu_pgd(cpu, kernel);
33565+#else
33566 list_for_each_entry(page, &pgd_list, lru) {
33567- pgd_t *pgd;
33568+ pgd_t *pgd = (pgd_t *)page_address(page);
33569+#endif
33570+
33571 pud_t *pud;
33572 pmd_t *pmd;
33573
33574- pgd = (pgd_t *)page_address(page) + pgd_index(address);
33575+ pgd += pgd_index(address);
33576 pud = pud_offset(pgd, address);
33577 pmd = pmd_offset(pud, address);
33578 set_pte_atomic((pte_t *)pmd, pte);
33579 }
33580 }
33581 #endif
33582+ pax_close_kernel();
33583 }
33584
33585 static int
33586diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
33587index 7ac6869..c0ba541 100644
33588--- a/arch/x86/mm/pat.c
33589+++ b/arch/x86/mm/pat.c
33590@@ -89,7 +89,7 @@ static inline enum page_cache_mode get_page_memtype(struct page *pg)
33591 unsigned long pg_flags = pg->flags & _PGMT_MASK;
33592
33593 if (pg_flags == _PGMT_DEFAULT)
33594- return -1;
33595+ return _PAGE_CACHE_MODE_NUM;
33596 else if (pg_flags == _PGMT_WC)
33597 return _PAGE_CACHE_MODE_WC;
33598 else if (pg_flags == _PGMT_UC_MINUS)
33599@@ -346,7 +346,7 @@ static int reserve_ram_pages_type(u64 start, u64 end,
33600
33601 page = pfn_to_page(pfn);
33602 type = get_page_memtype(page);
33603- if (type != -1) {
33604+ if (type != _PAGE_CACHE_MODE_NUM) {
33605 pr_info("reserve_ram_pages_type failed [mem %#010Lx-%#010Lx], track 0x%x, req 0x%x\n",
33606 start, end - 1, type, req_type);
33607 if (new_type)
33608@@ -498,7 +498,7 @@ int free_memtype(u64 start, u64 end)
33609
33610 if (!entry) {
33611 printk(KERN_INFO "%s:%d freeing invalid memtype [mem %#010Lx-%#010Lx]\n",
33612- current->comm, current->pid, start, end - 1);
33613+ current->comm, task_pid_nr(current), start, end - 1);
33614 return -EINVAL;
33615 }
33616
33617@@ -532,10 +532,10 @@ static enum page_cache_mode lookup_memtype(u64 paddr)
33618 page = pfn_to_page(paddr >> PAGE_SHIFT);
33619 rettype = get_page_memtype(page);
33620 /*
33621- * -1 from get_page_memtype() implies RAM page is in its
33622+ * _PAGE_CACHE_MODE_NUM from get_page_memtype() implies RAM page is in its
33623 * default state and not reserved, and hence of type WB
33624 */
33625- if (rettype == -1)
33626+ if (rettype == _PAGE_CACHE_MODE_NUM)
33627 rettype = _PAGE_CACHE_MODE_WB;
33628
33629 return rettype;
33630@@ -628,8 +628,8 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
33631
33632 while (cursor < to) {
33633 if (!devmem_is_allowed(pfn)) {
33634- printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx]\n",
33635- current->comm, from, to - 1);
33636+ printk(KERN_INFO "Program %s tried to access /dev/mem between [mem %#010Lx-%#010Lx] (%#010Lx)\n",
33637+ current->comm, from, to - 1, cursor);
33638 return 0;
33639 }
33640 cursor += PAGE_SIZE;
33641@@ -700,7 +700,7 @@ int kernel_map_sync_memtype(u64 base, unsigned long size,
33642 if (ioremap_change_attr((unsigned long)__va(base), id_sz, pcm) < 0) {
33643 printk(KERN_INFO "%s:%d ioremap_change_attr failed %s "
33644 "for [mem %#010Lx-%#010Lx]\n",
33645- current->comm, current->pid,
33646+ current->comm, task_pid_nr(current),
33647 cattr_name(pcm),
33648 base, (unsigned long long)(base + size-1));
33649 return -EINVAL;
33650@@ -735,7 +735,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33651 pcm = lookup_memtype(paddr);
33652 if (want_pcm != pcm) {
33653 printk(KERN_WARNING "%s:%d map pfn RAM range req %s for [mem %#010Lx-%#010Lx], got %s\n",
33654- current->comm, current->pid,
33655+ current->comm, task_pid_nr(current),
33656 cattr_name(want_pcm),
33657 (unsigned long long)paddr,
33658 (unsigned long long)(paddr + size - 1),
33659@@ -757,7 +757,7 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot,
33660 free_memtype(paddr, paddr + size);
33661 printk(KERN_ERR "%s:%d map pfn expected mapping type %s"
33662 " for [mem %#010Lx-%#010Lx], got %s\n",
33663- current->comm, current->pid,
33664+ current->comm, task_pid_nr(current),
33665 cattr_name(want_pcm),
33666 (unsigned long long)paddr,
33667 (unsigned long long)(paddr + size - 1),
33668diff --git a/arch/x86/mm/pat_rbtree.c b/arch/x86/mm/pat_rbtree.c
33669index 6582adc..fcc5d0b 100644
33670--- a/arch/x86/mm/pat_rbtree.c
33671+++ b/arch/x86/mm/pat_rbtree.c
33672@@ -161,7 +161,7 @@ success:
33673
33674 failure:
33675 printk(KERN_INFO "%s:%d conflicting memory types "
33676- "%Lx-%Lx %s<->%s\n", current->comm, current->pid, start,
33677+ "%Lx-%Lx %s<->%s\n", current->comm, task_pid_nr(current), start,
33678 end, cattr_name(found_type), cattr_name(match->type));
33679 return -EBUSY;
33680 }
33681diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
33682index 9f0614d..92ae64a 100644
33683--- a/arch/x86/mm/pf_in.c
33684+++ b/arch/x86/mm/pf_in.c
33685@@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned long ins_addr)
33686 int i;
33687 enum reason_type rv = OTHERS;
33688
33689- p = (unsigned char *)ins_addr;
33690+ p = (unsigned char *)ktla_ktva(ins_addr);
33691 p += skip_prefix(p, &prf);
33692 p += get_opcode(p, &opcode);
33693
33694@@ -168,7 +168,7 @@ static unsigned int get_ins_reg_width(unsigned long ins_addr)
33695 struct prefix_bits prf;
33696 int i;
33697
33698- p = (unsigned char *)ins_addr;
33699+ p = (unsigned char *)ktla_ktva(ins_addr);
33700 p += skip_prefix(p, &prf);
33701 p += get_opcode(p, &opcode);
33702
33703@@ -191,7 +191,7 @@ unsigned int get_ins_mem_width(unsigned long ins_addr)
33704 struct prefix_bits prf;
33705 int i;
33706
33707- p = (unsigned char *)ins_addr;
33708+ p = (unsigned char *)ktla_ktva(ins_addr);
33709 p += skip_prefix(p, &prf);
33710 p += get_opcode(p, &opcode);
33711
33712@@ -415,7 +415,7 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs)
33713 struct prefix_bits prf;
33714 int i;
33715
33716- p = (unsigned char *)ins_addr;
33717+ p = (unsigned char *)ktla_ktva(ins_addr);
33718 p += skip_prefix(p, &prf);
33719 p += get_opcode(p, &opcode);
33720 for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
33721@@ -470,7 +470,7 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
33722 struct prefix_bits prf;
33723 int i;
33724
33725- p = (unsigned char *)ins_addr;
33726+ p = (unsigned char *)ktla_ktva(ins_addr);
33727 p += skip_prefix(p, &prf);
33728 p += get_opcode(p, &opcode);
33729 for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
33730diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
33731index 7b22ada..b11e66f 100644
33732--- a/arch/x86/mm/pgtable.c
33733+++ b/arch/x86/mm/pgtable.c
33734@@ -97,10 +97,75 @@ static inline void pgd_list_del(pgd_t *pgd)
33735 list_del(&page->lru);
33736 }
33737
33738-#define UNSHARED_PTRS_PER_PGD \
33739- (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33740+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33741+pgdval_t clone_pgd_mask __read_only = ~_PAGE_PRESENT;
33742
33743+void __shadow_user_pgds(pgd_t *dst, const pgd_t *src)
33744+{
33745+ unsigned int count = USER_PGD_PTRS;
33746
33747+ if (!pax_user_shadow_base)
33748+ return;
33749+
33750+ while (count--)
33751+ *dst++ = __pgd((pgd_val(*src++) | (_PAGE_NX & __supported_pte_mask)) & ~_PAGE_USER);
33752+}
33753+#endif
33754+
33755+#ifdef CONFIG_PAX_PER_CPU_PGD
33756+void __clone_user_pgds(pgd_t *dst, const pgd_t *src)
33757+{
33758+ unsigned int count = USER_PGD_PTRS;
33759+
33760+ while (count--) {
33761+ pgd_t pgd;
33762+
33763+#ifdef CONFIG_X86_64
33764+ pgd = __pgd(pgd_val(*src++) | _PAGE_USER);
33765+#else
33766+ pgd = *src++;
33767+#endif
33768+
33769+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
33770+ pgd = __pgd(pgd_val(pgd) & clone_pgd_mask);
33771+#endif
33772+
33773+ *dst++ = pgd;
33774+ }
33775+
33776+}
33777+#endif
33778+
33779+#ifdef CONFIG_X86_64
33780+#define pxd_t pud_t
33781+#define pyd_t pgd_t
33782+#define paravirt_release_pxd(pfn) paravirt_release_pud(pfn)
33783+#define pgtable_pxd_page_ctor(page) true
33784+#define pgtable_pxd_page_dtor(page) do {} while (0)
33785+#define pxd_free(mm, pud) pud_free((mm), (pud))
33786+#define pyd_populate(mm, pgd, pud) pgd_populate((mm), (pgd), (pud))
33787+#define pyd_offset(mm, address) pgd_offset((mm), (address))
33788+#define PYD_SIZE PGDIR_SIZE
33789+#define mm_inc_nr_pxds(mm) do {} while (0)
33790+#define mm_dec_nr_pxds(mm) do {} while (0)
33791+#else
33792+#define pxd_t pmd_t
33793+#define pyd_t pud_t
33794+#define paravirt_release_pxd(pfn) paravirt_release_pmd(pfn)
33795+#define pgtable_pxd_page_ctor(page) pgtable_pmd_page_ctor(page)
33796+#define pgtable_pxd_page_dtor(page) pgtable_pmd_page_dtor(page)
33797+#define pxd_free(mm, pud) pmd_free((mm), (pud))
33798+#define pyd_populate(mm, pgd, pud) pud_populate((mm), (pgd), (pud))
33799+#define pyd_offset(mm, address) pud_offset((mm), (address))
33800+#define PYD_SIZE PUD_SIZE
33801+#define mm_inc_nr_pxds(mm) mm_inc_nr_pmds(mm)
33802+#define mm_dec_nr_pxds(mm) mm_dec_nr_pmds(mm)
33803+#endif
33804+
33805+#ifdef CONFIG_PAX_PER_CPU_PGD
33806+static inline void pgd_ctor(struct mm_struct *mm, pgd_t *pgd) {}
33807+static inline void pgd_dtor(pgd_t *pgd) {}
33808+#else
33809 static void pgd_set_mm(pgd_t *pgd, struct mm_struct *mm)
33810 {
33811 BUILD_BUG_ON(sizeof(virt_to_page(pgd)->index) < sizeof(mm));
33812@@ -141,6 +206,7 @@ static void pgd_dtor(pgd_t *pgd)
33813 pgd_list_del(pgd);
33814 spin_unlock(&pgd_lock);
33815 }
33816+#endif
33817
33818 /*
33819 * List of all pgd's needed for non-PAE so it can invalidate entries
33820@@ -153,7 +219,7 @@ static void pgd_dtor(pgd_t *pgd)
33821 * -- nyc
33822 */
33823
33824-#ifdef CONFIG_X86_PAE
33825+#if defined(CONFIG_X86_32) && defined(CONFIG_X86_PAE)
33826 /*
33827 * In PAE mode, we need to do a cr3 reload (=tlb flush) when
33828 * updating the top-level pagetable entries to guarantee the
33829@@ -165,7 +231,7 @@ static void pgd_dtor(pgd_t *pgd)
33830 * not shared between pagetables (!SHARED_KERNEL_PMDS), we allocate
33831 * and initialize the kernel pmds here.
33832 */
33833-#define PREALLOCATED_PMDS UNSHARED_PTRS_PER_PGD
33834+#define PREALLOCATED_PXDS (SHARED_KERNEL_PMD ? KERNEL_PGD_BOUNDARY : PTRS_PER_PGD)
33835
33836 void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33837 {
33838@@ -183,46 +249,48 @@ void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd)
33839 */
33840 flush_tlb_mm(mm);
33841 }
33842+#elif defined(CONFIG_X86_64) && defined(CONFIG_PAX_PER_CPU_PGD)
33843+#define PREALLOCATED_PXDS USER_PGD_PTRS
33844 #else /* !CONFIG_X86_PAE */
33845
33846 /* No need to prepopulate any pagetable entries in non-PAE modes. */
33847-#define PREALLOCATED_PMDS 0
33848+#define PREALLOCATED_PXDS 0
33849
33850 #endif /* CONFIG_X86_PAE */
33851
33852-static void free_pmds(struct mm_struct *mm, pmd_t *pmds[])
33853+static void free_pxds(struct mm_struct *mm, pxd_t *pxds[])
33854 {
33855 int i;
33856
33857- for(i = 0; i < PREALLOCATED_PMDS; i++)
33858- if (pmds[i]) {
33859- pgtable_pmd_page_dtor(virt_to_page(pmds[i]));
33860- free_page((unsigned long)pmds[i]);
33861- mm_dec_nr_pmds(mm);
33862+ for(i = 0; i < PREALLOCATED_PXDS; i++)
33863+ if (pxds[i]) {
33864+ pgtable_pxd_page_dtor(virt_to_page(pxds[i]));
33865+ free_page((unsigned long)pxds[i]);
33866+ mm_dec_nr_pxds(mm);
33867 }
33868 }
33869
33870-static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
33871+static int preallocate_pxds(struct mm_struct *mm, pxd_t *pxds[])
33872 {
33873 int i;
33874 bool failed = false;
33875
33876- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33877- pmd_t *pmd = (pmd_t *)__get_free_page(PGALLOC_GFP);
33878- if (!pmd)
33879+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33880+ pxd_t *pxd = (pxd_t *)__get_free_page(PGALLOC_GFP);
33881+ if (!pxd)
33882 failed = true;
33883- if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
33884- free_page((unsigned long)pmd);
33885- pmd = NULL;
33886+ if (pxd && !pgtable_pxd_page_ctor(virt_to_page(pxd))) {
33887+ free_page((unsigned long)pxd);
33888+ pxd = NULL;
33889 failed = true;
33890 }
33891- if (pmd)
33892- mm_inc_nr_pmds(mm);
33893- pmds[i] = pmd;
33894+ if (pxd)
33895+ mm_inc_nr_pxds(mm);
33896+ pxds[i] = pxd;
33897 }
33898
33899 if (failed) {
33900- free_pmds(mm, pmds);
33901+ free_pxds(mm, pxds);
33902 return -ENOMEM;
33903 }
33904
33905@@ -235,50 +303,54 @@ static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[])
33906 * preallocate which never got a corresponding vma will need to be
33907 * freed manually.
33908 */
33909-static void pgd_mop_up_pmds(struct mm_struct *mm, pgd_t *pgdp)
33910+static void pgd_mop_up_pxds(struct mm_struct *mm, pgd_t *pgdp)
33911 {
33912 int i;
33913
33914- for(i = 0; i < PREALLOCATED_PMDS; i++) {
33915+ for(i = 0; i < PREALLOCATED_PXDS; i++) {
33916 pgd_t pgd = pgdp[i];
33917
33918 if (pgd_val(pgd) != 0) {
33919- pmd_t *pmd = (pmd_t *)pgd_page_vaddr(pgd);
33920+ pxd_t *pxd = (pxd_t *)pgd_page_vaddr(pgd);
33921
33922- pgdp[i] = native_make_pgd(0);
33923+ set_pgd(pgdp + i, native_make_pgd(0));
33924
33925- paravirt_release_pmd(pgd_val(pgd) >> PAGE_SHIFT);
33926- pmd_free(mm, pmd);
33927- mm_dec_nr_pmds(mm);
33928+ paravirt_release_pxd(pgd_val(pgd) >> PAGE_SHIFT);
33929+ pxd_free(mm, pxd);
33930+ mm_dec_nr_pxds(mm);
33931 }
33932 }
33933 }
33934
33935-static void pgd_prepopulate_pmd(struct mm_struct *mm, pgd_t *pgd, pmd_t *pmds[])
33936+static void pgd_prepopulate_pxd(struct mm_struct *mm, pgd_t *pgd, pxd_t *pxds[])
33937 {
33938- pud_t *pud;
33939+ pyd_t *pyd;
33940 int i;
33941
33942- if (PREALLOCATED_PMDS == 0) /* Work around gcc-3.4.x bug */
33943+ if (PREALLOCATED_PXDS == 0) /* Work around gcc-3.4.x bug */
33944 return;
33945
33946- pud = pud_offset(pgd, 0);
33947+#ifdef CONFIG_X86_64
33948+ pyd = pyd_offset(mm, 0L);
33949+#else
33950+ pyd = pyd_offset(pgd, 0L);
33951+#endif
33952
33953- for (i = 0; i < PREALLOCATED_PMDS; i++, pud++) {
33954- pmd_t *pmd = pmds[i];
33955+ for (i = 0; i < PREALLOCATED_PXDS; i++, pyd++) {
33956+ pxd_t *pxd = pxds[i];
33957
33958 if (i >= KERNEL_PGD_BOUNDARY)
33959- memcpy(pmd, (pmd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33960- sizeof(pmd_t) * PTRS_PER_PMD);
33961+ memcpy(pxd, (pxd_t *)pgd_page_vaddr(swapper_pg_dir[i]),
33962+ sizeof(pxd_t) * PTRS_PER_PMD);
33963
33964- pud_populate(mm, pud, pmd);
33965+ pyd_populate(mm, pyd, pxd);
33966 }
33967 }
33968
33969 pgd_t *pgd_alloc(struct mm_struct *mm)
33970 {
33971 pgd_t *pgd;
33972- pmd_t *pmds[PREALLOCATED_PMDS];
33973+ pxd_t *pxds[PREALLOCATED_PXDS];
33974
33975 pgd = (pgd_t *)__get_free_page(PGALLOC_GFP);
33976
33977@@ -287,11 +359,11 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33978
33979 mm->pgd = pgd;
33980
33981- if (preallocate_pmds(mm, pmds) != 0)
33982+ if (preallocate_pxds(mm, pxds) != 0)
33983 goto out_free_pgd;
33984
33985 if (paravirt_pgd_alloc(mm) != 0)
33986- goto out_free_pmds;
33987+ goto out_free_pxds;
33988
33989 /*
33990 * Make sure that pre-populating the pmds is atomic with
33991@@ -301,14 +373,14 @@ pgd_t *pgd_alloc(struct mm_struct *mm)
33992 spin_lock(&pgd_lock);
33993
33994 pgd_ctor(mm, pgd);
33995- pgd_prepopulate_pmd(mm, pgd, pmds);
33996+ pgd_prepopulate_pxd(mm, pgd, pxds);
33997
33998 spin_unlock(&pgd_lock);
33999
34000 return pgd;
34001
34002-out_free_pmds:
34003- free_pmds(mm, pmds);
34004+out_free_pxds:
34005+ free_pxds(mm, pxds);
34006 out_free_pgd:
34007 free_page((unsigned long)pgd);
34008 out:
34009@@ -317,7 +389,7 @@ out:
34010
34011 void pgd_free(struct mm_struct *mm, pgd_t *pgd)
34012 {
34013- pgd_mop_up_pmds(mm, pgd);
34014+ pgd_mop_up_pxds(mm, pgd);
34015 pgd_dtor(pgd);
34016 paravirt_pgd_free(mm, pgd);
34017 free_page((unsigned long)pgd);
34018diff --git a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
34019index 75cc097..79a097f 100644
34020--- a/arch/x86/mm/pgtable_32.c
34021+++ b/arch/x86/mm/pgtable_32.c
34022@@ -47,10 +47,13 @@ void set_pte_vaddr(unsigned long vaddr, pte_t pteval)
34023 return;
34024 }
34025 pte = pte_offset_kernel(pmd, vaddr);
34026+
34027+ pax_open_kernel();
34028 if (pte_val(pteval))
34029 set_pte_at(&init_mm, vaddr, pte, pteval);
34030 else
34031 pte_clear(&init_mm, vaddr, pte);
34032+ pax_close_kernel();
34033
34034 /*
34035 * It's enough to flush this one mapping.
34036diff --git a/arch/x86/mm/physaddr.c b/arch/x86/mm/physaddr.c
34037index e666cbb..61788c45 100644
34038--- a/arch/x86/mm/physaddr.c
34039+++ b/arch/x86/mm/physaddr.c
34040@@ -10,7 +10,7 @@
34041 #ifdef CONFIG_X86_64
34042
34043 #ifdef CONFIG_DEBUG_VIRTUAL
34044-unsigned long __phys_addr(unsigned long x)
34045+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34046 {
34047 unsigned long y = x - __START_KERNEL_map;
34048
34049@@ -67,7 +67,7 @@ EXPORT_SYMBOL(__virt_addr_valid);
34050 #else
34051
34052 #ifdef CONFIG_DEBUG_VIRTUAL
34053-unsigned long __phys_addr(unsigned long x)
34054+unsigned long __intentional_overflow(-1) __phys_addr(unsigned long x)
34055 {
34056 unsigned long phys_addr = x - PAGE_OFFSET;
34057 /* VMALLOC_* aren't constants */
34058diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
34059index 90555bf..f5f1828 100644
34060--- a/arch/x86/mm/setup_nx.c
34061+++ b/arch/x86/mm/setup_nx.c
34062@@ -5,8 +5,10 @@
34063 #include <asm/pgtable.h>
34064 #include <asm/proto.h>
34065
34066+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34067 static int disable_nx;
34068
34069+#ifndef CONFIG_PAX_PAGEEXEC
34070 /*
34071 * noexec = on|off
34072 *
34073@@ -28,12 +30,17 @@ static int __init noexec_setup(char *str)
34074 return 0;
34075 }
34076 early_param("noexec", noexec_setup);
34077+#endif
34078+
34079+#endif
34080
34081 void x86_configure_nx(void)
34082 {
34083+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
34084 if (cpu_has_nx && !disable_nx)
34085 __supported_pte_mask |= _PAGE_NX;
34086 else
34087+#endif
34088 __supported_pte_mask &= ~_PAGE_NX;
34089 }
34090
34091diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
34092index 3250f23..7a97ba2 100644
34093--- a/arch/x86/mm/tlb.c
34094+++ b/arch/x86/mm/tlb.c
34095@@ -45,7 +45,11 @@ void leave_mm(int cpu)
34096 BUG();
34097 if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
34098 cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
34099+
34100+#ifndef CONFIG_PAX_PER_CPU_PGD
34101 load_cr3(swapper_pg_dir);
34102+#endif
34103+
34104 /*
34105 * This gets called in the idle path where RCU
34106 * functions differently. Tracing normally
34107diff --git a/arch/x86/mm/uderef_64.c b/arch/x86/mm/uderef_64.c
34108new file mode 100644
34109index 0000000..dace51c
34110--- /dev/null
34111+++ b/arch/x86/mm/uderef_64.c
34112@@ -0,0 +1,37 @@
34113+#include <linux/mm.h>
34114+#include <asm/pgtable.h>
34115+#include <asm/uaccess.h>
34116+
34117+#ifdef CONFIG_PAX_MEMORY_UDEREF
34118+/* PaX: due to the special call convention these functions must
34119+ * - remain leaf functions under all configurations,
34120+ * - never be called directly, only dereferenced from the wrappers.
34121+ */
34122+void __pax_open_userland(void)
34123+{
34124+ unsigned int cpu;
34125+
34126+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34127+ return;
34128+
34129+ cpu = raw_get_cpu();
34130+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_KERNEL);
34131+ write_cr3(__pa(get_cpu_pgd(cpu, user)) | PCID_USER | PCID_NOFLUSH);
34132+ raw_put_cpu_no_resched();
34133+}
34134+EXPORT_SYMBOL(__pax_open_userland);
34135+
34136+void __pax_close_userland(void)
34137+{
34138+ unsigned int cpu;
34139+
34140+ if (unlikely(!segment_eq(get_fs(), USER_DS)))
34141+ return;
34142+
34143+ cpu = raw_get_cpu();
34144+ BUG_ON((read_cr3() & ~PAGE_MASK) != PCID_USER);
34145+ write_cr3(__pa(get_cpu_pgd(cpu, kernel)) | PCID_KERNEL | PCID_NOFLUSH);
34146+ raw_put_cpu_no_resched();
34147+}
34148+EXPORT_SYMBOL(__pax_close_userland);
34149+#endif
34150diff --git a/arch/x86/net/bpf_jit.S b/arch/x86/net/bpf_jit.S
34151index 6440221..f84b5c7 100644
34152--- a/arch/x86/net/bpf_jit.S
34153+++ b/arch/x86/net/bpf_jit.S
34154@@ -9,6 +9,7 @@
34155 */
34156 #include <linux/linkage.h>
34157 #include <asm/dwarf2.h>
34158+#include <asm/alternative-asm.h>
34159
34160 /*
34161 * Calling convention :
34162@@ -38,6 +39,7 @@ sk_load_word_positive_offset:
34163 jle bpf_slow_path_word
34164 mov (SKBDATA,%rsi),%eax
34165 bswap %eax /* ntohl() */
34166+ pax_force_retaddr
34167 ret
34168
34169 sk_load_half:
34170@@ -55,6 +57,7 @@ sk_load_half_positive_offset:
34171 jle bpf_slow_path_half
34172 movzwl (SKBDATA,%rsi),%eax
34173 rol $8,%ax # ntohs()
34174+ pax_force_retaddr
34175 ret
34176
34177 sk_load_byte:
34178@@ -69,6 +72,7 @@ sk_load_byte_positive_offset:
34179 cmp %esi,%r9d /* if (offset >= hlen) goto bpf_slow_path_byte */
34180 jle bpf_slow_path_byte
34181 movzbl (SKBDATA,%rsi),%eax
34182+ pax_force_retaddr
34183 ret
34184
34185 /* rsi contains offset and can be scratched */
34186@@ -90,6 +94,7 @@ bpf_slow_path_word:
34187 js bpf_error
34188 mov - MAX_BPF_STACK + 32(%rbp),%eax
34189 bswap %eax
34190+ pax_force_retaddr
34191 ret
34192
34193 bpf_slow_path_half:
34194@@ -98,12 +103,14 @@ bpf_slow_path_half:
34195 mov - MAX_BPF_STACK + 32(%rbp),%ax
34196 rol $8,%ax
34197 movzwl %ax,%eax
34198+ pax_force_retaddr
34199 ret
34200
34201 bpf_slow_path_byte:
34202 bpf_slow_path_common(1)
34203 js bpf_error
34204 movzbl - MAX_BPF_STACK + 32(%rbp),%eax
34205+ pax_force_retaddr
34206 ret
34207
34208 #define sk_negative_common(SIZE) \
34209@@ -126,6 +133,7 @@ sk_load_word_negative_offset:
34210 sk_negative_common(4)
34211 mov (%rax), %eax
34212 bswap %eax
34213+ pax_force_retaddr
34214 ret
34215
34216 bpf_slow_path_half_neg:
34217@@ -137,6 +145,7 @@ sk_load_half_negative_offset:
34218 mov (%rax),%ax
34219 rol $8,%ax
34220 movzwl %ax,%eax
34221+ pax_force_retaddr
34222 ret
34223
34224 bpf_slow_path_byte_neg:
34225@@ -146,6 +155,7 @@ sk_load_byte_negative_offset:
34226 .globl sk_load_byte_negative_offset
34227 sk_negative_common(1)
34228 movzbl (%rax), %eax
34229+ pax_force_retaddr
34230 ret
34231
34232 bpf_error:
34233@@ -156,4 +166,5 @@ bpf_error:
34234 mov - MAX_BPF_STACK + 16(%rbp),%r14
34235 mov - MAX_BPF_STACK + 24(%rbp),%r15
34236 leaveq
34237+ pax_force_retaddr
34238 ret
34239diff --git a/arch/x86/net/bpf_jit_comp.c b/arch/x86/net/bpf_jit_comp.c
34240index 9875143..00f6656 100644
34241--- a/arch/x86/net/bpf_jit_comp.c
34242+++ b/arch/x86/net/bpf_jit_comp.c
34243@@ -13,7 +13,11 @@
34244 #include <linux/if_vlan.h>
34245 #include <asm/cacheflush.h>
34246
34247+#ifdef CONFIG_GRKERNSEC_BPF_HARDEN
34248+int bpf_jit_enable __read_only;
34249+#else
34250 int bpf_jit_enable __read_mostly;
34251+#endif
34252
34253 /*
34254 * assembly code in arch/x86/net/bpf_jit.S
34255@@ -174,7 +178,9 @@ static u8 add_2reg(u8 byte, u32 dst_reg, u32 src_reg)
34256 static void jit_fill_hole(void *area, unsigned int size)
34257 {
34258 /* fill whole space with int3 instructions */
34259+ pax_open_kernel();
34260 memset(area, 0xcc, size);
34261+ pax_close_kernel();
34262 }
34263
34264 struct jit_context {
34265@@ -896,7 +902,9 @@ common_load:
34266 pr_err("bpf_jit_compile fatal error\n");
34267 return -EFAULT;
34268 }
34269+ pax_open_kernel();
34270 memcpy(image + proglen, temp, ilen);
34271+ pax_close_kernel();
34272 }
34273 proglen += ilen;
34274 addrs[i] = proglen;
34275@@ -968,7 +976,6 @@ void bpf_int_jit_compile(struct bpf_prog *prog)
34276
34277 if (image) {
34278 bpf_flush_icache(header, image + proglen);
34279- set_memory_ro((unsigned long)header, header->pages);
34280 prog->bpf_func = (void *)image;
34281 prog->jited = true;
34282 }
34283@@ -981,12 +988,8 @@ void bpf_jit_free(struct bpf_prog *fp)
34284 unsigned long addr = (unsigned long)fp->bpf_func & PAGE_MASK;
34285 struct bpf_binary_header *header = (void *)addr;
34286
34287- if (!fp->jited)
34288- goto free_filter;
34289+ if (fp->jited)
34290+ bpf_jit_binary_free(header);
34291
34292- set_memory_rw(addr, header->pages);
34293- bpf_jit_binary_free(header);
34294-
34295-free_filter:
34296 bpf_prog_unlock_free(fp);
34297 }
34298diff --git a/arch/x86/oprofile/backtrace.c b/arch/x86/oprofile/backtrace.c
34299index 5d04be5..2beeaa2 100644
34300--- a/arch/x86/oprofile/backtrace.c
34301+++ b/arch/x86/oprofile/backtrace.c
34302@@ -46,11 +46,11 @@ dump_user_backtrace_32(struct stack_frame_ia32 *head)
34303 struct stack_frame_ia32 *fp;
34304 unsigned long bytes;
34305
34306- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34307+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34308 if (bytes != 0)
34309 return NULL;
34310
34311- fp = (struct stack_frame_ia32 *) compat_ptr(bufhead[0].next_frame);
34312+ fp = (struct stack_frame_ia32 __force_kernel *) compat_ptr(bufhead[0].next_frame);
34313
34314 oprofile_add_trace(bufhead[0].return_address);
34315
34316@@ -92,7 +92,7 @@ static struct stack_frame *dump_user_backtrace(struct stack_frame *head)
34317 struct stack_frame bufhead[2];
34318 unsigned long bytes;
34319
34320- bytes = copy_from_user_nmi(bufhead, head, sizeof(bufhead));
34321+ bytes = copy_from_user_nmi(bufhead, (const char __force_user *)head, sizeof(bufhead));
34322 if (bytes != 0)
34323 return NULL;
34324
34325@@ -111,7 +111,7 @@ x86_backtrace(struct pt_regs * const regs, unsigned int depth)
34326 {
34327 struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
34328
34329- if (!user_mode_vm(regs)) {
34330+ if (!user_mode(regs)) {
34331 unsigned long stack = kernel_stack_pointer(regs);
34332 if (depth)
34333 dump_trace(NULL, regs, (unsigned long *)stack, 0,
34334diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
34335index 1d2e639..f6ef82a 100644
34336--- a/arch/x86/oprofile/nmi_int.c
34337+++ b/arch/x86/oprofile/nmi_int.c
34338@@ -23,6 +23,7 @@
34339 #include <asm/nmi.h>
34340 #include <asm/msr.h>
34341 #include <asm/apic.h>
34342+#include <asm/pgtable.h>
34343
34344 #include "op_counter.h"
34345 #include "op_x86_model.h"
34346@@ -785,8 +786,11 @@ int __init op_nmi_init(struct oprofile_operations *ops)
34347 if (ret)
34348 return ret;
34349
34350- if (!model->num_virt_counters)
34351- model->num_virt_counters = model->num_counters;
34352+ if (!model->num_virt_counters) {
34353+ pax_open_kernel();
34354+ *(unsigned int *)&model->num_virt_counters = model->num_counters;
34355+ pax_close_kernel();
34356+ }
34357
34358 mux_init(ops);
34359
34360diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
34361index 50d86c0..7985318 100644
34362--- a/arch/x86/oprofile/op_model_amd.c
34363+++ b/arch/x86/oprofile/op_model_amd.c
34364@@ -519,9 +519,11 @@ static int op_amd_init(struct oprofile_operations *ops)
34365 num_counters = AMD64_NUM_COUNTERS;
34366 }
34367
34368- op_amd_spec.num_counters = num_counters;
34369- op_amd_spec.num_controls = num_counters;
34370- op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34371+ pax_open_kernel();
34372+ *(unsigned int *)&op_amd_spec.num_counters = num_counters;
34373+ *(unsigned int *)&op_amd_spec.num_controls = num_counters;
34374+ *(unsigned int *)&op_amd_spec.num_virt_counters = max(num_counters, NUM_VIRT_COUNTERS);
34375+ pax_close_kernel();
34376
34377 return 0;
34378 }
34379diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
34380index d90528e..0127e2b 100644
34381--- a/arch/x86/oprofile/op_model_ppro.c
34382+++ b/arch/x86/oprofile/op_model_ppro.c
34383@@ -19,6 +19,7 @@
34384 #include <asm/msr.h>
34385 #include <asm/apic.h>
34386 #include <asm/nmi.h>
34387+#include <asm/pgtable.h>
34388
34389 #include "op_x86_model.h"
34390 #include "op_counter.h"
34391@@ -221,8 +222,10 @@ static void arch_perfmon_setup_counters(void)
34392
34393 num_counters = min((int)eax.split.num_counters, OP_MAX_COUNTER);
34394
34395- op_arch_perfmon_spec.num_counters = num_counters;
34396- op_arch_perfmon_spec.num_controls = num_counters;
34397+ pax_open_kernel();
34398+ *(unsigned int *)&op_arch_perfmon_spec.num_counters = num_counters;
34399+ *(unsigned int *)&op_arch_perfmon_spec.num_controls = num_counters;
34400+ pax_close_kernel();
34401 }
34402
34403 static int arch_perfmon_init(struct oprofile_operations *ignore)
34404diff --git a/arch/x86/oprofile/op_x86_model.h b/arch/x86/oprofile/op_x86_model.h
34405index 71e8a67..6a313bb 100644
34406--- a/arch/x86/oprofile/op_x86_model.h
34407+++ b/arch/x86/oprofile/op_x86_model.h
34408@@ -52,7 +52,7 @@ struct op_x86_model_spec {
34409 void (*switch_ctrl)(struct op_x86_model_spec const *model,
34410 struct op_msrs const * const msrs);
34411 #endif
34412-};
34413+} __do_const;
34414
34415 struct op_counter_config;
34416
34417diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid_pci.c
34418index 852aa4c..71613f2 100644
34419--- a/arch/x86/pci/intel_mid_pci.c
34420+++ b/arch/x86/pci/intel_mid_pci.c
34421@@ -258,7 +258,7 @@ int __init intel_mid_pci_init(void)
34422 pci_mmcfg_late_init();
34423 pcibios_enable_irq = intel_mid_pci_irq_enable;
34424 pcibios_disable_irq = intel_mid_pci_irq_disable;
34425- pci_root_ops = intel_mid_pci_ops;
34426+ memcpy((void *)&pci_root_ops, &intel_mid_pci_ops, sizeof pci_root_ops);
34427 pci_soc_mode = 1;
34428 /* Continue with standard init */
34429 return 1;
34430diff --git a/arch/x86/pci/irq.c b/arch/x86/pci/irq.c
34431index 5dc6ca5..25c03f5 100644
34432--- a/arch/x86/pci/irq.c
34433+++ b/arch/x86/pci/irq.c
34434@@ -51,7 +51,7 @@ struct irq_router {
34435 struct irq_router_handler {
34436 u16 vendor;
34437 int (*probe)(struct irq_router *r, struct pci_dev *router, u16 device);
34438-};
34439+} __do_const;
34440
34441 int (*pcibios_enable_irq)(struct pci_dev *dev) = pirq_enable_irq;
34442 void (*pcibios_disable_irq)(struct pci_dev *dev) = pirq_disable_irq;
34443@@ -791,7 +791,7 @@ static __init int pico_router_probe(struct irq_router *r, struct pci_dev *router
34444 return 0;
34445 }
34446
34447-static __initdata struct irq_router_handler pirq_routers[] = {
34448+static __initconst const struct irq_router_handler pirq_routers[] = {
34449 { PCI_VENDOR_ID_INTEL, intel_router_probe },
34450 { PCI_VENDOR_ID_AL, ali_router_probe },
34451 { PCI_VENDOR_ID_ITE, ite_router_probe },
34452@@ -818,7 +818,7 @@ static struct pci_dev *pirq_router_dev;
34453 static void __init pirq_find_router(struct irq_router *r)
34454 {
34455 struct irq_routing_table *rt = pirq_table;
34456- struct irq_router_handler *h;
34457+ const struct irq_router_handler *h;
34458
34459 #ifdef CONFIG_PCI_BIOS
34460 if (!rt->signature) {
34461@@ -1091,7 +1091,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
34462 return 0;
34463 }
34464
34465-static struct dmi_system_id __initdata pciirq_dmi_table[] = {
34466+static const struct dmi_system_id __initconst pciirq_dmi_table[] = {
34467 {
34468 .callback = fix_broken_hp_bios_irq9,
34469 .ident = "HP Pavilion N5400 Series Laptop",
34470diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c
34471index 9b83b90..4112152 100644
34472--- a/arch/x86/pci/pcbios.c
34473+++ b/arch/x86/pci/pcbios.c
34474@@ -79,7 +79,7 @@ union bios32 {
34475 static struct {
34476 unsigned long address;
34477 unsigned short segment;
34478-} bios32_indirect __initdata = { 0, __KERNEL_CS };
34479+} bios32_indirect __initconst = { 0, __PCIBIOS_CS };
34480
34481 /*
34482 * Returns the entry point for the given service, NULL on error
34483@@ -92,37 +92,80 @@ static unsigned long __init bios32_service(unsigned long service)
34484 unsigned long length; /* %ecx */
34485 unsigned long entry; /* %edx */
34486 unsigned long flags;
34487+ struct desc_struct d, *gdt;
34488
34489 local_irq_save(flags);
34490- __asm__("lcall *(%%edi); cld"
34491+
34492+ gdt = get_cpu_gdt_table(smp_processor_id());
34493+
34494+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x9B, 0xC);
34495+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34496+ pack_descriptor(&d, 0UL, 0xFFFFFUL, 0x93, 0xC);
34497+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34498+
34499+ __asm__("movw %w7, %%ds; lcall *(%%edi); push %%ss; pop %%ds; cld"
34500 : "=a" (return_code),
34501 "=b" (address),
34502 "=c" (length),
34503 "=d" (entry)
34504 : "0" (service),
34505 "1" (0),
34506- "D" (&bios32_indirect));
34507+ "D" (&bios32_indirect),
34508+ "r"(__PCIBIOS_DS)
34509+ : "memory");
34510+
34511+ pax_open_kernel();
34512+ gdt[GDT_ENTRY_PCIBIOS_CS].a = 0;
34513+ gdt[GDT_ENTRY_PCIBIOS_CS].b = 0;
34514+ gdt[GDT_ENTRY_PCIBIOS_DS].a = 0;
34515+ gdt[GDT_ENTRY_PCIBIOS_DS].b = 0;
34516+ pax_close_kernel();
34517+
34518 local_irq_restore(flags);
34519
34520 switch (return_code) {
34521- case 0:
34522- return address + entry;
34523- case 0x80: /* Not present */
34524- printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34525- return 0;
34526- default: /* Shouldn't happen */
34527- printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34528- service, return_code);
34529+ case 0: {
34530+ int cpu;
34531+ unsigned char flags;
34532+
34533+ printk(KERN_INFO "bios32_service: base:%08lx length:%08lx entry:%08lx\n", address, length, entry);
34534+ if (address >= 0xFFFF0 || length > 0x100000 - address || length <= entry) {
34535+ printk(KERN_WARNING "bios32_service: not valid\n");
34536 return 0;
34537+ }
34538+ address = address + PAGE_OFFSET;
34539+ length += 16UL; /* some BIOSs underreport this... */
34540+ flags = 4;
34541+ if (length >= 64*1024*1024) {
34542+ length >>= PAGE_SHIFT;
34543+ flags |= 8;
34544+ }
34545+
34546+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
34547+ gdt = get_cpu_gdt_table(cpu);
34548+ pack_descriptor(&d, address, length, 0x9b, flags);
34549+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_CS, &d, DESCTYPE_S);
34550+ pack_descriptor(&d, address, length, 0x93, flags);
34551+ write_gdt_entry(gdt, GDT_ENTRY_PCIBIOS_DS, &d, DESCTYPE_S);
34552+ }
34553+ return entry;
34554+ }
34555+ case 0x80: /* Not present */
34556+ printk(KERN_WARNING "bios32_service(0x%lx): not present\n", service);
34557+ return 0;
34558+ default: /* Shouldn't happen */
34559+ printk(KERN_WARNING "bios32_service(0x%lx): returned 0x%x -- BIOS bug!\n",
34560+ service, return_code);
34561+ return 0;
34562 }
34563 }
34564
34565 static struct {
34566 unsigned long address;
34567 unsigned short segment;
34568-} pci_indirect = { 0, __KERNEL_CS };
34569+} pci_indirect __read_only = { 0, __PCIBIOS_CS };
34570
34571-static int pci_bios_present;
34572+static int pci_bios_present __read_only;
34573
34574 static int __init check_pcibios(void)
34575 {
34576@@ -131,11 +174,13 @@ static int __init check_pcibios(void)
34577 unsigned long flags, pcibios_entry;
34578
34579 if ((pcibios_entry = bios32_service(PCI_SERVICE))) {
34580- pci_indirect.address = pcibios_entry + PAGE_OFFSET;
34581+ pci_indirect.address = pcibios_entry;
34582
34583 local_irq_save(flags);
34584- __asm__(
34585- "lcall *(%%edi); cld\n\t"
34586+ __asm__("movw %w6, %%ds\n\t"
34587+ "lcall *%%ss:(%%edi); cld\n\t"
34588+ "push %%ss\n\t"
34589+ "pop %%ds\n\t"
34590 "jc 1f\n\t"
34591 "xor %%ah, %%ah\n"
34592 "1:"
34593@@ -144,7 +189,8 @@ static int __init check_pcibios(void)
34594 "=b" (ebx),
34595 "=c" (ecx)
34596 : "1" (PCIBIOS_PCI_BIOS_PRESENT),
34597- "D" (&pci_indirect)
34598+ "D" (&pci_indirect),
34599+ "r" (__PCIBIOS_DS)
34600 : "memory");
34601 local_irq_restore(flags);
34602
34603@@ -189,7 +235,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34604
34605 switch (len) {
34606 case 1:
34607- __asm__("lcall *(%%esi); cld\n\t"
34608+ __asm__("movw %w6, %%ds\n\t"
34609+ "lcall *%%ss:(%%esi); cld\n\t"
34610+ "push %%ss\n\t"
34611+ "pop %%ds\n\t"
34612 "jc 1f\n\t"
34613 "xor %%ah, %%ah\n"
34614 "1:"
34615@@ -198,7 +247,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34616 : "1" (PCIBIOS_READ_CONFIG_BYTE),
34617 "b" (bx),
34618 "D" ((long)reg),
34619- "S" (&pci_indirect));
34620+ "S" (&pci_indirect),
34621+ "r" (__PCIBIOS_DS));
34622 /*
34623 * Zero-extend the result beyond 8 bits, do not trust the
34624 * BIOS having done it:
34625@@ -206,7 +256,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34626 *value &= 0xff;
34627 break;
34628 case 2:
34629- __asm__("lcall *(%%esi); cld\n\t"
34630+ __asm__("movw %w6, %%ds\n\t"
34631+ "lcall *%%ss:(%%esi); cld\n\t"
34632+ "push %%ss\n\t"
34633+ "pop %%ds\n\t"
34634 "jc 1f\n\t"
34635 "xor %%ah, %%ah\n"
34636 "1:"
34637@@ -215,7 +268,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34638 : "1" (PCIBIOS_READ_CONFIG_WORD),
34639 "b" (bx),
34640 "D" ((long)reg),
34641- "S" (&pci_indirect));
34642+ "S" (&pci_indirect),
34643+ "r" (__PCIBIOS_DS));
34644 /*
34645 * Zero-extend the result beyond 16 bits, do not trust the
34646 * BIOS having done it:
34647@@ -223,7 +277,10 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34648 *value &= 0xffff;
34649 break;
34650 case 4:
34651- __asm__("lcall *(%%esi); cld\n\t"
34652+ __asm__("movw %w6, %%ds\n\t"
34653+ "lcall *%%ss:(%%esi); cld\n\t"
34654+ "push %%ss\n\t"
34655+ "pop %%ds\n\t"
34656 "jc 1f\n\t"
34657 "xor %%ah, %%ah\n"
34658 "1:"
34659@@ -232,7 +289,8 @@ static int pci_bios_read(unsigned int seg, unsigned int bus,
34660 : "1" (PCIBIOS_READ_CONFIG_DWORD),
34661 "b" (bx),
34662 "D" ((long)reg),
34663- "S" (&pci_indirect));
34664+ "S" (&pci_indirect),
34665+ "r" (__PCIBIOS_DS));
34666 break;
34667 }
34668
34669@@ -256,7 +314,10 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34670
34671 switch (len) {
34672 case 1:
34673- __asm__("lcall *(%%esi); cld\n\t"
34674+ __asm__("movw %w6, %%ds\n\t"
34675+ "lcall *%%ss:(%%esi); cld\n\t"
34676+ "push %%ss\n\t"
34677+ "pop %%ds\n\t"
34678 "jc 1f\n\t"
34679 "xor %%ah, %%ah\n"
34680 "1:"
34681@@ -265,10 +326,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34682 "c" (value),
34683 "b" (bx),
34684 "D" ((long)reg),
34685- "S" (&pci_indirect));
34686+ "S" (&pci_indirect),
34687+ "r" (__PCIBIOS_DS));
34688 break;
34689 case 2:
34690- __asm__("lcall *(%%esi); cld\n\t"
34691+ __asm__("movw %w6, %%ds\n\t"
34692+ "lcall *%%ss:(%%esi); cld\n\t"
34693+ "push %%ss\n\t"
34694+ "pop %%ds\n\t"
34695 "jc 1f\n\t"
34696 "xor %%ah, %%ah\n"
34697 "1:"
34698@@ -277,10 +342,14 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34699 "c" (value),
34700 "b" (bx),
34701 "D" ((long)reg),
34702- "S" (&pci_indirect));
34703+ "S" (&pci_indirect),
34704+ "r" (__PCIBIOS_DS));
34705 break;
34706 case 4:
34707- __asm__("lcall *(%%esi); cld\n\t"
34708+ __asm__("movw %w6, %%ds\n\t"
34709+ "lcall *%%ss:(%%esi); cld\n\t"
34710+ "push %%ss\n\t"
34711+ "pop %%ds\n\t"
34712 "jc 1f\n\t"
34713 "xor %%ah, %%ah\n"
34714 "1:"
34715@@ -289,7 +358,8 @@ static int pci_bios_write(unsigned int seg, unsigned int bus,
34716 "c" (value),
34717 "b" (bx),
34718 "D" ((long)reg),
34719- "S" (&pci_indirect));
34720+ "S" (&pci_indirect),
34721+ "r" (__PCIBIOS_DS));
34722 break;
34723 }
34724
34725@@ -394,10 +464,13 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34726
34727 DBG("PCI: Fetching IRQ routing table... ");
34728 __asm__("push %%es\n\t"
34729+ "movw %w8, %%ds\n\t"
34730 "push %%ds\n\t"
34731 "pop %%es\n\t"
34732- "lcall *(%%esi); cld\n\t"
34733+ "lcall *%%ss:(%%esi); cld\n\t"
34734 "pop %%es\n\t"
34735+ "push %%ss\n\t"
34736+ "pop %%ds\n"
34737 "jc 1f\n\t"
34738 "xor %%ah, %%ah\n"
34739 "1:"
34740@@ -408,7 +481,8 @@ struct irq_routing_table * pcibios_get_irq_routing_table(void)
34741 "1" (0),
34742 "D" ((long) &opt),
34743 "S" (&pci_indirect),
34744- "m" (opt)
34745+ "m" (opt),
34746+ "r" (__PCIBIOS_DS)
34747 : "memory");
34748 DBG("OK ret=%d, size=%d, map=%x\n", ret, opt.size, map);
34749 if (ret & 0xff00)
34750@@ -432,7 +506,10 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34751 {
34752 int ret;
34753
34754- __asm__("lcall *(%%esi); cld\n\t"
34755+ __asm__("movw %w5, %%ds\n\t"
34756+ "lcall *%%ss:(%%esi); cld\n\t"
34757+ "push %%ss\n\t"
34758+ "pop %%ds\n"
34759 "jc 1f\n\t"
34760 "xor %%ah, %%ah\n"
34761 "1:"
34762@@ -440,7 +517,8 @@ int pcibios_set_irq_routing(struct pci_dev *dev, int pin, int irq)
34763 : "0" (PCIBIOS_SET_PCI_HW_INT),
34764 "b" ((dev->bus->number << 8) | dev->devfn),
34765 "c" ((irq << 8) | (pin + 10)),
34766- "S" (&pci_indirect));
34767+ "S" (&pci_indirect),
34768+ "r" (__PCIBIOS_DS));
34769 return !(ret & 0xff00);
34770 }
34771 EXPORT_SYMBOL(pcibios_set_irq_routing);
34772diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c
34773index 40e7cda..c7e6672 100644
34774--- a/arch/x86/platform/efi/efi_32.c
34775+++ b/arch/x86/platform/efi/efi_32.c
34776@@ -61,11 +61,22 @@ void __init efi_call_phys_prolog(void)
34777 {
34778 struct desc_ptr gdt_descr;
34779
34780+#ifdef CONFIG_PAX_KERNEXEC
34781+ struct desc_struct d;
34782+#endif
34783+
34784 local_irq_save(efi_rt_eflags);
34785
34786 load_cr3(initial_page_table);
34787 __flush_tlb_all();
34788
34789+#ifdef CONFIG_PAX_KERNEXEC
34790+ pack_descriptor(&d, 0, 0xFFFFF, 0x9B, 0xC);
34791+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34792+ pack_descriptor(&d, 0, 0xFFFFF, 0x93, 0xC);
34793+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34794+#endif
34795+
34796 gdt_descr.address = __pa(get_cpu_gdt_table(0));
34797 gdt_descr.size = GDT_SIZE - 1;
34798 load_gdt(&gdt_descr);
34799@@ -75,11 +86,24 @@ void __init efi_call_phys_epilog(void)
34800 {
34801 struct desc_ptr gdt_descr;
34802
34803+#ifdef CONFIG_PAX_KERNEXEC
34804+ struct desc_struct d;
34805+
34806+ memset(&d, 0, sizeof d);
34807+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_CS, &d, DESCTYPE_S);
34808+ write_gdt_entry(get_cpu_gdt_table(0), GDT_ENTRY_KERNEXEC_EFI_DS, &d, DESCTYPE_S);
34809+#endif
34810+
34811 gdt_descr.address = (unsigned long)get_cpu_gdt_table(0);
34812 gdt_descr.size = GDT_SIZE - 1;
34813 load_gdt(&gdt_descr);
34814
34815+#ifdef CONFIG_PAX_PER_CPU_PGD
34816+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34817+#else
34818 load_cr3(swapper_pg_dir);
34819+#endif
34820+
34821 __flush_tlb_all();
34822
34823 local_irq_restore(efi_rt_eflags);
34824diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c
34825index 17e80d8..9fa6e41 100644
34826--- a/arch/x86/platform/efi/efi_64.c
34827+++ b/arch/x86/platform/efi/efi_64.c
34828@@ -98,6 +98,11 @@ void __init efi_call_phys_prolog(void)
34829 vaddress = (unsigned long)__va(pgd * PGDIR_SIZE);
34830 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), *pgd_offset_k(vaddress));
34831 }
34832+
34833+#ifdef CONFIG_PAX_PER_CPU_PGD
34834+ load_cr3(swapper_pg_dir);
34835+#endif
34836+
34837 __flush_tlb_all();
34838 }
34839
34840@@ -115,6 +120,11 @@ void __init efi_call_phys_epilog(void)
34841 for (pgd = 0; pgd < n_pgds; pgd++)
34842 set_pgd(pgd_offset_k(pgd * PGDIR_SIZE), save_pgd[pgd]);
34843 kfree(save_pgd);
34844+
34845+#ifdef CONFIG_PAX_PER_CPU_PGD
34846+ load_cr3(get_cpu_pgd(smp_processor_id(), kernel));
34847+#endif
34848+
34849 __flush_tlb_all();
34850 local_irq_restore(efi_flags);
34851 early_code_mapping_set_exec(0);
34852@@ -145,8 +155,23 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages)
34853 unsigned npages;
34854 pgd_t *pgd;
34855
34856- if (efi_enabled(EFI_OLD_MEMMAP))
34857+ if (efi_enabled(EFI_OLD_MEMMAP)) {
34858+ /* PaX: We need to disable the NX bit in the PGD, otherwise we won't be
34859+ * able to execute the EFI services.
34860+ */
34861+ if (__supported_pte_mask & _PAGE_NX) {
34862+ unsigned long addr = (unsigned long) __va(0);
34863+ pgd_t pe = __pgd(pgd_val(*pgd_offset_k(addr)) & ~_PAGE_NX);
34864+
34865+ pr_alert("PAX: Disabling NX protection for low memory map. Try booting without \"efi=old_map\"\n");
34866+#ifdef CONFIG_PAX_PER_CPU_PGD
34867+ set_pgd(pgd_offset_cpu(0, kernel, addr), pe);
34868+#endif
34869+ set_pgd(pgd_offset_k(addr), pe);
34870+ }
34871+
34872 return 0;
34873+ }
34874
34875 efi_scratch.efi_pgt = (pgd_t *)(unsigned long)real_mode_header->trampoline_pgd;
34876 pgd = __va(efi_scratch.efi_pgt);
34877diff --git a/arch/x86/platform/efi/efi_stub_32.S b/arch/x86/platform/efi/efi_stub_32.S
34878index 040192b..7d3300f 100644
34879--- a/arch/x86/platform/efi/efi_stub_32.S
34880+++ b/arch/x86/platform/efi/efi_stub_32.S
34881@@ -6,7 +6,9 @@
34882 */
34883
34884 #include <linux/linkage.h>
34885+#include <linux/init.h>
34886 #include <asm/page_types.h>
34887+#include <asm/segment.h>
34888
34889 /*
34890 * efi_call_phys(void *, ...) is a function with variable parameters.
34891@@ -20,7 +22,7 @@
34892 * service functions will comply with gcc calling convention, too.
34893 */
34894
34895-.text
34896+__INIT
34897 ENTRY(efi_call_phys)
34898 /*
34899 * 0. The function can only be called in Linux kernel. So CS has been
34900@@ -36,10 +38,24 @@ ENTRY(efi_call_phys)
34901 * The mapping of lower virtual memory has been created in prolog and
34902 * epilog.
34903 */
34904- movl $1f, %edx
34905- subl $__PAGE_OFFSET, %edx
34906- jmp *%edx
34907+#ifdef CONFIG_PAX_KERNEXEC
34908+ movl $(__KERNEXEC_EFI_DS), %edx
34909+ mov %edx, %ds
34910+ mov %edx, %es
34911+ mov %edx, %ss
34912+ addl $2f,(1f)
34913+ ljmp *(1f)
34914+
34915+__INITDATA
34916+1: .long __LOAD_PHYSICAL_ADDR, __KERNEXEC_EFI_CS
34917+.previous
34918+
34919+2:
34920+ subl $2b,(1b)
34921+#else
34922+ jmp 1f-__PAGE_OFFSET
34923 1:
34924+#endif
34925
34926 /*
34927 * 2. Now on the top of stack is the return
34928@@ -47,14 +63,8 @@ ENTRY(efi_call_phys)
34929 * parameter 2, ..., param n. To make things easy, we save the return
34930 * address of efi_call_phys in a global variable.
34931 */
34932- popl %edx
34933- movl %edx, saved_return_addr
34934- /* get the function pointer into ECX*/
34935- popl %ecx
34936- movl %ecx, efi_rt_function_ptr
34937- movl $2f, %edx
34938- subl $__PAGE_OFFSET, %edx
34939- pushl %edx
34940+ popl (saved_return_addr)
34941+ popl (efi_rt_function_ptr)
34942
34943 /*
34944 * 3. Clear PG bit in %CR0.
34945@@ -73,9 +83,8 @@ ENTRY(efi_call_phys)
34946 /*
34947 * 5. Call the physical function.
34948 */
34949- jmp *%ecx
34950+ call *(efi_rt_function_ptr-__PAGE_OFFSET)
34951
34952-2:
34953 /*
34954 * 6. After EFI runtime service returns, control will return to
34955 * following instruction. We'd better readjust stack pointer first.
34956@@ -88,35 +97,36 @@ ENTRY(efi_call_phys)
34957 movl %cr0, %edx
34958 orl $0x80000000, %edx
34959 movl %edx, %cr0
34960- jmp 1f
34961-1:
34962+
34963 /*
34964 * 8. Now restore the virtual mode from flat mode by
34965 * adding EIP with PAGE_OFFSET.
34966 */
34967- movl $1f, %edx
34968- jmp *%edx
34969+#ifdef CONFIG_PAX_KERNEXEC
34970+ movl $(__KERNEL_DS), %edx
34971+ mov %edx, %ds
34972+ mov %edx, %es
34973+ mov %edx, %ss
34974+ ljmp $(__KERNEL_CS),$1f
34975+#else
34976+ jmp 1f+__PAGE_OFFSET
34977+#endif
34978 1:
34979
34980 /*
34981 * 9. Balance the stack. And because EAX contain the return value,
34982 * we'd better not clobber it.
34983 */
34984- leal efi_rt_function_ptr, %edx
34985- movl (%edx), %ecx
34986- pushl %ecx
34987+ pushl (efi_rt_function_ptr)
34988
34989 /*
34990- * 10. Push the saved return address onto the stack and return.
34991+ * 10. Return to the saved return address.
34992 */
34993- leal saved_return_addr, %edx
34994- movl (%edx), %ecx
34995- pushl %ecx
34996- ret
34997+ jmpl *(saved_return_addr)
34998 ENDPROC(efi_call_phys)
34999 .previous
35000
35001-.data
35002+__INITDATA
35003 saved_return_addr:
35004 .long 0
35005 efi_rt_function_ptr:
35006diff --git a/arch/x86/platform/efi/efi_stub_64.S b/arch/x86/platform/efi/efi_stub_64.S
35007index 86d0f9e..6d499f4 100644
35008--- a/arch/x86/platform/efi/efi_stub_64.S
35009+++ b/arch/x86/platform/efi/efi_stub_64.S
35010@@ -11,6 +11,7 @@
35011 #include <asm/msr.h>
35012 #include <asm/processor-flags.h>
35013 #include <asm/page_types.h>
35014+#include <asm/alternative-asm.h>
35015
35016 #define SAVE_XMM \
35017 mov %rsp, %rax; \
35018@@ -88,6 +89,7 @@ ENTRY(efi_call)
35019 RESTORE_PGT
35020 addq $48, %rsp
35021 RESTORE_XMM
35022+ pax_force_retaddr 0, 1
35023 ret
35024 ENDPROC(efi_call)
35025
35026diff --git a/arch/x86/platform/intel-mid/intel-mid.c b/arch/x86/platform/intel-mid/intel-mid.c
35027index 3005f0c..d06aeb0 100644
35028--- a/arch/x86/platform/intel-mid/intel-mid.c
35029+++ b/arch/x86/platform/intel-mid/intel-mid.c
35030@@ -63,7 +63,7 @@ enum intel_mid_timer_options intel_mid_timer_options;
35031 /* intel_mid_ops to store sub arch ops */
35032 struct intel_mid_ops *intel_mid_ops;
35033 /* getter function for sub arch ops*/
35034-static void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35035+static const void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
35036 enum intel_mid_cpu_type __intel_mid_cpu_chip;
35037 EXPORT_SYMBOL_GPL(__intel_mid_cpu_chip);
35038
35039@@ -71,9 +71,10 @@ static void intel_mid_power_off(void)
35040 {
35041 };
35042
35043-static void intel_mid_reboot(void)
35044+static void __noreturn intel_mid_reboot(void)
35045 {
35046 intel_scu_ipc_simple_command(IPCMSG_COLD_BOOT, 0);
35047+ BUG();
35048 }
35049
35050 static unsigned long __init intel_mid_calibrate_tsc(void)
35051diff --git a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35052index 3c1c386..59a68ed 100644
35053--- a/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35054+++ b/arch/x86/platform/intel-mid/intel_mid_weak_decls.h
35055@@ -13,6 +13,6 @@
35056 /* For every CPU addition a new get_<cpuname>_ops interface needs
35057 * to be added.
35058 */
35059-extern void *get_penwell_ops(void);
35060-extern void *get_cloverview_ops(void);
35061-extern void *get_tangier_ops(void);
35062+extern const void *get_penwell_ops(void);
35063+extern const void *get_cloverview_ops(void);
35064+extern const void *get_tangier_ops(void);
35065diff --git a/arch/x86/platform/intel-mid/mfld.c b/arch/x86/platform/intel-mid/mfld.c
35066index 23381d2..8ddc10e 100644
35067--- a/arch/x86/platform/intel-mid/mfld.c
35068+++ b/arch/x86/platform/intel-mid/mfld.c
35069@@ -64,12 +64,12 @@ static void __init penwell_arch_setup(void)
35070 pm_power_off = mfld_power_off;
35071 }
35072
35073-void *get_penwell_ops(void)
35074+const void *get_penwell_ops(void)
35075 {
35076 return &penwell_ops;
35077 }
35078
35079-void *get_cloverview_ops(void)
35080+const void *get_cloverview_ops(void)
35081 {
35082 return &penwell_ops;
35083 }
35084diff --git a/arch/x86/platform/intel-mid/mrfl.c b/arch/x86/platform/intel-mid/mrfl.c
35085index aaca917..66eadbc 100644
35086--- a/arch/x86/platform/intel-mid/mrfl.c
35087+++ b/arch/x86/platform/intel-mid/mrfl.c
35088@@ -97,7 +97,7 @@ static struct intel_mid_ops tangier_ops = {
35089 .arch_setup = tangier_arch_setup,
35090 };
35091
35092-void *get_tangier_ops(void)
35093+const void *get_tangier_ops(void)
35094 {
35095 return &tangier_ops;
35096 }
35097diff --git a/arch/x86/platform/intel-quark/imr_selftest.c b/arch/x86/platform/intel-quark/imr_selftest.c
35098index c9a0838..fae0977 100644
35099--- a/arch/x86/platform/intel-quark/imr_selftest.c
35100+++ b/arch/x86/platform/intel-quark/imr_selftest.c
35101@@ -54,7 +54,7 @@ static void __init imr_self_test_result(int res, const char *fmt, ...)
35102 */
35103 static void __init imr_self_test(void)
35104 {
35105- phys_addr_t base = virt_to_phys(&_text);
35106+ phys_addr_t base = virt_to_phys(ktla_ktva(_text));
35107 size_t size = virt_to_phys(&__end_rodata) - base;
35108 const char *fmt_over = "overlapped IMR @ (0x%08lx - 0x%08lx)\n";
35109 int ret;
35110diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
35111index d6ee929..3637cb5 100644
35112--- a/arch/x86/platform/olpc/olpc_dt.c
35113+++ b/arch/x86/platform/olpc/olpc_dt.c
35114@@ -156,7 +156,7 @@ void * __init prom_early_alloc(unsigned long size)
35115 return res;
35116 }
35117
35118-static struct of_pdt_ops prom_olpc_ops __initdata = {
35119+static struct of_pdt_ops prom_olpc_ops __initconst = {
35120 .nextprop = olpc_dt_nextprop,
35121 .getproplen = olpc_dt_getproplen,
35122 .getproperty = olpc_dt_getproperty,
35123diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
35124index 3e32ed5..cc0adc5 100644
35125--- a/arch/x86/power/cpu.c
35126+++ b/arch/x86/power/cpu.c
35127@@ -134,11 +134,8 @@ static void do_fpu_end(void)
35128 static void fix_processor_context(void)
35129 {
35130 int cpu = smp_processor_id();
35131- struct tss_struct *t = &per_cpu(init_tss, cpu);
35132-#ifdef CONFIG_X86_64
35133- struct desc_struct *desc = get_cpu_gdt_table(cpu);
35134- tss_desc tss;
35135-#endif
35136+ struct tss_struct *t = init_tss + cpu;
35137+
35138 set_tss_desc(cpu, t); /*
35139 * This just modifies memory; should not be
35140 * necessary. But... This is necessary, because
35141@@ -147,10 +144,6 @@ static void fix_processor_context(void)
35142 */
35143
35144 #ifdef CONFIG_X86_64
35145- memcpy(&tss, &desc[GDT_ENTRY_TSS], sizeof(tss_desc));
35146- tss.type = 0x9; /* The available 64-bit TSS (see AMD vol 2, pg 91 */
35147- write_gdt_entry(desc, GDT_ENTRY_TSS, &tss, DESC_TSS);
35148-
35149 syscall_init(); /* This sets MSR_*STAR and related */
35150 #endif
35151 load_TR_desc(); /* This does ltr */
35152diff --git a/arch/x86/realmode/init.c b/arch/x86/realmode/init.c
35153index 0b7a63d..0d0f2c2 100644
35154--- a/arch/x86/realmode/init.c
35155+++ b/arch/x86/realmode/init.c
35156@@ -68,7 +68,13 @@ void __init setup_real_mode(void)
35157 __va(real_mode_header->trampoline_header);
35158
35159 #ifdef CONFIG_X86_32
35160- trampoline_header->start = __pa_symbol(startup_32_smp);
35161+ trampoline_header->start = __pa_symbol(ktla_ktva(startup_32_smp));
35162+
35163+#ifdef CONFIG_PAX_KERNEXEC
35164+ trampoline_header->start -= LOAD_PHYSICAL_ADDR;
35165+#endif
35166+
35167+ trampoline_header->boot_cs = __BOOT_CS;
35168 trampoline_header->gdt_limit = __BOOT_DS + 7;
35169 trampoline_header->gdt_base = __pa_symbol(boot_gdt);
35170 #else
35171@@ -84,7 +90,7 @@ void __init setup_real_mode(void)
35172 *trampoline_cr4_features = __read_cr4();
35173
35174 trampoline_pgd = (u64 *) __va(real_mode_header->trampoline_pgd);
35175- trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd;
35176+ trampoline_pgd[0] = init_level4_pgt[pgd_index(__PAGE_OFFSET)].pgd & ~_PAGE_NX;
35177 trampoline_pgd[511] = init_level4_pgt[511].pgd;
35178 #endif
35179 }
35180diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
35181index 2730d77..2e4cd19 100644
35182--- a/arch/x86/realmode/rm/Makefile
35183+++ b/arch/x86/realmode/rm/Makefile
35184@@ -68,5 +68,8 @@ $(obj)/realmode.relocs: $(obj)/realmode.elf FORCE
35185
35186 KBUILD_CFLAGS := $(LINUXINCLUDE) $(REALMODE_CFLAGS) -D_SETUP -D_WAKEUP \
35187 -I$(srctree)/arch/x86/boot
35188+ifdef CONSTIFY_PLUGIN
35189+KBUILD_CFLAGS += -fplugin-arg-constify_plugin-no-constify
35190+endif
35191 KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
35192 GCOV_PROFILE := n
35193diff --git a/arch/x86/realmode/rm/header.S b/arch/x86/realmode/rm/header.S
35194index a28221d..93c40f1 100644
35195--- a/arch/x86/realmode/rm/header.S
35196+++ b/arch/x86/realmode/rm/header.S
35197@@ -30,7 +30,9 @@ GLOBAL(real_mode_header)
35198 #endif
35199 /* APM/BIOS reboot */
35200 .long pa_machine_real_restart_asm
35201-#ifdef CONFIG_X86_64
35202+#ifdef CONFIG_X86_32
35203+ .long __KERNEL_CS
35204+#else
35205 .long __KERNEL32_CS
35206 #endif
35207 END(real_mode_header)
35208diff --git a/arch/x86/realmode/rm/reboot.S b/arch/x86/realmode/rm/reboot.S
35209index d66c607..3def845 100644
35210--- a/arch/x86/realmode/rm/reboot.S
35211+++ b/arch/x86/realmode/rm/reboot.S
35212@@ -27,6 +27,10 @@ ENTRY(machine_real_restart_asm)
35213 lgdtl pa_tr_gdt
35214
35215 /* Disable paging to drop us out of long mode */
35216+ movl %cr4, %eax
35217+ andl $~X86_CR4_PCIDE, %eax
35218+ movl %eax, %cr4
35219+
35220 movl %cr0, %eax
35221 andl $~X86_CR0_PG, %eax
35222 movl %eax, %cr0
35223diff --git a/arch/x86/realmode/rm/trampoline_32.S b/arch/x86/realmode/rm/trampoline_32.S
35224index 48ddd76..c26749f 100644
35225--- a/arch/x86/realmode/rm/trampoline_32.S
35226+++ b/arch/x86/realmode/rm/trampoline_32.S
35227@@ -24,6 +24,12 @@
35228 #include <asm/page_types.h>
35229 #include "realmode.h"
35230
35231+#ifdef CONFIG_PAX_KERNEXEC
35232+#define ta(X) (X)
35233+#else
35234+#define ta(X) (pa_ ## X)
35235+#endif
35236+
35237 .text
35238 .code16
35239
35240@@ -38,8 +44,6 @@ ENTRY(trampoline_start)
35241
35242 cli # We should be safe anyway
35243
35244- movl tr_start, %eax # where we need to go
35245-
35246 movl $0xA5A5A5A5, trampoline_status
35247 # write marker for master knows we're running
35248
35249@@ -55,7 +59,7 @@ ENTRY(trampoline_start)
35250 movw $1, %dx # protected mode (PE) bit
35251 lmsw %dx # into protected mode
35252
35253- ljmpl $__BOOT_CS, $pa_startup_32
35254+ ljmpl *(trampoline_header)
35255
35256 .section ".text32","ax"
35257 .code32
35258@@ -66,7 +70,7 @@ ENTRY(startup_32) # note: also used from wakeup_asm.S
35259 .balign 8
35260 GLOBAL(trampoline_header)
35261 tr_start: .space 4
35262- tr_gdt_pad: .space 2
35263+ tr_boot_cs: .space 2
35264 tr_gdt: .space 6
35265 END(trampoline_header)
35266
35267diff --git a/arch/x86/realmode/rm/trampoline_64.S b/arch/x86/realmode/rm/trampoline_64.S
35268index dac7b20..72dbaca 100644
35269--- a/arch/x86/realmode/rm/trampoline_64.S
35270+++ b/arch/x86/realmode/rm/trampoline_64.S
35271@@ -93,6 +93,7 @@ ENTRY(startup_32)
35272 movl %edx, %gs
35273
35274 movl pa_tr_cr4, %eax
35275+ andl $~X86_CR4_PCIDE, %eax
35276 movl %eax, %cr4 # Enable PAE mode
35277
35278 # Setup trampoline 4 level pagetables
35279@@ -106,7 +107,7 @@ ENTRY(startup_32)
35280 wrmsr
35281
35282 # Enable paging and in turn activate Long Mode
35283- movl $(X86_CR0_PG | X86_CR0_WP | X86_CR0_PE), %eax
35284+ movl $(X86_CR0_PG | X86_CR0_PE), %eax
35285 movl %eax, %cr0
35286
35287 /*
35288diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S
35289index 9e7e147..25a4158 100644
35290--- a/arch/x86/realmode/rm/wakeup_asm.S
35291+++ b/arch/x86/realmode/rm/wakeup_asm.S
35292@@ -126,11 +126,10 @@ ENTRY(wakeup_start)
35293 lgdtl pmode_gdt
35294
35295 /* This really couldn't... */
35296- movl pmode_entry, %eax
35297 movl pmode_cr0, %ecx
35298 movl %ecx, %cr0
35299- ljmpl $__KERNEL_CS, $pa_startup_32
35300- /* -> jmp *%eax in trampoline_32.S */
35301+
35302+ ljmpl *pmode_entry
35303 #else
35304 jmp trampoline_start
35305 #endif
35306diff --git a/arch/x86/tools/Makefile b/arch/x86/tools/Makefile
35307index 604a37e..e49702a 100644
35308--- a/arch/x86/tools/Makefile
35309+++ b/arch/x86/tools/Makefile
35310@@ -37,7 +37,7 @@ $(obj)/test_get_len.o: $(srctree)/arch/x86/lib/insn.c $(srctree)/arch/x86/lib/in
35311
35312 $(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
35313
35314-HOST_EXTRACFLAGS += -I$(srctree)/tools/include
35315+HOST_EXTRACFLAGS += -I$(srctree)/tools/include -ggdb
35316 hostprogs-y += relocs
35317 relocs-objs := relocs_32.o relocs_64.o relocs_common.o
35318 PHONY += relocs
35319diff --git a/arch/x86/tools/relocs.c b/arch/x86/tools/relocs.c
35320index 0c2fae8..88036b7 100644
35321--- a/arch/x86/tools/relocs.c
35322+++ b/arch/x86/tools/relocs.c
35323@@ -1,5 +1,7 @@
35324 /* This is included from relocs_32/64.c */
35325
35326+#include "../../../include/generated/autoconf.h"
35327+
35328 #define ElfW(type) _ElfW(ELF_BITS, type)
35329 #define _ElfW(bits, type) __ElfW(bits, type)
35330 #define __ElfW(bits, type) Elf##bits##_##type
35331@@ -11,6 +13,7 @@
35332 #define Elf_Sym ElfW(Sym)
35333
35334 static Elf_Ehdr ehdr;
35335+static Elf_Phdr *phdr;
35336
35337 struct relocs {
35338 uint32_t *offset;
35339@@ -386,9 +389,39 @@ static void read_ehdr(FILE *fp)
35340 }
35341 }
35342
35343+static void read_phdrs(FILE *fp)
35344+{
35345+ unsigned int i;
35346+
35347+ phdr = calloc(ehdr.e_phnum, sizeof(Elf_Phdr));
35348+ if (!phdr) {
35349+ die("Unable to allocate %d program headers\n",
35350+ ehdr.e_phnum);
35351+ }
35352+ if (fseek(fp, ehdr.e_phoff, SEEK_SET) < 0) {
35353+ die("Seek to %d failed: %s\n",
35354+ ehdr.e_phoff, strerror(errno));
35355+ }
35356+ if (fread(phdr, sizeof(*phdr), ehdr.e_phnum, fp) != ehdr.e_phnum) {
35357+ die("Cannot read ELF program headers: %s\n",
35358+ strerror(errno));
35359+ }
35360+ for(i = 0; i < ehdr.e_phnum; i++) {
35361+ phdr[i].p_type = elf_word_to_cpu(phdr[i].p_type);
35362+ phdr[i].p_offset = elf_off_to_cpu(phdr[i].p_offset);
35363+ phdr[i].p_vaddr = elf_addr_to_cpu(phdr[i].p_vaddr);
35364+ phdr[i].p_paddr = elf_addr_to_cpu(phdr[i].p_paddr);
35365+ phdr[i].p_filesz = elf_word_to_cpu(phdr[i].p_filesz);
35366+ phdr[i].p_memsz = elf_word_to_cpu(phdr[i].p_memsz);
35367+ phdr[i].p_flags = elf_word_to_cpu(phdr[i].p_flags);
35368+ phdr[i].p_align = elf_word_to_cpu(phdr[i].p_align);
35369+ }
35370+
35371+}
35372+
35373 static void read_shdrs(FILE *fp)
35374 {
35375- int i;
35376+ unsigned int i;
35377 Elf_Shdr shdr;
35378
35379 secs = calloc(ehdr.e_shnum, sizeof(struct section));
35380@@ -423,7 +456,7 @@ static void read_shdrs(FILE *fp)
35381
35382 static void read_strtabs(FILE *fp)
35383 {
35384- int i;
35385+ unsigned int i;
35386 for (i = 0; i < ehdr.e_shnum; i++) {
35387 struct section *sec = &secs[i];
35388 if (sec->shdr.sh_type != SHT_STRTAB) {
35389@@ -448,7 +481,7 @@ static void read_strtabs(FILE *fp)
35390
35391 static void read_symtabs(FILE *fp)
35392 {
35393- int i,j;
35394+ unsigned int i,j;
35395 for (i = 0; i < ehdr.e_shnum; i++) {
35396 struct section *sec = &secs[i];
35397 if (sec->shdr.sh_type != SHT_SYMTAB) {
35398@@ -479,9 +512,11 @@ static void read_symtabs(FILE *fp)
35399 }
35400
35401
35402-static void read_relocs(FILE *fp)
35403+static void read_relocs(FILE *fp, int use_real_mode)
35404 {
35405- int i,j;
35406+ unsigned int i,j;
35407+ uint32_t base;
35408+
35409 for (i = 0; i < ehdr.e_shnum; i++) {
35410 struct section *sec = &secs[i];
35411 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35412@@ -501,9 +536,22 @@ static void read_relocs(FILE *fp)
35413 die("Cannot read symbol table: %s\n",
35414 strerror(errno));
35415 }
35416+ base = 0;
35417+
35418+#ifdef CONFIG_X86_32
35419+ for (j = 0; !use_real_mode && j < ehdr.e_phnum; j++) {
35420+ if (phdr[j].p_type != PT_LOAD )
35421+ continue;
35422+ 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)
35423+ continue;
35424+ base = CONFIG_PAGE_OFFSET + phdr[j].p_paddr - phdr[j].p_vaddr;
35425+ break;
35426+ }
35427+#endif
35428+
35429 for (j = 0; j < sec->shdr.sh_size/sizeof(Elf_Rel); j++) {
35430 Elf_Rel *rel = &sec->reltab[j];
35431- rel->r_offset = elf_addr_to_cpu(rel->r_offset);
35432+ rel->r_offset = elf_addr_to_cpu(rel->r_offset) + base;
35433 rel->r_info = elf_xword_to_cpu(rel->r_info);
35434 #if (SHT_REL_TYPE == SHT_RELA)
35435 rel->r_addend = elf_xword_to_cpu(rel->r_addend);
35436@@ -515,7 +563,7 @@ static void read_relocs(FILE *fp)
35437
35438 static void print_absolute_symbols(void)
35439 {
35440- int i;
35441+ unsigned int i;
35442 const char *format;
35443
35444 if (ELF_BITS == 64)
35445@@ -528,7 +576,7 @@ static void print_absolute_symbols(void)
35446 for (i = 0; i < ehdr.e_shnum; i++) {
35447 struct section *sec = &secs[i];
35448 char *sym_strtab;
35449- int j;
35450+ unsigned int j;
35451
35452 if (sec->shdr.sh_type != SHT_SYMTAB) {
35453 continue;
35454@@ -555,7 +603,7 @@ static void print_absolute_symbols(void)
35455
35456 static void print_absolute_relocs(void)
35457 {
35458- int i, printed = 0;
35459+ unsigned int i, printed = 0;
35460 const char *format;
35461
35462 if (ELF_BITS == 64)
35463@@ -568,7 +616,7 @@ static void print_absolute_relocs(void)
35464 struct section *sec_applies, *sec_symtab;
35465 char *sym_strtab;
35466 Elf_Sym *sh_symtab;
35467- int j;
35468+ unsigned int j;
35469 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35470 continue;
35471 }
35472@@ -645,13 +693,13 @@ static void add_reloc(struct relocs *r, uint32_t offset)
35473 static void walk_relocs(int (*process)(struct section *sec, Elf_Rel *rel,
35474 Elf_Sym *sym, const char *symname))
35475 {
35476- int i;
35477+ unsigned int i;
35478 /* Walk through the relocations */
35479 for (i = 0; i < ehdr.e_shnum; i++) {
35480 char *sym_strtab;
35481 Elf_Sym *sh_symtab;
35482 struct section *sec_applies, *sec_symtab;
35483- int j;
35484+ unsigned int j;
35485 struct section *sec = &secs[i];
35486
35487 if (sec->shdr.sh_type != SHT_REL_TYPE) {
35488@@ -830,6 +878,23 @@ static int do_reloc32(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35489 {
35490 unsigned r_type = ELF32_R_TYPE(rel->r_info);
35491 int shn_abs = (sym->st_shndx == SHN_ABS) && !is_reloc(S_REL, symname);
35492+ char *sym_strtab = sec->link->link->strtab;
35493+
35494+ /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */
35495+ if (!strcmp(sec_name(sym->st_shndx), ".data..percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load"))
35496+ return 0;
35497+
35498+#ifdef CONFIG_PAX_KERNEXEC
35499+ /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */
35500+ if (!strcmp(sec_name(sym->st_shndx), ".text.end") && !strcmp(sym_name(sym_strtab, sym), "_etext"))
35501+ return 0;
35502+ if (!strcmp(sec_name(sym->st_shndx), ".init.text"))
35503+ return 0;
35504+ if (!strcmp(sec_name(sym->st_shndx), ".exit.text"))
35505+ return 0;
35506+ if (!strcmp(sec_name(sym->st_shndx), ".text") && strcmp(sym_name(sym_strtab, sym), "__LOAD_PHYSICAL_ADDR"))
35507+ return 0;
35508+#endif
35509
35510 switch (r_type) {
35511 case R_386_NONE:
35512@@ -968,7 +1033,7 @@ static int write32_as_text(uint32_t v, FILE *f)
35513
35514 static void emit_relocs(int as_text, int use_real_mode)
35515 {
35516- int i;
35517+ unsigned int i;
35518 int (*write_reloc)(uint32_t, FILE *) = write32;
35519 int (*do_reloc)(struct section *sec, Elf_Rel *rel, Elf_Sym *sym,
35520 const char *symname);
35521@@ -1078,10 +1143,11 @@ void process(FILE *fp, int use_real_mode, int as_text,
35522 {
35523 regex_init(use_real_mode);
35524 read_ehdr(fp);
35525+ read_phdrs(fp);
35526 read_shdrs(fp);
35527 read_strtabs(fp);
35528 read_symtabs(fp);
35529- read_relocs(fp);
35530+ read_relocs(fp, use_real_mode);
35531 if (ELF_BITS == 64)
35532 percpu_init();
35533 if (show_absolute_syms) {
35534diff --git a/arch/x86/um/mem_32.c b/arch/x86/um/mem_32.c
35535index f40281e..92728c9 100644
35536--- a/arch/x86/um/mem_32.c
35537+++ b/arch/x86/um/mem_32.c
35538@@ -21,7 +21,7 @@ static int __init gate_vma_init(void)
35539 gate_vma.vm_start = FIXADDR_USER_START;
35540 gate_vma.vm_end = FIXADDR_USER_END;
35541 gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC;
35542- gate_vma.vm_page_prot = __P101;
35543+ gate_vma.vm_page_prot = vm_get_page_prot(gate_vma.vm_flags);
35544
35545 return 0;
35546 }
35547diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c
35548index 80ffa5b..a33bd15 100644
35549--- a/arch/x86/um/tls_32.c
35550+++ b/arch/x86/um/tls_32.c
35551@@ -260,7 +260,7 @@ out:
35552 if (unlikely(task == current &&
35553 !t->arch.tls_array[idx - GDT_ENTRY_TLS_MIN].flushed)) {
35554 printk(KERN_ERR "get_tls_entry: task with pid %d got here "
35555- "without flushed TLS.", current->pid);
35556+ "without flushed TLS.", task_pid_nr(current));
35557 }
35558
35559 return 0;
35560diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile
35561index 7b9be98..39bb57f 100644
35562--- a/arch/x86/vdso/Makefile
35563+++ b/arch/x86/vdso/Makefile
35564@@ -175,7 +175,7 @@ quiet_cmd_vdso = VDSO $@
35565 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
35566 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
35567
35568-VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35569+VDSO_LDFLAGS = -fPIC -shared -Wl,--no-undefined $(call cc-ldoption, -Wl$(comma)--hash-style=sysv) \
35570 $(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS)
35571 GCOV_PROFILE := n
35572
35573diff --git a/arch/x86/vdso/vdso2c.h b/arch/x86/vdso/vdso2c.h
35574index 0224987..c7d65a5 100644
35575--- a/arch/x86/vdso/vdso2c.h
35576+++ b/arch/x86/vdso/vdso2c.h
35577@@ -12,7 +12,7 @@ static void BITSFUNC(go)(void *raw_addr, size_t raw_len,
35578 unsigned long load_size = -1; /* Work around bogus warning */
35579 unsigned long mapping_size;
35580 ELF(Ehdr) *hdr = (ELF(Ehdr) *)raw_addr;
35581- int i;
35582+ unsigned int i;
35583 unsigned long j;
35584 ELF(Shdr) *symtab_hdr = NULL, *strtab_hdr, *secstrings_hdr,
35585 *alt_sec = NULL;
35586diff --git a/arch/x86/vdso/vdso32-setup.c b/arch/x86/vdso/vdso32-setup.c
35587index e904c27..b9eaa03 100644
35588--- a/arch/x86/vdso/vdso32-setup.c
35589+++ b/arch/x86/vdso/vdso32-setup.c
35590@@ -14,6 +14,7 @@
35591 #include <asm/cpufeature.h>
35592 #include <asm/processor.h>
35593 #include <asm/vdso.h>
35594+#include <asm/mman.h>
35595
35596 #ifdef CONFIG_COMPAT_VDSO
35597 #define VDSO_DEFAULT 0
35598diff --git a/arch/x86/vdso/vma.c b/arch/x86/vdso/vma.c
35599index 1c9f750..cfddb1a 100644
35600--- a/arch/x86/vdso/vma.c
35601+++ b/arch/x86/vdso/vma.c
35602@@ -19,10 +19,7 @@
35603 #include <asm/page.h>
35604 #include <asm/hpet.h>
35605 #include <asm/desc.h>
35606-
35607-#if defined(CONFIG_X86_64)
35608-unsigned int __read_mostly vdso64_enabled = 1;
35609-#endif
35610+#include <asm/mman.h>
35611
35612 void __init init_vdso_image(const struct vdso_image *image)
35613 {
35614@@ -101,6 +98,11 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35615 .pages = no_pages,
35616 };
35617
35618+#ifdef CONFIG_PAX_RANDMMAP
35619+ if (mm->pax_flags & MF_PAX_RANDMMAP)
35620+ calculate_addr = false;
35621+#endif
35622+
35623 if (calculate_addr) {
35624 addr = vdso_addr(current->mm->start_stack,
35625 image->size - image->sym_vvar_start);
35626@@ -111,14 +113,14 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35627 down_write(&mm->mmap_sem);
35628
35629 addr = get_unmapped_area(NULL, addr,
35630- image->size - image->sym_vvar_start, 0, 0);
35631+ image->size - image->sym_vvar_start, 0, MAP_EXECUTABLE);
35632 if (IS_ERR_VALUE(addr)) {
35633 ret = addr;
35634 goto up_fail;
35635 }
35636
35637 text_start = addr - image->sym_vvar_start;
35638- current->mm->context.vdso = (void __user *)text_start;
35639+ mm->context.vdso = text_start;
35640
35641 /*
35642 * MAYWRITE to allow gdb to COW and set breakpoints
35643@@ -163,15 +165,12 @@ static int map_vdso(const struct vdso_image *image, bool calculate_addr)
35644 hpet_address >> PAGE_SHIFT,
35645 PAGE_SIZE,
35646 pgprot_noncached(PAGE_READONLY));
35647-
35648- if (ret)
35649- goto up_fail;
35650 }
35651 #endif
35652
35653 up_fail:
35654 if (ret)
35655- current->mm->context.vdso = NULL;
35656+ current->mm->context.vdso = 0;
35657
35658 up_write(&mm->mmap_sem);
35659 return ret;
35660@@ -191,8 +190,8 @@ static int load_vdso32(void)
35661
35662 if (selected_vdso32->sym_VDSO32_SYSENTER_RETURN)
35663 current_thread_info()->sysenter_return =
35664- current->mm->context.vdso +
35665- selected_vdso32->sym_VDSO32_SYSENTER_RETURN;
35666+ (void __force_user *)(current->mm->context.vdso +
35667+ selected_vdso32->sym_VDSO32_SYSENTER_RETURN);
35668
35669 return 0;
35670 }
35671@@ -201,9 +200,6 @@ static int load_vdso32(void)
35672 #ifdef CONFIG_X86_64
35673 int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35674 {
35675- if (!vdso64_enabled)
35676- return 0;
35677-
35678 return map_vdso(&vdso_image_64, true);
35679 }
35680
35681@@ -212,12 +208,8 @@ int compat_arch_setup_additional_pages(struct linux_binprm *bprm,
35682 int uses_interp)
35683 {
35684 #ifdef CONFIG_X86_X32_ABI
35685- if (test_thread_flag(TIF_X32)) {
35686- if (!vdso64_enabled)
35687- return 0;
35688-
35689+ if (test_thread_flag(TIF_X32))
35690 return map_vdso(&vdso_image_x32, true);
35691- }
35692 #endif
35693
35694 return load_vdso32();
35695@@ -231,15 +223,6 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
35696 #endif
35697
35698 #ifdef CONFIG_X86_64
35699-static __init int vdso_setup(char *s)
35700-{
35701- vdso64_enabled = simple_strtoul(s, NULL, 0);
35702- return 0;
35703-}
35704-__setup("vdso=", vdso_setup);
35705-#endif
35706-
35707-#ifdef CONFIG_X86_64
35708 static void vgetcpu_cpu_init(void *arg)
35709 {
35710 int cpu = smp_processor_id();
35711diff --git a/arch/x86/xen/Kconfig b/arch/x86/xen/Kconfig
35712index e88fda8..76ce7ce 100644
35713--- a/arch/x86/xen/Kconfig
35714+++ b/arch/x86/xen/Kconfig
35715@@ -9,6 +9,7 @@ config XEN
35716 select XEN_HAVE_PVMMU
35717 depends on X86_64 || (X86_32 && X86_PAE)
35718 depends on X86_TSC
35719+ depends on !GRKERNSEC_CONFIG_AUTO || GRKERNSEC_CONFIG_VIRT_XEN
35720 help
35721 This is the Linux Xen port. Enabling this will allow the
35722 kernel to boot in a paravirtualized environment under the
35723diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
35724index 5240f56..0c12163 100644
35725--- a/arch/x86/xen/enlighten.c
35726+++ b/arch/x86/xen/enlighten.c
35727@@ -125,8 +125,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
35728
35729 struct shared_info xen_dummy_shared_info;
35730
35731-void *xen_initial_gdt;
35732-
35733 RESERVE_BRK(shared_info_page_brk, PAGE_SIZE);
35734 __read_mostly int xen_have_vector_callback;
35735 EXPORT_SYMBOL_GPL(xen_have_vector_callback);
35736@@ -544,8 +542,7 @@ static void xen_load_gdt(const struct desc_ptr *dtr)
35737 {
35738 unsigned long va = dtr->address;
35739 unsigned int size = dtr->size + 1;
35740- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35741- unsigned long frames[pages];
35742+ unsigned long frames[65536 / PAGE_SIZE];
35743 int f;
35744
35745 /*
35746@@ -593,8 +590,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35747 {
35748 unsigned long va = dtr->address;
35749 unsigned int size = dtr->size + 1;
35750- unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE;
35751- unsigned long frames[pages];
35752+ unsigned long frames[(GDT_SIZE + PAGE_SIZE - 1) / PAGE_SIZE];
35753 int f;
35754
35755 /*
35756@@ -602,7 +598,7 @@ static void __init xen_load_gdt_boot(const struct desc_ptr *dtr)
35757 * 8-byte entries, or 16 4k pages..
35758 */
35759
35760- BUG_ON(size > 65536);
35761+ BUG_ON(size > GDT_SIZE);
35762 BUG_ON(va & ~PAGE_MASK);
35763
35764 for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {
35765@@ -991,7 +987,7 @@ static u32 xen_safe_apic_wait_icr_idle(void)
35766 return 0;
35767 }
35768
35769-static void set_xen_basic_apic_ops(void)
35770+static void __init set_xen_basic_apic_ops(void)
35771 {
35772 apic->read = xen_apic_read;
35773 apic->write = xen_apic_write;
35774@@ -1308,30 +1304,30 @@ static const struct pv_apic_ops xen_apic_ops __initconst = {
35775 #endif
35776 };
35777
35778-static void xen_reboot(int reason)
35779+static __noreturn void xen_reboot(int reason)
35780 {
35781 struct sched_shutdown r = { .reason = reason };
35782
35783- if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
35784- BUG();
35785+ HYPERVISOR_sched_op(SCHEDOP_shutdown, &r);
35786+ BUG();
35787 }
35788
35789-static void xen_restart(char *msg)
35790+static __noreturn void xen_restart(char *msg)
35791 {
35792 xen_reboot(SHUTDOWN_reboot);
35793 }
35794
35795-static void xen_emergency_restart(void)
35796+static __noreturn void xen_emergency_restart(void)
35797 {
35798 xen_reboot(SHUTDOWN_reboot);
35799 }
35800
35801-static void xen_machine_halt(void)
35802+static __noreturn void xen_machine_halt(void)
35803 {
35804 xen_reboot(SHUTDOWN_poweroff);
35805 }
35806
35807-static void xen_machine_power_off(void)
35808+static __noreturn void xen_machine_power_off(void)
35809 {
35810 if (pm_power_off)
35811 pm_power_off();
35812@@ -1484,8 +1480,11 @@ static void __ref xen_setup_gdt(int cpu)
35813 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry_boot;
35814 pv_cpu_ops.load_gdt = xen_load_gdt_boot;
35815
35816- setup_stack_canary_segment(0);
35817- switch_to_new_gdt(0);
35818+ setup_stack_canary_segment(cpu);
35819+#ifdef CONFIG_X86_64
35820+ load_percpu_segment(cpu);
35821+#endif
35822+ switch_to_new_gdt(cpu);
35823
35824 pv_cpu_ops.write_gdt_entry = xen_write_gdt_entry;
35825 pv_cpu_ops.load_gdt = xen_load_gdt;
35826@@ -1600,7 +1599,17 @@ asmlinkage __visible void __init xen_start_kernel(void)
35827 __userpte_alloc_gfp &= ~__GFP_HIGHMEM;
35828
35829 /* Work out if we support NX */
35830- x86_configure_nx();
35831+#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
35832+ if ((cpuid_eax(0x80000000) & 0xffff0000) == 0x80000000 &&
35833+ (cpuid_edx(0x80000001) & (1U << (X86_FEATURE_NX & 31)))) {
35834+ unsigned l, h;
35835+
35836+ __supported_pte_mask |= _PAGE_NX;
35837+ rdmsr(MSR_EFER, l, h);
35838+ l |= EFER_NX;
35839+ wrmsr(MSR_EFER, l, h);
35840+ }
35841+#endif
35842
35843 /* Get mfn list */
35844 xen_build_dynamic_phys_to_machine();
35845@@ -1628,13 +1637,6 @@ asmlinkage __visible void __init xen_start_kernel(void)
35846
35847 machine_ops = xen_machine_ops;
35848
35849- /*
35850- * The only reliable way to retain the initial address of the
35851- * percpu gdt_page is to remember it here, so we can go and
35852- * mark it RW later, when the initial percpu area is freed.
35853- */
35854- xen_initial_gdt = &per_cpu(gdt_page, 0);
35855-
35856 xen_smp_init();
35857
35858 #ifdef CONFIG_ACPI_NUMA
35859diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
35860index adca9e2..35d6a98 100644
35861--- a/arch/x86/xen/mmu.c
35862+++ b/arch/x86/xen/mmu.c
35863@@ -379,7 +379,7 @@ static pteval_t pte_mfn_to_pfn(pteval_t val)
35864 return val;
35865 }
35866
35867-static pteval_t pte_pfn_to_mfn(pteval_t val)
35868+static pteval_t __intentional_overflow(-1) pte_pfn_to_mfn(pteval_t val)
35869 {
35870 if (val & _PAGE_PRESENT) {
35871 unsigned long pfn = (val & PTE_PFN_MASK) >> PAGE_SHIFT;
35872@@ -1835,7 +1835,11 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35873 * L3_k[511] -> level2_fixmap_pgt */
35874 convert_pfn_mfn(level3_kernel_pgt);
35875
35876+ convert_pfn_mfn(level3_vmalloc_start_pgt);
35877+ convert_pfn_mfn(level3_vmalloc_end_pgt);
35878+ convert_pfn_mfn(level3_vmemmap_pgt);
35879 /* L3_k[511][506] -> level1_fixmap_pgt */
35880+ /* L3_k[511][507] -> level1_vsyscall_pgt */
35881 convert_pfn_mfn(level2_fixmap_pgt);
35882 }
35883 /* We get [511][511] and have Xen's version of level2_kernel_pgt */
35884@@ -1860,11 +1864,16 @@ void __init xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn)
35885 set_page_prot(init_level4_pgt, PAGE_KERNEL_RO);
35886 set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO);
35887 set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO);
35888+ set_page_prot(level3_vmalloc_start_pgt, PAGE_KERNEL_RO);
35889+ set_page_prot(level3_vmalloc_end_pgt, PAGE_KERNEL_RO);
35890+ set_page_prot(level3_vmemmap_pgt, PAGE_KERNEL_RO);
35891 set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO);
35892 set_page_prot(level2_ident_pgt, PAGE_KERNEL_RO);
35893+ set_page_prot(level2_vmemmap_pgt, PAGE_KERNEL_RO);
35894 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
35895 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
35896 set_page_prot(level1_fixmap_pgt, PAGE_KERNEL_RO);
35897+ set_page_prot(level1_vsyscall_pgt, PAGE_KERNEL_RO);
35898
35899 /* Pin down new L4 */
35900 pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE,
35901@@ -2048,6 +2057,7 @@ static void __init xen_post_allocator_init(void)
35902 pv_mmu_ops.set_pud = xen_set_pud;
35903 #if PAGETABLE_LEVELS == 4
35904 pv_mmu_ops.set_pgd = xen_set_pgd;
35905+ pv_mmu_ops.set_pgd_batched = xen_set_pgd;
35906 #endif
35907
35908 /* This will work as long as patching hasn't happened yet
35909@@ -2126,6 +2136,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = {
35910 .pud_val = PV_CALLEE_SAVE(xen_pud_val),
35911 .make_pud = PV_CALLEE_SAVE(xen_make_pud),
35912 .set_pgd = xen_set_pgd_hyper,
35913+ .set_pgd_batched = xen_set_pgd_hyper,
35914
35915 .alloc_pud = xen_alloc_pmd_init,
35916 .release_pud = xen_release_pmd_init,
35917diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
35918index 08e8489..b1e182f 100644
35919--- a/arch/x86/xen/smp.c
35920+++ b/arch/x86/xen/smp.c
35921@@ -288,17 +288,13 @@ static void __init xen_smp_prepare_boot_cpu(void)
35922
35923 if (xen_pv_domain()) {
35924 if (!xen_feature(XENFEAT_writable_page_tables))
35925- /* We've switched to the "real" per-cpu gdt, so make
35926- * sure the old memory can be recycled. */
35927- make_lowmem_page_readwrite(xen_initial_gdt);
35928-
35929 #ifdef CONFIG_X86_32
35930 /*
35931 * Xen starts us with XEN_FLAT_RING1_DS, but linux code
35932 * expects __USER_DS
35933 */
35934- loadsegment(ds, __USER_DS);
35935- loadsegment(es, __USER_DS);
35936+ loadsegment(ds, __KERNEL_DS);
35937+ loadsegment(es, __KERNEL_DS);
35938 #endif
35939
35940 xen_filter_cpu_maps();
35941@@ -379,7 +375,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35942 #ifdef CONFIG_X86_32
35943 /* Note: PVH is not yet supported on x86_32. */
35944 ctxt->user_regs.fs = __KERNEL_PERCPU;
35945- ctxt->user_regs.gs = __KERNEL_STACK_CANARY;
35946+ savesegment(gs, ctxt->user_regs.gs);
35947 #endif
35948 memset(&ctxt->fpu_ctxt, 0, sizeof(ctxt->fpu_ctxt));
35949
35950@@ -387,8 +383,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
35951 ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle;
35952 ctxt->flags = VGCF_IN_KERNEL;
35953 ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */
35954- ctxt->user_regs.ds = __USER_DS;
35955- ctxt->user_regs.es = __USER_DS;
35956+ ctxt->user_regs.ds = __KERNEL_DS;
35957+ ctxt->user_regs.es = __KERNEL_DS;
35958 ctxt->user_regs.ss = __KERNEL_DS;
35959
35960 xen_copy_trap_info(ctxt->trap_ctxt);
35961@@ -446,14 +442,13 @@ static int xen_cpu_up(unsigned int cpu, struct task_struct *idle)
35962 int rc;
35963
35964 per_cpu(current_task, cpu) = idle;
35965+ per_cpu(current_tinfo, cpu) = &idle->tinfo;
35966 #ifdef CONFIG_X86_32
35967 irq_ctx_init(cpu);
35968 #else
35969 clear_tsk_thread_flag(idle, TIF_FORK);
35970 #endif
35971- per_cpu(kernel_stack, cpu) =
35972- (unsigned long)task_stack_page(idle) -
35973- KERNEL_STACK_OFFSET + THREAD_SIZE;
35974+ per_cpu(kernel_stack, cpu) = (unsigned long)task_stack_page(idle) - 16 + THREAD_SIZE;
35975
35976 xen_setup_runstate_info(cpu);
35977 xen_setup_timer(cpu);
35978@@ -732,7 +727,7 @@ static const struct smp_ops xen_smp_ops __initconst = {
35979
35980 void __init xen_smp_init(void)
35981 {
35982- smp_ops = xen_smp_ops;
35983+ memcpy((void *)&smp_ops, &xen_smp_ops, sizeof smp_ops);
35984 xen_fill_possible_map();
35985 }
35986
35987diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S
35988index fd92a64..1f72641 100644
35989--- a/arch/x86/xen/xen-asm_32.S
35990+++ b/arch/x86/xen/xen-asm_32.S
35991@@ -99,7 +99,7 @@ ENTRY(xen_iret)
35992 pushw %fs
35993 movl $(__KERNEL_PERCPU), %eax
35994 movl %eax, %fs
35995- movl %fs:xen_vcpu, %eax
35996+ mov PER_CPU_VAR(xen_vcpu), %eax
35997 POP_FS
35998 #else
35999 movl %ss:xen_vcpu, %eax
36000diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
36001index 674b2225..f1f5dc1 100644
36002--- a/arch/x86/xen/xen-head.S
36003+++ b/arch/x86/xen/xen-head.S
36004@@ -39,6 +39,17 @@ ENTRY(startup_xen)
36005 #ifdef CONFIG_X86_32
36006 mov %esi,xen_start_info
36007 mov $init_thread_union+THREAD_SIZE,%esp
36008+#ifdef CONFIG_SMP
36009+ movl $cpu_gdt_table,%edi
36010+ movl $__per_cpu_load,%eax
36011+ movw %ax,__KERNEL_PERCPU + 2(%edi)
36012+ rorl $16,%eax
36013+ movb %al,__KERNEL_PERCPU + 4(%edi)
36014+ movb %ah,__KERNEL_PERCPU + 7(%edi)
36015+ movl $__per_cpu_end - 1,%eax
36016+ subl $__per_cpu_start,%eax
36017+ movw %ax,__KERNEL_PERCPU + 0(%edi)
36018+#endif
36019 #else
36020 mov %rsi,xen_start_info
36021 mov $init_thread_union+THREAD_SIZE,%rsp
36022diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
36023index 9e195c6..523ed36 100644
36024--- a/arch/x86/xen/xen-ops.h
36025+++ b/arch/x86/xen/xen-ops.h
36026@@ -16,8 +16,6 @@ void xen_syscall_target(void);
36027 void xen_syscall32_target(void);
36028 #endif
36029
36030-extern void *xen_initial_gdt;
36031-
36032 struct trap_info;
36033 void xen_copy_trap_info(struct trap_info *traps);
36034
36035diff --git a/arch/xtensa/variants/dc232b/include/variant/core.h b/arch/xtensa/variants/dc232b/include/variant/core.h
36036index 525bd3d..ef888b1 100644
36037--- a/arch/xtensa/variants/dc232b/include/variant/core.h
36038+++ b/arch/xtensa/variants/dc232b/include/variant/core.h
36039@@ -119,9 +119,9 @@
36040 ----------------------------------------------------------------------*/
36041
36042 #define XCHAL_ICACHE_LINESIZE 32 /* I-cache line size in bytes */
36043-#define XCHAL_DCACHE_LINESIZE 32 /* D-cache line size in bytes */
36044 #define XCHAL_ICACHE_LINEWIDTH 5 /* log2(I line size in bytes) */
36045 #define XCHAL_DCACHE_LINEWIDTH 5 /* log2(D line size in bytes) */
36046+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36047
36048 #define XCHAL_ICACHE_SIZE 16384 /* I-cache size in bytes or 0 */
36049 #define XCHAL_DCACHE_SIZE 16384 /* D-cache size in bytes or 0 */
36050diff --git a/arch/xtensa/variants/fsf/include/variant/core.h b/arch/xtensa/variants/fsf/include/variant/core.h
36051index 2f33760..835e50a 100644
36052--- a/arch/xtensa/variants/fsf/include/variant/core.h
36053+++ b/arch/xtensa/variants/fsf/include/variant/core.h
36054@@ -11,6 +11,7 @@
36055 #ifndef _XTENSA_CORE_H
36056 #define _XTENSA_CORE_H
36057
36058+#include <linux/const.h>
36059
36060 /****************************************************************************
36061 Parameters Useful for Any Code, USER or PRIVILEGED
36062@@ -112,9 +113,9 @@
36063 ----------------------------------------------------------------------*/
36064
36065 #define XCHAL_ICACHE_LINESIZE 16 /* I-cache line size in bytes */
36066-#define XCHAL_DCACHE_LINESIZE 16 /* D-cache line size in bytes */
36067 #define XCHAL_ICACHE_LINEWIDTH 4 /* log2(I line size in bytes) */
36068 #define XCHAL_DCACHE_LINEWIDTH 4 /* log2(D line size in bytes) */
36069+#define XCHAL_DCACHE_LINESIZE (_AC(1,UL) << XCHAL_DCACHE_LINEWIDTH) /* D-cache line size in bytes */
36070
36071 #define XCHAL_ICACHE_SIZE 8192 /* I-cache size in bytes or 0 */
36072 #define XCHAL_DCACHE_SIZE 8192 /* D-cache size in bytes or 0 */
36073diff --git a/block/bio.c b/block/bio.c
36074index f66a4ea..73ddf55 100644
36075--- a/block/bio.c
36076+++ b/block/bio.c
36077@@ -1172,7 +1172,7 @@ struct bio *bio_copy_user_iov(struct request_queue *q,
36078 /*
36079 * Overflow, abort
36080 */
36081- if (end < start)
36082+ if (end < start || end - start > INT_MAX - nr_pages)
36083 return ERR_PTR(-EINVAL);
36084
36085 nr_pages += end - start;
36086@@ -1297,7 +1297,7 @@ struct bio *bio_map_user_iov(struct request_queue *q,
36087 /*
36088 * Overflow, abort
36089 */
36090- if (end < start)
36091+ if (end < start || end - start > INT_MAX - nr_pages)
36092 return ERR_PTR(-EINVAL);
36093
36094 nr_pages += end - start;
36095diff --git a/block/blk-iopoll.c b/block/blk-iopoll.c
36096index 0736729..2ec3b48 100644
36097--- a/block/blk-iopoll.c
36098+++ b/block/blk-iopoll.c
36099@@ -74,7 +74,7 @@ void blk_iopoll_complete(struct blk_iopoll *iop)
36100 }
36101 EXPORT_SYMBOL(blk_iopoll_complete);
36102
36103-static void blk_iopoll_softirq(struct softirq_action *h)
36104+static __latent_entropy void blk_iopoll_softirq(void)
36105 {
36106 struct list_head *list = this_cpu_ptr(&blk_cpu_iopoll);
36107 int rearm = 0, budget = blk_iopoll_budget;
36108diff --git a/block/blk-map.c b/block/blk-map.c
36109index b8d2725..08c52b0 100644
36110--- a/block/blk-map.c
36111+++ b/block/blk-map.c
36112@@ -192,7 +192,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
36113 if (!len || !kbuf)
36114 return -EINVAL;
36115
36116- do_copy = !blk_rq_aligned(q, addr, len) || object_is_on_stack(kbuf);
36117+ do_copy = !blk_rq_aligned(q, addr, len) || object_starts_on_stack(kbuf);
36118 if (do_copy)
36119 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
36120 else
36121diff --git a/block/blk-softirq.c b/block/blk-softirq.c
36122index 53b1737..08177d2e 100644
36123--- a/block/blk-softirq.c
36124+++ b/block/blk-softirq.c
36125@@ -18,7 +18,7 @@ static DEFINE_PER_CPU(struct list_head, blk_cpu_done);
36126 * Softirq action handler - move entries to local list and loop over them
36127 * while passing them to the queue registered handler.
36128 */
36129-static void blk_done_softirq(struct softirq_action *h)
36130+static __latent_entropy void blk_done_softirq(void)
36131 {
36132 struct list_head *cpu_list, local_list;
36133
36134diff --git a/block/bsg.c b/block/bsg.c
36135index d214e92..9649863 100644
36136--- a/block/bsg.c
36137+++ b/block/bsg.c
36138@@ -140,16 +140,24 @@ static int blk_fill_sgv4_hdr_rq(struct request_queue *q, struct request *rq,
36139 struct sg_io_v4 *hdr, struct bsg_device *bd,
36140 fmode_t has_write_perm)
36141 {
36142+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36143+ unsigned char *cmdptr;
36144+
36145 if (hdr->request_len > BLK_MAX_CDB) {
36146 rq->cmd = kzalloc(hdr->request_len, GFP_KERNEL);
36147 if (!rq->cmd)
36148 return -ENOMEM;
36149- }
36150+ cmdptr = rq->cmd;
36151+ } else
36152+ cmdptr = tmpcmd;
36153
36154- if (copy_from_user(rq->cmd, (void __user *)(unsigned long)hdr->request,
36155+ if (copy_from_user(cmdptr, (void __user *)(unsigned long)hdr->request,
36156 hdr->request_len))
36157 return -EFAULT;
36158
36159+ if (cmdptr != rq->cmd)
36160+ memcpy(rq->cmd, cmdptr, hdr->request_len);
36161+
36162 if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
36163 if (blk_verify_command(rq->cmd, has_write_perm))
36164 return -EPERM;
36165diff --git a/block/compat_ioctl.c b/block/compat_ioctl.c
36166index f678c73..f35aa18 100644
36167--- a/block/compat_ioctl.c
36168+++ b/block/compat_ioctl.c
36169@@ -156,7 +156,7 @@ static int compat_cdrom_generic_command(struct block_device *bdev, fmode_t mode,
36170 cgc = compat_alloc_user_space(sizeof(*cgc));
36171 cgc32 = compat_ptr(arg);
36172
36173- if (copy_in_user(&cgc->cmd, &cgc32->cmd, sizeof(cgc->cmd)) ||
36174+ if (copy_in_user(cgc->cmd, cgc32->cmd, sizeof(cgc->cmd)) ||
36175 get_user(data, &cgc32->buffer) ||
36176 put_user(compat_ptr(data), &cgc->buffer) ||
36177 copy_in_user(&cgc->buflen, &cgc32->buflen,
36178@@ -341,7 +341,7 @@ static int compat_fd_ioctl(struct block_device *bdev, fmode_t mode,
36179 err |= __get_user(f->spec1, &uf->spec1);
36180 err |= __get_user(f->fmt_gap, &uf->fmt_gap);
36181 err |= __get_user(name, &uf->name);
36182- f->name = compat_ptr(name);
36183+ f->name = (void __force_kernel *)compat_ptr(name);
36184 if (err) {
36185 err = -EFAULT;
36186 goto out;
36187diff --git a/block/genhd.c b/block/genhd.c
36188index 0a536dc..b8f7aca 100644
36189--- a/block/genhd.c
36190+++ b/block/genhd.c
36191@@ -469,21 +469,24 @@ static char *bdevt_str(dev_t devt, char *buf)
36192
36193 /*
36194 * Register device numbers dev..(dev+range-1)
36195- * range must be nonzero
36196+ * Noop if @range is zero.
36197 * The hash chain is sorted on range, so that subranges can override.
36198 */
36199 void blk_register_region(dev_t devt, unsigned long range, struct module *module,
36200 struct kobject *(*probe)(dev_t, int *, void *),
36201 int (*lock)(dev_t, void *), void *data)
36202 {
36203- kobj_map(bdev_map, devt, range, module, probe, lock, data);
36204+ if (range)
36205+ kobj_map(bdev_map, devt, range, module, probe, lock, data);
36206 }
36207
36208 EXPORT_SYMBOL(blk_register_region);
36209
36210+/* undo blk_register_region(), noop if @range is zero */
36211 void blk_unregister_region(dev_t devt, unsigned long range)
36212 {
36213- kobj_unmap(bdev_map, devt, range);
36214+ if (range)
36215+ kobj_unmap(bdev_map, devt, range);
36216 }
36217
36218 EXPORT_SYMBOL(blk_unregister_region);
36219diff --git a/block/partitions/efi.c b/block/partitions/efi.c
36220index 26cb624..a49c3a5 100644
36221--- a/block/partitions/efi.c
36222+++ b/block/partitions/efi.c
36223@@ -293,14 +293,14 @@ static gpt_entry *alloc_read_gpt_entries(struct parsed_partitions *state,
36224 if (!gpt)
36225 return NULL;
36226
36227+ if (!le32_to_cpu(gpt->num_partition_entries))
36228+ return NULL;
36229+ pte = kcalloc(le32_to_cpu(gpt->num_partition_entries), le32_to_cpu(gpt->sizeof_partition_entry), GFP_KERNEL);
36230+ if (!pte)
36231+ return NULL;
36232+
36233 count = le32_to_cpu(gpt->num_partition_entries) *
36234 le32_to_cpu(gpt->sizeof_partition_entry);
36235- if (!count)
36236- return NULL;
36237- pte = kmalloc(count, GFP_KERNEL);
36238- if (!pte)
36239- return NULL;
36240-
36241 if (read_lba(state, le64_to_cpu(gpt->partition_entry_lba),
36242 (u8 *) pte, count) < count) {
36243 kfree(pte);
36244diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
36245index e1f71c3..02d295a 100644
36246--- a/block/scsi_ioctl.c
36247+++ b/block/scsi_ioctl.c
36248@@ -67,7 +67,7 @@ static int scsi_get_bus(struct request_queue *q, int __user *p)
36249 return put_user(0, p);
36250 }
36251
36252-static int sg_get_timeout(struct request_queue *q)
36253+static int __intentional_overflow(-1) sg_get_timeout(struct request_queue *q)
36254 {
36255 return jiffies_to_clock_t(q->sg_timeout);
36256 }
36257@@ -227,8 +227,20 @@ EXPORT_SYMBOL(blk_verify_command);
36258 static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
36259 struct sg_io_hdr *hdr, fmode_t mode)
36260 {
36261- if (copy_from_user(rq->cmd, hdr->cmdp, hdr->cmd_len))
36262+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36263+ unsigned char *cmdptr;
36264+
36265+ if (rq->cmd != rq->__cmd)
36266+ cmdptr = rq->cmd;
36267+ else
36268+ cmdptr = tmpcmd;
36269+
36270+ if (copy_from_user(cmdptr, hdr->cmdp, hdr->cmd_len))
36271 return -EFAULT;
36272+
36273+ if (cmdptr != rq->cmd)
36274+ memcpy(rq->cmd, cmdptr, hdr->cmd_len);
36275+
36276 if (blk_verify_command(rq->cmd, mode & FMODE_WRITE))
36277 return -EPERM;
36278
36279@@ -422,6 +434,8 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36280 int err;
36281 unsigned int in_len, out_len, bytes, opcode, cmdlen;
36282 char *buffer = NULL, sense[SCSI_SENSE_BUFFERSIZE];
36283+ unsigned char tmpcmd[sizeof(rq->__cmd)];
36284+ unsigned char *cmdptr;
36285
36286 if (!sic)
36287 return -EINVAL;
36288@@ -460,9 +474,18 @@ int sg_scsi_ioctl(struct request_queue *q, struct gendisk *disk, fmode_t mode,
36289 */
36290 err = -EFAULT;
36291 rq->cmd_len = cmdlen;
36292- if (copy_from_user(rq->cmd, sic->data, cmdlen))
36293+
36294+ if (rq->cmd != rq->__cmd)
36295+ cmdptr = rq->cmd;
36296+ else
36297+ cmdptr = tmpcmd;
36298+
36299+ if (copy_from_user(cmdptr, sic->data, cmdlen))
36300 goto error;
36301
36302+ if (rq->cmd != cmdptr)
36303+ memcpy(rq->cmd, cmdptr, cmdlen);
36304+
36305 if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
36306 goto error;
36307
36308diff --git a/crypto/cryptd.c b/crypto/cryptd.c
36309index 650afac1..f3307de 100644
36310--- a/crypto/cryptd.c
36311+++ b/crypto/cryptd.c
36312@@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
36313
36314 struct cryptd_blkcipher_request_ctx {
36315 crypto_completion_t complete;
36316-};
36317+} __no_const;
36318
36319 struct cryptd_hash_ctx {
36320 struct crypto_shash *child;
36321@@ -80,7 +80,7 @@ struct cryptd_aead_ctx {
36322
36323 struct cryptd_aead_request_ctx {
36324 crypto_completion_t complete;
36325-};
36326+} __no_const;
36327
36328 static void cryptd_queue_worker(struct work_struct *work);
36329
36330diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
36331index c305d41..a96de79 100644
36332--- a/crypto/pcrypt.c
36333+++ b/crypto/pcrypt.c
36334@@ -440,7 +440,7 @@ static int pcrypt_sysfs_add(struct padata_instance *pinst, const char *name)
36335 int ret;
36336
36337 pinst->kobj.kset = pcrypt_kset;
36338- ret = kobject_add(&pinst->kobj, NULL, name);
36339+ ret = kobject_add(&pinst->kobj, NULL, "%s", name);
36340 if (!ret)
36341 kobject_uevent(&pinst->kobj, KOBJ_ADD);
36342
36343diff --git a/crypto/zlib.c b/crypto/zlib.c
36344index 0eefa9d..0fa3d29 100644
36345--- a/crypto/zlib.c
36346+++ b/crypto/zlib.c
36347@@ -95,10 +95,10 @@ static int zlib_compress_setup(struct crypto_pcomp *tfm, void *params,
36348 zlib_comp_exit(ctx);
36349
36350 window_bits = tb[ZLIB_COMP_WINDOWBITS]
36351- ? nla_get_u32(tb[ZLIB_COMP_WINDOWBITS])
36352+ ? nla_get_s32(tb[ZLIB_COMP_WINDOWBITS])
36353 : MAX_WBITS;
36354 mem_level = tb[ZLIB_COMP_MEMLEVEL]
36355- ? nla_get_u32(tb[ZLIB_COMP_MEMLEVEL])
36356+ ? nla_get_s32(tb[ZLIB_COMP_MEMLEVEL])
36357 : DEF_MEM_LEVEL;
36358
36359 workspacesize = zlib_deflate_workspacesize(window_bits, mem_level);
36360diff --git a/drivers/acpi/acpica/hwxfsleep.c b/drivers/acpi/acpica/hwxfsleep.c
36361index 3b37676..898edfa 100644
36362--- a/drivers/acpi/acpica/hwxfsleep.c
36363+++ b/drivers/acpi/acpica/hwxfsleep.c
36364@@ -63,11 +63,12 @@ static acpi_status acpi_hw_sleep_dispatch(u8 sleep_state, u32 function_id);
36365 /* Legacy functions are optional, based upon ACPI_REDUCED_HARDWARE */
36366
36367 static struct acpi_sleep_functions acpi_sleep_dispatch[] = {
36368- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36369- acpi_hw_extended_sleep},
36370- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36371- acpi_hw_extended_wake_prep},
36372- {ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake), acpi_hw_extended_wake}
36373+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_sleep),
36374+ .extended_function = acpi_hw_extended_sleep},
36375+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake_prep),
36376+ .extended_function = acpi_hw_extended_wake_prep},
36377+ {.legacy_function = ACPI_HW_OPTIONAL_FUNCTION(acpi_hw_legacy_wake),
36378+ .extended_function = acpi_hw_extended_wake}
36379 };
36380
36381 /*
36382diff --git a/drivers/acpi/apei/apei-internal.h b/drivers/acpi/apei/apei-internal.h
36383index 16129c7..8b675cd 100644
36384--- a/drivers/acpi/apei/apei-internal.h
36385+++ b/drivers/acpi/apei/apei-internal.h
36386@@ -19,7 +19,7 @@ typedef int (*apei_exec_ins_func_t)(struct apei_exec_context *ctx,
36387 struct apei_exec_ins_type {
36388 u32 flags;
36389 apei_exec_ins_func_t run;
36390-};
36391+} __do_const;
36392
36393 struct apei_exec_context {
36394 u32 ip;
36395diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
36396index e82d097..0c855c1 100644
36397--- a/drivers/acpi/apei/ghes.c
36398+++ b/drivers/acpi/apei/ghes.c
36399@@ -478,7 +478,7 @@ static void __ghes_print_estatus(const char *pfx,
36400 const struct acpi_hest_generic *generic,
36401 const struct acpi_hest_generic_status *estatus)
36402 {
36403- static atomic_t seqno;
36404+ static atomic_unchecked_t seqno;
36405 unsigned int curr_seqno;
36406 char pfx_seq[64];
36407
36408@@ -489,7 +489,7 @@ static void __ghes_print_estatus(const char *pfx,
36409 else
36410 pfx = KERN_ERR;
36411 }
36412- curr_seqno = atomic_inc_return(&seqno);
36413+ curr_seqno = atomic_inc_return_unchecked(&seqno);
36414 snprintf(pfx_seq, sizeof(pfx_seq), "%s{%u}" HW_ERR, pfx, curr_seqno);
36415 printk("%s""Hardware error from APEI Generic Hardware Error Source: %d\n",
36416 pfx_seq, generic->header.source_id);
36417diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c
36418index a83e3c6..c3d617f 100644
36419--- a/drivers/acpi/bgrt.c
36420+++ b/drivers/acpi/bgrt.c
36421@@ -86,8 +86,10 @@ static int __init bgrt_init(void)
36422 if (!bgrt_image)
36423 return -ENODEV;
36424
36425- bin_attr_image.private = bgrt_image;
36426- bin_attr_image.size = bgrt_image_size;
36427+ pax_open_kernel();
36428+ *(void **)&bin_attr_image.private = bgrt_image;
36429+ *(size_t *)&bin_attr_image.size = bgrt_image_size;
36430+ pax_close_kernel();
36431
36432 bgrt_kobj = kobject_create_and_add("bgrt", acpi_kobj);
36433 if (!bgrt_kobj)
36434diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
36435index 9b693d5..8953d54 100644
36436--- a/drivers/acpi/blacklist.c
36437+++ b/drivers/acpi/blacklist.c
36438@@ -51,7 +51,7 @@ struct acpi_blacklist_item {
36439 u32 is_critical_error;
36440 };
36441
36442-static struct dmi_system_id acpi_osi_dmi_table[] __initdata;
36443+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst;
36444
36445 /*
36446 * POLICY: If *anything* doesn't work, put it on the blacklist.
36447@@ -163,7 +163,7 @@ static int __init dmi_disable_osi_win8(const struct dmi_system_id *d)
36448 return 0;
36449 }
36450
36451-static struct dmi_system_id acpi_osi_dmi_table[] __initdata = {
36452+static const struct dmi_system_id acpi_osi_dmi_table[] __initconst = {
36453 {
36454 .callback = dmi_disable_osi_vista,
36455 .ident = "Fujitsu Siemens",
36456diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
36457index 8b67bd0..b59593e 100644
36458--- a/drivers/acpi/bus.c
36459+++ b/drivers/acpi/bus.c
36460@@ -67,7 +67,7 @@ static int set_copy_dsdt(const struct dmi_system_id *id)
36461 }
36462 #endif
36463
36464-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36465+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36466 /*
36467 * Invoke DSDT corruption work-around on all Toshiba Satellite.
36468 * https://bugzilla.kernel.org/show_bug.cgi?id=14679
36469@@ -83,7 +83,7 @@ static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36470 {}
36471 };
36472 #else
36473-static struct dmi_system_id dsdt_dmi_table[] __initdata = {
36474+static const struct dmi_system_id dsdt_dmi_table[] __initconst = {
36475 {}
36476 };
36477 #endif
36478diff --git a/drivers/acpi/custom_method.c b/drivers/acpi/custom_method.c
36479index c68e724..e863008 100644
36480--- a/drivers/acpi/custom_method.c
36481+++ b/drivers/acpi/custom_method.c
36482@@ -29,6 +29,10 @@ static ssize_t cm_write(struct file *file, const char __user * user_buf,
36483 struct acpi_table_header table;
36484 acpi_status status;
36485
36486+#ifdef CONFIG_GRKERNSEC_KMEM
36487+ return -EPERM;
36488+#endif
36489+
36490 if (!(*ppos)) {
36491 /* parse the table header to get the table length */
36492 if (count <= sizeof(struct acpi_table_header))
36493diff --git a/drivers/acpi/device_pm.c b/drivers/acpi/device_pm.c
36494index 735db11..91e07ff 100644
36495--- a/drivers/acpi/device_pm.c
36496+++ b/drivers/acpi/device_pm.c
36497@@ -1025,6 +1025,8 @@ EXPORT_SYMBOL_GPL(acpi_subsys_freeze);
36498
36499 #endif /* CONFIG_PM_SLEEP */
36500
36501+static void acpi_dev_pm_detach(struct device *dev, bool power_off);
36502+
36503 static struct dev_pm_domain acpi_general_pm_domain = {
36504 .ops = {
36505 .runtime_suspend = acpi_subsys_runtime_suspend,
36506@@ -1041,6 +1043,7 @@ static struct dev_pm_domain acpi_general_pm_domain = {
36507 .restore_early = acpi_subsys_resume_early,
36508 #endif
36509 },
36510+ .detach = acpi_dev_pm_detach
36511 };
36512
36513 /**
36514@@ -1110,7 +1113,6 @@ int acpi_dev_pm_attach(struct device *dev, bool power_on)
36515 acpi_device_wakeup(adev, ACPI_STATE_S0, false);
36516 }
36517
36518- dev->pm_domain->detach = acpi_dev_pm_detach;
36519 return 0;
36520 }
36521 EXPORT_SYMBOL_GPL(acpi_dev_pm_attach);
36522diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
36523index a8dd2f7..e15950e 100644
36524--- a/drivers/acpi/ec.c
36525+++ b/drivers/acpi/ec.c
36526@@ -1242,7 +1242,7 @@ static int ec_clear_on_resume(const struct dmi_system_id *id)
36527 return 0;
36528 }
36529
36530-static struct dmi_system_id ec_dmi_table[] __initdata = {
36531+static const struct dmi_system_id ec_dmi_table[] __initconst = {
36532 {
36533 ec_skip_dsdt_scan, "Compal JFL92", {
36534 DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),
36535diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c
36536index 139d9e4..9a9d799 100644
36537--- a/drivers/acpi/pci_slot.c
36538+++ b/drivers/acpi/pci_slot.c
36539@@ -195,7 +195,7 @@ static int do_sta_before_sun(const struct dmi_system_id *d)
36540 return 0;
36541 }
36542
36543-static struct dmi_system_id acpi_pci_slot_dmi_table[] __initdata = {
36544+static const struct dmi_system_id acpi_pci_slot_dmi_table[] __initconst = {
36545 /*
36546 * Fujitsu Primequest machines will return 1023 to indicate an
36547 * error if the _SUN method is evaluated on SxFy objects that
36548diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
36549index d9f7158..168e742 100644
36550--- a/drivers/acpi/processor_driver.c
36551+++ b/drivers/acpi/processor_driver.c
36552@@ -159,7 +159,7 @@ static int acpi_cpu_soft_notify(struct notifier_block *nfb,
36553 return NOTIFY_OK;
36554 }
36555
36556-static struct notifier_block __refdata acpi_cpu_notifier = {
36557+static struct notifier_block __refconst acpi_cpu_notifier = {
36558 .notifier_call = acpi_cpu_soft_notify,
36559 };
36560
36561diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
36562index f98db0b..8309c83 100644
36563--- a/drivers/acpi/processor_idle.c
36564+++ b/drivers/acpi/processor_idle.c
36565@@ -912,7 +912,7 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr)
36566 {
36567 int i, count = CPUIDLE_DRIVER_STATE_START;
36568 struct acpi_processor_cx *cx;
36569- struct cpuidle_state *state;
36570+ cpuidle_state_no_const *state;
36571 struct cpuidle_driver *drv = &acpi_idle_driver;
36572
36573 if (!pr->flags.power_setup_done)
36574diff --git a/drivers/acpi/processor_pdc.c b/drivers/acpi/processor_pdc.c
36575index e5dd808..1eceed1 100644
36576--- a/drivers/acpi/processor_pdc.c
36577+++ b/drivers/acpi/processor_pdc.c
36578@@ -176,7 +176,7 @@ static int __init set_no_mwait(const struct dmi_system_id *id)
36579 return 0;
36580 }
36581
36582-static struct dmi_system_id processor_idle_dmi_table[] __initdata = {
36583+static const struct dmi_system_id processor_idle_dmi_table[] __initconst = {
36584 {
36585 set_no_mwait, "Extensa 5220", {
36586 DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies LTD"),
36587diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
36588index 7f251dd..47b262c 100644
36589--- a/drivers/acpi/sleep.c
36590+++ b/drivers/acpi/sleep.c
36591@@ -148,7 +148,7 @@ static int __init init_nvs_nosave(const struct dmi_system_id *d)
36592 return 0;
36593 }
36594
36595-static struct dmi_system_id acpisleep_dmi_table[] __initdata = {
36596+static const struct dmi_system_id acpisleep_dmi_table[] __initconst = {
36597 {
36598 .callback = init_old_suspend_ordering,
36599 .ident = "Abit KN9 (nForce4 variant)",
36600diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c
36601index 13e577c..cef11ee 100644
36602--- a/drivers/acpi/sysfs.c
36603+++ b/drivers/acpi/sysfs.c
36604@@ -423,11 +423,11 @@ static u32 num_counters;
36605 static struct attribute **all_attrs;
36606 static u32 acpi_gpe_count;
36607
36608-static struct attribute_group interrupt_stats_attr_group = {
36609+static attribute_group_no_const interrupt_stats_attr_group = {
36610 .name = "interrupts",
36611 };
36612
36613-static struct kobj_attribute *counter_attrs;
36614+static kobj_attribute_no_const *counter_attrs;
36615
36616 static void delete_gpe_attr_array(void)
36617 {
36618diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c
36619index d24fa19..782f1e6 100644
36620--- a/drivers/acpi/thermal.c
36621+++ b/drivers/acpi/thermal.c
36622@@ -1209,7 +1209,7 @@ static int thermal_psv(const struct dmi_system_id *d) {
36623 return 0;
36624 }
36625
36626-static struct dmi_system_id thermal_dmi_table[] __initdata = {
36627+static const struct dmi_system_id thermal_dmi_table[] __initconst = {
36628 /*
36629 * Award BIOS on this AOpen makes thermal control almost worthless.
36630 * http://bugzilla.kernel.org/show_bug.cgi?id=8842
36631diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
36632index 26eb70c..4d66ddf 100644
36633--- a/drivers/acpi/video.c
36634+++ b/drivers/acpi/video.c
36635@@ -418,7 +418,7 @@ static int __init video_disable_native_backlight(const struct dmi_system_id *d)
36636 return 0;
36637 }
36638
36639-static struct dmi_system_id video_dmi_table[] __initdata = {
36640+static const struct dmi_system_id video_dmi_table[] __initconst = {
36641 /*
36642 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
36643 */
36644diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
36645index 61a9c07..ea98fa1 100644
36646--- a/drivers/ata/libahci.c
36647+++ b/drivers/ata/libahci.c
36648@@ -1252,7 +1252,7 @@ int ahci_kick_engine(struct ata_port *ap)
36649 }
36650 EXPORT_SYMBOL_GPL(ahci_kick_engine);
36651
36652-static int ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36653+static int __intentional_overflow(-1) ahci_exec_polled_cmd(struct ata_port *ap, int pmp,
36654 struct ata_taskfile *tf, int is_cmd, u16 flags,
36655 unsigned long timeout_msec)
36656 {
36657diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
36658index 23dac3b..89ada44 100644
36659--- a/drivers/ata/libata-core.c
36660+++ b/drivers/ata/libata-core.c
36661@@ -99,7 +99,7 @@ static unsigned int ata_dev_set_xfermode(struct ata_device *dev);
36662 static void ata_dev_xfermask(struct ata_device *dev);
36663 static unsigned long ata_dev_blacklisted(const struct ata_device *dev);
36664
36665-atomic_t ata_print_id = ATOMIC_INIT(0);
36666+atomic_unchecked_t ata_print_id = ATOMIC_INIT(0);
36667
36668 struct ata_force_param {
36669 const char *name;
36670@@ -4780,7 +4780,7 @@ void ata_qc_free(struct ata_queued_cmd *qc)
36671 struct ata_port *ap;
36672 unsigned int tag;
36673
36674- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36675+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36676 ap = qc->ap;
36677
36678 qc->flags = 0;
36679@@ -4797,7 +4797,7 @@ void __ata_qc_complete(struct ata_queued_cmd *qc)
36680 struct ata_port *ap;
36681 struct ata_link *link;
36682
36683- WARN_ON_ONCE(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36684+ BUG_ON(qc == NULL); /* ata_qc_from_tag _might_ return NULL */
36685 WARN_ON_ONCE(!(qc->flags & ATA_QCFLAG_ACTIVE));
36686 ap = qc->ap;
36687 link = qc->dev->link;
36688@@ -5901,6 +5901,7 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36689 return;
36690
36691 spin_lock(&lock);
36692+ pax_open_kernel();
36693
36694 for (cur = ops->inherits; cur; cur = cur->inherits) {
36695 void **inherit = (void **)cur;
36696@@ -5914,8 +5915,9 @@ static void ata_finalize_port_ops(struct ata_port_operations *ops)
36697 if (IS_ERR(*pp))
36698 *pp = NULL;
36699
36700- ops->inherits = NULL;
36701+ *(struct ata_port_operations **)&ops->inherits = NULL;
36702
36703+ pax_close_kernel();
36704 spin_unlock(&lock);
36705 }
36706
36707@@ -6111,7 +6113,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
36708
36709 /* give ports names and add SCSI hosts */
36710 for (i = 0; i < host->n_ports; i++) {
36711- host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
36712+ host->ports[i]->print_id = atomic_inc_return_unchecked(&ata_print_id);
36713 host->ports[i]->local_port_no = i + 1;
36714 }
36715
36716diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
36717index b061ba2..fdcd85f 100644
36718--- a/drivers/ata/libata-scsi.c
36719+++ b/drivers/ata/libata-scsi.c
36720@@ -4172,7 +4172,7 @@ int ata_sas_port_init(struct ata_port *ap)
36721
36722 if (rc)
36723 return rc;
36724- ap->print_id = atomic_inc_return(&ata_print_id);
36725+ ap->print_id = atomic_inc_return_unchecked(&ata_print_id);
36726 return 0;
36727 }
36728 EXPORT_SYMBOL_GPL(ata_sas_port_init);
36729diff --git a/drivers/ata/libata.h b/drivers/ata/libata.h
36730index f840ca1..edd6ef3 100644
36731--- a/drivers/ata/libata.h
36732+++ b/drivers/ata/libata.h
36733@@ -53,7 +53,7 @@ enum {
36734 ATA_DNXFER_QUIET = (1 << 31),
36735 };
36736
36737-extern atomic_t ata_print_id;
36738+extern atomic_unchecked_t ata_print_id;
36739 extern int atapi_passthru16;
36740 extern int libata_fua;
36741 extern int libata_noacpi;
36742diff --git a/drivers/ata/pata_arasan_cf.c b/drivers/ata/pata_arasan_cf.c
36743index a9b0c82..207d97d 100644
36744--- a/drivers/ata/pata_arasan_cf.c
36745+++ b/drivers/ata/pata_arasan_cf.c
36746@@ -865,7 +865,9 @@ static int arasan_cf_probe(struct platform_device *pdev)
36747 /* Handle platform specific quirks */
36748 if (quirk) {
36749 if (quirk & CF_BROKEN_PIO) {
36750- ap->ops->set_piomode = NULL;
36751+ pax_open_kernel();
36752+ *(void **)&ap->ops->set_piomode = NULL;
36753+ pax_close_kernel();
36754 ap->pio_mask = 0;
36755 }
36756 if (quirk & CF_BROKEN_MWDMA)
36757diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c
36758index f9b983a..887b9d8 100644
36759--- a/drivers/atm/adummy.c
36760+++ b/drivers/atm/adummy.c
36761@@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct sk_buff *skb)
36762 vcc->pop(vcc, skb);
36763 else
36764 dev_kfree_skb_any(skb);
36765- atomic_inc(&vcc->stats->tx);
36766+ atomic_inc_unchecked(&vcc->stats->tx);
36767
36768 return 0;
36769 }
36770diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c
36771index f1a9198..f466a4a 100644
36772--- a/drivers/atm/ambassador.c
36773+++ b/drivers/atm/ambassador.c
36774@@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, tx_out * tx) {
36775 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
36776
36777 // VC layer stats
36778- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36779+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36780
36781 // free the descriptor
36782 kfree (tx_descr);
36783@@ -495,7 +495,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36784 dump_skb ("<<<", vc, skb);
36785
36786 // VC layer stats
36787- atomic_inc(&atm_vcc->stats->rx);
36788+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36789 __net_timestamp(skb);
36790 // end of our responsibility
36791 atm_vcc->push (atm_vcc, skb);
36792@@ -510,7 +510,7 @@ static void rx_complete (amb_dev * dev, rx_out * rx) {
36793 } else {
36794 PRINTK (KERN_INFO, "dropped over-size frame");
36795 // should we count this?
36796- atomic_inc(&atm_vcc->stats->rx_drop);
36797+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36798 }
36799
36800 } else {
36801@@ -1338,7 +1338,7 @@ static int amb_send (struct atm_vcc * atm_vcc, struct sk_buff * skb) {
36802 }
36803
36804 if (check_area (skb->data, skb->len)) {
36805- atomic_inc(&atm_vcc->stats->tx_err);
36806+ atomic_inc_unchecked(&atm_vcc->stats->tx_err);
36807 return -ENOMEM; // ?
36808 }
36809
36810diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c
36811index 480fa6f..947067c 100644
36812--- a/drivers/atm/atmtcp.c
36813+++ b/drivers/atm/atmtcp.c
36814@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36815 if (vcc->pop) vcc->pop(vcc,skb);
36816 else dev_kfree_skb(skb);
36817 if (dev_data) return 0;
36818- atomic_inc(&vcc->stats->tx_err);
36819+ atomic_inc_unchecked(&vcc->stats->tx_err);
36820 return -ENOLINK;
36821 }
36822 size = skb->len+sizeof(struct atmtcp_hdr);
36823@@ -214,7 +214,7 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36824 if (!new_skb) {
36825 if (vcc->pop) vcc->pop(vcc,skb);
36826 else dev_kfree_skb(skb);
36827- atomic_inc(&vcc->stats->tx_err);
36828+ atomic_inc_unchecked(&vcc->stats->tx_err);
36829 return -ENOBUFS;
36830 }
36831 hdr = (void *) skb_put(new_skb,sizeof(struct atmtcp_hdr));
36832@@ -225,8 +225,8 @@ static int atmtcp_v_send(struct atm_vcc *vcc,struct sk_buff *skb)
36833 if (vcc->pop) vcc->pop(vcc,skb);
36834 else dev_kfree_skb(skb);
36835 out_vcc->push(out_vcc,new_skb);
36836- atomic_inc(&vcc->stats->tx);
36837- atomic_inc(&out_vcc->stats->rx);
36838+ atomic_inc_unchecked(&vcc->stats->tx);
36839+ atomic_inc_unchecked(&out_vcc->stats->rx);
36840 return 0;
36841 }
36842
36843@@ -300,7 +300,7 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36844 read_unlock(&vcc_sklist_lock);
36845 if (!out_vcc) {
36846 result = -EUNATCH;
36847- atomic_inc(&vcc->stats->tx_err);
36848+ atomic_inc_unchecked(&vcc->stats->tx_err);
36849 goto done;
36850 }
36851 skb_pull(skb,sizeof(struct atmtcp_hdr));
36852@@ -312,8 +312,8 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)
36853 __net_timestamp(new_skb);
36854 skb_copy_from_linear_data(skb, skb_put(new_skb, skb->len), skb->len);
36855 out_vcc->push(out_vcc,new_skb);
36856- atomic_inc(&vcc->stats->tx);
36857- atomic_inc(&out_vcc->stats->rx);
36858+ atomic_inc_unchecked(&vcc->stats->tx);
36859+ atomic_inc_unchecked(&out_vcc->stats->rx);
36860 done:
36861 if (vcc->pop) vcc->pop(vcc,skb);
36862 else dev_kfree_skb(skb);
36863diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c
36864index 6339efd..2b441d5 100644
36865--- a/drivers/atm/eni.c
36866+++ b/drivers/atm/eni.c
36867@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
36868 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
36869 vcc->dev->number);
36870 length = 0;
36871- atomic_inc(&vcc->stats->rx_err);
36872+ atomic_inc_unchecked(&vcc->stats->rx_err);
36873 }
36874 else {
36875 length = ATM_CELL_SIZE-1; /* no HEC */
36876@@ -580,7 +580,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36877 size);
36878 }
36879 eff = length = 0;
36880- atomic_inc(&vcc->stats->rx_err);
36881+ atomic_inc_unchecked(&vcc->stats->rx_err);
36882 }
36883 else {
36884 size = (descr & MID_RED_COUNT)*(ATM_CELL_PAYLOAD >> 2);
36885@@ -597,7 +597,7 @@ static int rx_aal5(struct atm_vcc *vcc)
36886 "(VCI=%d,length=%ld,size=%ld (descr 0x%lx))\n",
36887 vcc->dev->number,vcc->vci,length,size << 2,descr);
36888 length = eff = 0;
36889- atomic_inc(&vcc->stats->rx_err);
36890+ atomic_inc_unchecked(&vcc->stats->rx_err);
36891 }
36892 }
36893 skb = eff ? atm_alloc_charge(vcc,eff << 2,GFP_ATOMIC) : NULL;
36894@@ -770,7 +770,7 @@ rx_dequeued++;
36895 vcc->push(vcc,skb);
36896 pushed++;
36897 }
36898- atomic_inc(&vcc->stats->rx);
36899+ atomic_inc_unchecked(&vcc->stats->rx);
36900 }
36901 wake_up(&eni_dev->rx_wait);
36902 }
36903@@ -1230,7 +1230,7 @@ static void dequeue_tx(struct atm_dev *dev)
36904 DMA_TO_DEVICE);
36905 if (vcc->pop) vcc->pop(vcc,skb);
36906 else dev_kfree_skb_irq(skb);
36907- atomic_inc(&vcc->stats->tx);
36908+ atomic_inc_unchecked(&vcc->stats->tx);
36909 wake_up(&eni_dev->tx_wait);
36910 dma_complete++;
36911 }
36912diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
36913index 82f2ae0..f205c02 100644
36914--- a/drivers/atm/firestream.c
36915+++ b/drivers/atm/firestream.c
36916@@ -749,7 +749,7 @@ static void process_txdone_queue (struct fs_dev *dev, struct queue *q)
36917 }
36918 }
36919
36920- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
36921+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
36922
36923 fs_dprintk (FS_DEBUG_TXMEM, "i");
36924 fs_dprintk (FS_DEBUG_ALLOC, "Free t-skb: %p\n", skb);
36925@@ -816,7 +816,7 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36926 #endif
36927 skb_put (skb, qe->p1 & 0xffff);
36928 ATM_SKB(skb)->vcc = atm_vcc;
36929- atomic_inc(&atm_vcc->stats->rx);
36930+ atomic_inc_unchecked(&atm_vcc->stats->rx);
36931 __net_timestamp(skb);
36932 fs_dprintk (FS_DEBUG_ALLOC, "Free rec-skb: %p (pushed)\n", skb);
36933 atm_vcc->push (atm_vcc, skb);
36934@@ -837,12 +837,12 @@ static void process_incoming (struct fs_dev *dev, struct queue *q)
36935 kfree (pe);
36936 }
36937 if (atm_vcc)
36938- atomic_inc(&atm_vcc->stats->rx_drop);
36939+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36940 break;
36941 case 0x1f: /* Reassembly abort: no buffers. */
36942 /* Silently increment error counter. */
36943 if (atm_vcc)
36944- atomic_inc(&atm_vcc->stats->rx_drop);
36945+ atomic_inc_unchecked(&atm_vcc->stats->rx_drop);
36946 break;
36947 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
36948 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
36949diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
36950index 75dde90..4309ead 100644
36951--- a/drivers/atm/fore200e.c
36952+++ b/drivers/atm/fore200e.c
36953@@ -932,9 +932,9 @@ fore200e_tx_irq(struct fore200e* fore200e)
36954 #endif
36955 /* check error condition */
36956 if (*entry->status & STATUS_ERROR)
36957- atomic_inc(&vcc->stats->tx_err);
36958+ atomic_inc_unchecked(&vcc->stats->tx_err);
36959 else
36960- atomic_inc(&vcc->stats->tx);
36961+ atomic_inc_unchecked(&vcc->stats->tx);
36962 }
36963 }
36964
36965@@ -1083,7 +1083,7 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36966 if (skb == NULL) {
36967 DPRINTK(2, "unable to alloc new skb, rx PDU length = %d\n", pdu_len);
36968
36969- atomic_inc(&vcc->stats->rx_drop);
36970+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36971 return -ENOMEM;
36972 }
36973
36974@@ -1126,14 +1126,14 @@ fore200e_push_rpd(struct fore200e* fore200e, struct atm_vcc* vcc, struct rpd* rp
36975
36976 dev_kfree_skb_any(skb);
36977
36978- atomic_inc(&vcc->stats->rx_drop);
36979+ atomic_inc_unchecked(&vcc->stats->rx_drop);
36980 return -ENOMEM;
36981 }
36982
36983 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36984
36985 vcc->push(vcc, skb);
36986- atomic_inc(&vcc->stats->rx);
36987+ atomic_inc_unchecked(&vcc->stats->rx);
36988
36989 ASSERT(atomic_read(&sk_atm(vcc)->sk_wmem_alloc) >= 0);
36990
36991@@ -1211,7 +1211,7 @@ fore200e_rx_irq(struct fore200e* fore200e)
36992 DPRINTK(2, "damaged PDU on %d.%d.%d\n",
36993 fore200e->atm_dev->number,
36994 entry->rpd->atm_header.vpi, entry->rpd->atm_header.vci);
36995- atomic_inc(&vcc->stats->rx_err);
36996+ atomic_inc_unchecked(&vcc->stats->rx_err);
36997 }
36998 }
36999
37000@@ -1656,7 +1656,7 @@ fore200e_send(struct atm_vcc *vcc, struct sk_buff *skb)
37001 goto retry_here;
37002 }
37003
37004- atomic_inc(&vcc->stats->tx_err);
37005+ atomic_inc_unchecked(&vcc->stats->tx_err);
37006
37007 fore200e->tx_sat++;
37008 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
37009diff --git a/drivers/atm/he.c b/drivers/atm/he.c
37010index 93dca2e..c5daa69 100644
37011--- a/drivers/atm/he.c
37012+++ b/drivers/atm/he.c
37013@@ -1692,7 +1692,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37014
37015 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
37016 hprintk("HBUF_ERR! (cid 0x%x)\n", cid);
37017- atomic_inc(&vcc->stats->rx_drop);
37018+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37019 goto return_host_buffers;
37020 }
37021
37022@@ -1719,7 +1719,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37023 RBRQ_LEN_ERR(he_dev->rbrq_head)
37024 ? "LEN_ERR" : "",
37025 vcc->vpi, vcc->vci);
37026- atomic_inc(&vcc->stats->rx_err);
37027+ atomic_inc_unchecked(&vcc->stats->rx_err);
37028 goto return_host_buffers;
37029 }
37030
37031@@ -1771,7 +1771,7 @@ he_service_rbrq(struct he_dev *he_dev, int group)
37032 vcc->push(vcc, skb);
37033 spin_lock(&he_dev->global_lock);
37034
37035- atomic_inc(&vcc->stats->rx);
37036+ atomic_inc_unchecked(&vcc->stats->rx);
37037
37038 return_host_buffers:
37039 ++pdus_assembled;
37040@@ -2097,7 +2097,7 @@ __enqueue_tpd(struct he_dev *he_dev, struct he_tpd *tpd, unsigned cid)
37041 tpd->vcc->pop(tpd->vcc, tpd->skb);
37042 else
37043 dev_kfree_skb_any(tpd->skb);
37044- atomic_inc(&tpd->vcc->stats->tx_err);
37045+ atomic_inc_unchecked(&tpd->vcc->stats->tx_err);
37046 }
37047 dma_pool_free(he_dev->tpd_pool, tpd, TPD_ADDR(tpd->status));
37048 return;
37049@@ -2509,7 +2509,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37050 vcc->pop(vcc, skb);
37051 else
37052 dev_kfree_skb_any(skb);
37053- atomic_inc(&vcc->stats->tx_err);
37054+ atomic_inc_unchecked(&vcc->stats->tx_err);
37055 return -EINVAL;
37056 }
37057
37058@@ -2520,7 +2520,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37059 vcc->pop(vcc, skb);
37060 else
37061 dev_kfree_skb_any(skb);
37062- atomic_inc(&vcc->stats->tx_err);
37063+ atomic_inc_unchecked(&vcc->stats->tx_err);
37064 return -EINVAL;
37065 }
37066 #endif
37067@@ -2532,7 +2532,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37068 vcc->pop(vcc, skb);
37069 else
37070 dev_kfree_skb_any(skb);
37071- atomic_inc(&vcc->stats->tx_err);
37072+ atomic_inc_unchecked(&vcc->stats->tx_err);
37073 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37074 return -ENOMEM;
37075 }
37076@@ -2574,7 +2574,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37077 vcc->pop(vcc, skb);
37078 else
37079 dev_kfree_skb_any(skb);
37080- atomic_inc(&vcc->stats->tx_err);
37081+ atomic_inc_unchecked(&vcc->stats->tx_err);
37082 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37083 return -ENOMEM;
37084 }
37085@@ -2605,7 +2605,7 @@ he_send(struct atm_vcc *vcc, struct sk_buff *skb)
37086 __enqueue_tpd(he_dev, tpd, cid);
37087 spin_unlock_irqrestore(&he_dev->global_lock, flags);
37088
37089- atomic_inc(&vcc->stats->tx);
37090+ atomic_inc_unchecked(&vcc->stats->tx);
37091
37092 return 0;
37093 }
37094diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c
37095index 527bbd5..96570c8 100644
37096--- a/drivers/atm/horizon.c
37097+++ b/drivers/atm/horizon.c
37098@@ -1018,7 +1018,7 @@ static void rx_schedule (hrz_dev * dev, int irq) {
37099 {
37100 struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
37101 // VC layer stats
37102- atomic_inc(&vcc->stats->rx);
37103+ atomic_inc_unchecked(&vcc->stats->rx);
37104 __net_timestamp(skb);
37105 // end of our responsibility
37106 vcc->push (vcc, skb);
37107@@ -1170,7 +1170,7 @@ static void tx_schedule (hrz_dev * const dev, int irq) {
37108 dev->tx_iovec = NULL;
37109
37110 // VC layer stats
37111- atomic_inc(&ATM_SKB(skb)->vcc->stats->tx);
37112+ atomic_inc_unchecked(&ATM_SKB(skb)->vcc->stats->tx);
37113
37114 // free the skb
37115 hrz_kfree_skb (skb);
37116diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c
37117index 074616b..d6b3d5f 100644
37118--- a/drivers/atm/idt77252.c
37119+++ b/drivers/atm/idt77252.c
37120@@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, struct vc_map *vc)
37121 else
37122 dev_kfree_skb(skb);
37123
37124- atomic_inc(&vcc->stats->tx);
37125+ atomic_inc_unchecked(&vcc->stats->tx);
37126 }
37127
37128 atomic_dec(&scq->used);
37129@@ -1073,13 +1073,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37130 if ((sb = dev_alloc_skb(64)) == NULL) {
37131 printk("%s: Can't allocate buffers for aal0.\n",
37132 card->name);
37133- atomic_add(i, &vcc->stats->rx_drop);
37134+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37135 break;
37136 }
37137 if (!atm_charge(vcc, sb->truesize)) {
37138 RXPRINTK("%s: atm_charge() dropped aal0 packets.\n",
37139 card->name);
37140- atomic_add(i - 1, &vcc->stats->rx_drop);
37141+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop);
37142 dev_kfree_skb(sb);
37143 break;
37144 }
37145@@ -1096,7 +1096,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37146 ATM_SKB(sb)->vcc = vcc;
37147 __net_timestamp(sb);
37148 vcc->push(vcc, sb);
37149- atomic_inc(&vcc->stats->rx);
37150+ atomic_inc_unchecked(&vcc->stats->rx);
37151
37152 cell += ATM_CELL_PAYLOAD;
37153 }
37154@@ -1133,13 +1133,13 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37155 "(CDC: %08x)\n",
37156 card->name, len, rpp->len, readl(SAR_REG_CDC));
37157 recycle_rx_pool_skb(card, rpp);
37158- atomic_inc(&vcc->stats->rx_err);
37159+ atomic_inc_unchecked(&vcc->stats->rx_err);
37160 return;
37161 }
37162 if (stat & SAR_RSQE_CRC) {
37163 RXPRINTK("%s: AAL5 CRC error.\n", card->name);
37164 recycle_rx_pool_skb(card, rpp);
37165- atomic_inc(&vcc->stats->rx_err);
37166+ atomic_inc_unchecked(&vcc->stats->rx_err);
37167 return;
37168 }
37169 if (skb_queue_len(&rpp->queue) > 1) {
37170@@ -1150,7 +1150,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37171 RXPRINTK("%s: Can't alloc RX skb.\n",
37172 card->name);
37173 recycle_rx_pool_skb(card, rpp);
37174- atomic_inc(&vcc->stats->rx_err);
37175+ atomic_inc_unchecked(&vcc->stats->rx_err);
37176 return;
37177 }
37178 if (!atm_charge(vcc, skb->truesize)) {
37179@@ -1169,7 +1169,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37180 __net_timestamp(skb);
37181
37182 vcc->push(vcc, skb);
37183- atomic_inc(&vcc->stats->rx);
37184+ atomic_inc_unchecked(&vcc->stats->rx);
37185
37186 return;
37187 }
37188@@ -1191,7 +1191,7 @@ dequeue_rx(struct idt77252_dev *card, struct rsq_entry *rsqe)
37189 __net_timestamp(skb);
37190
37191 vcc->push(vcc, skb);
37192- atomic_inc(&vcc->stats->rx);
37193+ atomic_inc_unchecked(&vcc->stats->rx);
37194
37195 if (skb->truesize > SAR_FB_SIZE_3)
37196 add_rx_skb(card, 3, SAR_FB_SIZE_3, 1);
37197@@ -1302,14 +1302,14 @@ idt77252_rx_raw(struct idt77252_dev *card)
37198 if (vcc->qos.aal != ATM_AAL0) {
37199 RPRINTK("%s: raw cell for non AAL0 vc %u.%u\n",
37200 card->name, vpi, vci);
37201- atomic_inc(&vcc->stats->rx_drop);
37202+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37203 goto drop;
37204 }
37205
37206 if ((sb = dev_alloc_skb(64)) == NULL) {
37207 printk("%s: Can't allocate buffers for AAL0.\n",
37208 card->name);
37209- atomic_inc(&vcc->stats->rx_err);
37210+ atomic_inc_unchecked(&vcc->stats->rx_err);
37211 goto drop;
37212 }
37213
37214@@ -1328,7 +1328,7 @@ idt77252_rx_raw(struct idt77252_dev *card)
37215 ATM_SKB(sb)->vcc = vcc;
37216 __net_timestamp(sb);
37217 vcc->push(vcc, sb);
37218- atomic_inc(&vcc->stats->rx);
37219+ atomic_inc_unchecked(&vcc->stats->rx);
37220
37221 drop:
37222 skb_pull(queue, 64);
37223@@ -1953,13 +1953,13 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37224
37225 if (vc == NULL) {
37226 printk("%s: NULL connection in send().\n", card->name);
37227- atomic_inc(&vcc->stats->tx_err);
37228+ atomic_inc_unchecked(&vcc->stats->tx_err);
37229 dev_kfree_skb(skb);
37230 return -EINVAL;
37231 }
37232 if (!test_bit(VCF_TX, &vc->flags)) {
37233 printk("%s: Trying to transmit on a non-tx VC.\n", card->name);
37234- atomic_inc(&vcc->stats->tx_err);
37235+ atomic_inc_unchecked(&vcc->stats->tx_err);
37236 dev_kfree_skb(skb);
37237 return -EINVAL;
37238 }
37239@@ -1971,14 +1971,14 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37240 break;
37241 default:
37242 printk("%s: Unsupported AAL: %d\n", card->name, vcc->qos.aal);
37243- atomic_inc(&vcc->stats->tx_err);
37244+ atomic_inc_unchecked(&vcc->stats->tx_err);
37245 dev_kfree_skb(skb);
37246 return -EINVAL;
37247 }
37248
37249 if (skb_shinfo(skb)->nr_frags != 0) {
37250 printk("%s: No scatter-gather yet.\n", card->name);
37251- atomic_inc(&vcc->stats->tx_err);
37252+ atomic_inc_unchecked(&vcc->stats->tx_err);
37253 dev_kfree_skb(skb);
37254 return -EINVAL;
37255 }
37256@@ -1986,7 +1986,7 @@ idt77252_send_skb(struct atm_vcc *vcc, struct sk_buff *skb, int oam)
37257
37258 err = queue_skb(card, vc, skb, oam);
37259 if (err) {
37260- atomic_inc(&vcc->stats->tx_err);
37261+ atomic_inc_unchecked(&vcc->stats->tx_err);
37262 dev_kfree_skb(skb);
37263 return err;
37264 }
37265@@ -2009,7 +2009,7 @@ idt77252_send_oam(struct atm_vcc *vcc, void *cell, int flags)
37266 skb = dev_alloc_skb(64);
37267 if (!skb) {
37268 printk("%s: Out of memory in send_oam().\n", card->name);
37269- atomic_inc(&vcc->stats->tx_err);
37270+ atomic_inc_unchecked(&vcc->stats->tx_err);
37271 return -ENOMEM;
37272 }
37273 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
37274diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c
37275index 924f8e2..3375a3e 100644
37276--- a/drivers/atm/iphase.c
37277+++ b/drivers/atm/iphase.c
37278@@ -1145,7 +1145,7 @@ static int rx_pkt(struct atm_dev *dev)
37279 status = (u_short) (buf_desc_ptr->desc_mode);
37280 if (status & (RX_CER | RX_PTE | RX_OFL))
37281 {
37282- atomic_inc(&vcc->stats->rx_err);
37283+ atomic_inc_unchecked(&vcc->stats->rx_err);
37284 IF_ERR(printk("IA: bad packet, dropping it");)
37285 if (status & RX_CER) {
37286 IF_ERR(printk(" cause: packet CRC error\n");)
37287@@ -1168,7 +1168,7 @@ static int rx_pkt(struct atm_dev *dev)
37288 len = dma_addr - buf_addr;
37289 if (len > iadev->rx_buf_sz) {
37290 printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz);
37291- atomic_inc(&vcc->stats->rx_err);
37292+ atomic_inc_unchecked(&vcc->stats->rx_err);
37293 goto out_free_desc;
37294 }
37295
37296@@ -1318,7 +1318,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37297 ia_vcc = INPH_IA_VCC(vcc);
37298 if (ia_vcc == NULL)
37299 {
37300- atomic_inc(&vcc->stats->rx_err);
37301+ atomic_inc_unchecked(&vcc->stats->rx_err);
37302 atm_return(vcc, skb->truesize);
37303 dev_kfree_skb_any(skb);
37304 goto INCR_DLE;
37305@@ -1330,7 +1330,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37306 if ((length > iadev->rx_buf_sz) || (length >
37307 (skb->len - sizeof(struct cpcs_trailer))))
37308 {
37309- atomic_inc(&vcc->stats->rx_err);
37310+ atomic_inc_unchecked(&vcc->stats->rx_err);
37311 IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)",
37312 length, skb->len);)
37313 atm_return(vcc, skb->truesize);
37314@@ -1346,7 +1346,7 @@ static void rx_dle_intr(struct atm_dev *dev)
37315
37316 IF_RX(printk("rx_dle_intr: skb push");)
37317 vcc->push(vcc,skb);
37318- atomic_inc(&vcc->stats->rx);
37319+ atomic_inc_unchecked(&vcc->stats->rx);
37320 iadev->rx_pkt_cnt++;
37321 }
37322 INCR_DLE:
37323@@ -2828,15 +2828,15 @@ static int ia_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
37324 {
37325 struct k_sonet_stats *stats;
37326 stats = &PRIV(_ia_dev[board])->sonet_stats;
37327- printk("section_bip: %d\n", atomic_read(&stats->section_bip));
37328- printk("line_bip : %d\n", atomic_read(&stats->line_bip));
37329- printk("path_bip : %d\n", atomic_read(&stats->path_bip));
37330- printk("line_febe : %d\n", atomic_read(&stats->line_febe));
37331- printk("path_febe : %d\n", atomic_read(&stats->path_febe));
37332- printk("corr_hcs : %d\n", atomic_read(&stats->corr_hcs));
37333- printk("uncorr_hcs : %d\n", atomic_read(&stats->uncorr_hcs));
37334- printk("tx_cells : %d\n", atomic_read(&stats->tx_cells));
37335- printk("rx_cells : %d\n", atomic_read(&stats->rx_cells));
37336+ printk("section_bip: %d\n", atomic_read_unchecked(&stats->section_bip));
37337+ printk("line_bip : %d\n", atomic_read_unchecked(&stats->line_bip));
37338+ printk("path_bip : %d\n", atomic_read_unchecked(&stats->path_bip));
37339+ printk("line_febe : %d\n", atomic_read_unchecked(&stats->line_febe));
37340+ printk("path_febe : %d\n", atomic_read_unchecked(&stats->path_febe));
37341+ printk("corr_hcs : %d\n", atomic_read_unchecked(&stats->corr_hcs));
37342+ printk("uncorr_hcs : %d\n", atomic_read_unchecked(&stats->uncorr_hcs));
37343+ printk("tx_cells : %d\n", atomic_read_unchecked(&stats->tx_cells));
37344+ printk("rx_cells : %d\n", atomic_read_unchecked(&stats->rx_cells));
37345 }
37346 ia_cmds.status = 0;
37347 break;
37348@@ -2941,7 +2941,7 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37349 if ((desc == 0) || (desc > iadev->num_tx_desc))
37350 {
37351 IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);)
37352- atomic_inc(&vcc->stats->tx);
37353+ atomic_inc_unchecked(&vcc->stats->tx);
37354 if (vcc->pop)
37355 vcc->pop(vcc, skb);
37356 else
37357@@ -3046,14 +3046,14 @@ static int ia_pkt_tx (struct atm_vcc *vcc, struct sk_buff *skb) {
37358 ATM_DESC(skb) = vcc->vci;
37359 skb_queue_tail(&iadev->tx_dma_q, skb);
37360
37361- atomic_inc(&vcc->stats->tx);
37362+ atomic_inc_unchecked(&vcc->stats->tx);
37363 iadev->tx_pkt_cnt++;
37364 /* Increment transaction counter */
37365 writel(2, iadev->dma+IPHASE5575_TX_COUNTER);
37366
37367 #if 0
37368 /* add flow control logic */
37369- if (atomic_read(&vcc->stats->tx) % 20 == 0) {
37370+ if (atomic_read_unchecked(&vcc->stats->tx) % 20 == 0) {
37371 if (iavcc->vc_desc_cnt > 10) {
37372 vcc->tx_quota = vcc->tx_quota * 3 / 4;
37373 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
37374diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c
37375index ce43ae3..969de38 100644
37376--- a/drivers/atm/lanai.c
37377+++ b/drivers/atm/lanai.c
37378@@ -1295,7 +1295,7 @@ static void lanai_send_one_aal5(struct lanai_dev *lanai,
37379 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
37380 lanai_endtx(lanai, lvcc);
37381 lanai_free_skb(lvcc->tx.atmvcc, skb);
37382- atomic_inc(&lvcc->tx.atmvcc->stats->tx);
37383+ atomic_inc_unchecked(&lvcc->tx.atmvcc->stats->tx);
37384 }
37385
37386 /* Try to fill the buffer - don't call unless there is backlog */
37387@@ -1418,7 +1418,7 @@ static void vcc_rx_aal5(struct lanai_vcc *lvcc, int endptr)
37388 ATM_SKB(skb)->vcc = lvcc->rx.atmvcc;
37389 __net_timestamp(skb);
37390 lvcc->rx.atmvcc->push(lvcc->rx.atmvcc, skb);
37391- atomic_inc(&lvcc->rx.atmvcc->stats->rx);
37392+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx);
37393 out:
37394 lvcc->rx.buf.ptr = end;
37395 cardvcc_write(lvcc, endptr, vcc_rxreadptr);
37396@@ -1659,7 +1659,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37397 DPRINTK("(itf %d) got RX service entry 0x%X for non-AAL5 "
37398 "vcc %d\n", lanai->number, (unsigned int) s, vci);
37399 lanai->stats.service_rxnotaal5++;
37400- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37401+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37402 return 0;
37403 }
37404 if (likely(!(s & (SERVICE_TRASH | SERVICE_STREAM | SERVICE_CRCERR)))) {
37405@@ -1671,7 +1671,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37406 int bytes;
37407 read_unlock(&vcc_sklist_lock);
37408 DPRINTK("got trashed rx pdu on vci %d\n", vci);
37409- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37410+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37411 lvcc->stats.x.aal5.service_trash++;
37412 bytes = (SERVICE_GET_END(s) * 16) -
37413 (((unsigned long) lvcc->rx.buf.ptr) -
37414@@ -1683,7 +1683,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37415 }
37416 if (s & SERVICE_STREAM) {
37417 read_unlock(&vcc_sklist_lock);
37418- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37419+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37420 lvcc->stats.x.aal5.service_stream++;
37421 printk(KERN_ERR DEV_LABEL "(itf %d): Got AAL5 stream "
37422 "PDU on VCI %d!\n", lanai->number, vci);
37423@@ -1691,7 +1691,7 @@ static int handle_service(struct lanai_dev *lanai, u32 s)
37424 return 0;
37425 }
37426 DPRINTK("got rx crc error on vci %d\n", vci);
37427- atomic_inc(&lvcc->rx.atmvcc->stats->rx_err);
37428+ atomic_inc_unchecked(&lvcc->rx.atmvcc->stats->rx_err);
37429 lvcc->stats.x.aal5.service_rxcrc++;
37430 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
37431 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
37432diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
37433index b7e1cc0..eb336bfe 100644
37434--- a/drivers/atm/nicstar.c
37435+++ b/drivers/atm/nicstar.c
37436@@ -1640,7 +1640,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37437 if ((vc = (vc_map *) vcc->dev_data) == NULL) {
37438 printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
37439 card->index);
37440- atomic_inc(&vcc->stats->tx_err);
37441+ atomic_inc_unchecked(&vcc->stats->tx_err);
37442 dev_kfree_skb_any(skb);
37443 return -EINVAL;
37444 }
37445@@ -1648,7 +1648,7 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37446 if (!vc->tx) {
37447 printk("nicstar%d: Trying to transmit on a non-tx VC.\n",
37448 card->index);
37449- atomic_inc(&vcc->stats->tx_err);
37450+ atomic_inc_unchecked(&vcc->stats->tx_err);
37451 dev_kfree_skb_any(skb);
37452 return -EINVAL;
37453 }
37454@@ -1656,14 +1656,14 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37455 if (vcc->qos.aal != ATM_AAL5 && vcc->qos.aal != ATM_AAL0) {
37456 printk("nicstar%d: Only AAL0 and AAL5 are supported.\n",
37457 card->index);
37458- atomic_inc(&vcc->stats->tx_err);
37459+ atomic_inc_unchecked(&vcc->stats->tx_err);
37460 dev_kfree_skb_any(skb);
37461 return -EINVAL;
37462 }
37463
37464 if (skb_shinfo(skb)->nr_frags != 0) {
37465 printk("nicstar%d: No scatter-gather yet.\n", card->index);
37466- atomic_inc(&vcc->stats->tx_err);
37467+ atomic_inc_unchecked(&vcc->stats->tx_err);
37468 dev_kfree_skb_any(skb);
37469 return -EINVAL;
37470 }
37471@@ -1711,11 +1711,11 @@ static int ns_send(struct atm_vcc *vcc, struct sk_buff *skb)
37472 }
37473
37474 if (push_scqe(card, vc, scq, &scqe, skb) != 0) {
37475- atomic_inc(&vcc->stats->tx_err);
37476+ atomic_inc_unchecked(&vcc->stats->tx_err);
37477 dev_kfree_skb_any(skb);
37478 return -EIO;
37479 }
37480- atomic_inc(&vcc->stats->tx);
37481+ atomic_inc_unchecked(&vcc->stats->tx);
37482
37483 return 0;
37484 }
37485@@ -2032,14 +2032,14 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37486 printk
37487 ("nicstar%d: Can't allocate buffers for aal0.\n",
37488 card->index);
37489- atomic_add(i, &vcc->stats->rx_drop);
37490+ atomic_add_unchecked(i, &vcc->stats->rx_drop);
37491 break;
37492 }
37493 if (!atm_charge(vcc, sb->truesize)) {
37494 RXPRINTK
37495 ("nicstar%d: atm_charge() dropped aal0 packets.\n",
37496 card->index);
37497- atomic_add(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37498+ atomic_add_unchecked(i - 1, &vcc->stats->rx_drop); /* already increased by 1 */
37499 dev_kfree_skb_any(sb);
37500 break;
37501 }
37502@@ -2054,7 +2054,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37503 ATM_SKB(sb)->vcc = vcc;
37504 __net_timestamp(sb);
37505 vcc->push(vcc, sb);
37506- atomic_inc(&vcc->stats->rx);
37507+ atomic_inc_unchecked(&vcc->stats->rx);
37508 cell += ATM_CELL_PAYLOAD;
37509 }
37510
37511@@ -2071,7 +2071,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37512 if (iovb == NULL) {
37513 printk("nicstar%d: Out of iovec buffers.\n",
37514 card->index);
37515- atomic_inc(&vcc->stats->rx_drop);
37516+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37517 recycle_rx_buf(card, skb);
37518 return;
37519 }
37520@@ -2095,7 +2095,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37521 small or large buffer itself. */
37522 } else if (NS_PRV_IOVCNT(iovb) >= NS_MAX_IOVECS) {
37523 printk("nicstar%d: received too big AAL5 SDU.\n", card->index);
37524- atomic_inc(&vcc->stats->rx_err);
37525+ atomic_inc_unchecked(&vcc->stats->rx_err);
37526 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37527 NS_MAX_IOVECS);
37528 NS_PRV_IOVCNT(iovb) = 0;
37529@@ -2115,7 +2115,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37530 ("nicstar%d: Expected a small buffer, and this is not one.\n",
37531 card->index);
37532 which_list(card, skb);
37533- atomic_inc(&vcc->stats->rx_err);
37534+ atomic_inc_unchecked(&vcc->stats->rx_err);
37535 recycle_rx_buf(card, skb);
37536 vc->rx_iov = NULL;
37537 recycle_iov_buf(card, iovb);
37538@@ -2128,7 +2128,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37539 ("nicstar%d: Expected a large buffer, and this is not one.\n",
37540 card->index);
37541 which_list(card, skb);
37542- atomic_inc(&vcc->stats->rx_err);
37543+ atomic_inc_unchecked(&vcc->stats->rx_err);
37544 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37545 NS_PRV_IOVCNT(iovb));
37546 vc->rx_iov = NULL;
37547@@ -2151,7 +2151,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37548 printk(" - PDU size mismatch.\n");
37549 else
37550 printk(".\n");
37551- atomic_inc(&vcc->stats->rx_err);
37552+ atomic_inc_unchecked(&vcc->stats->rx_err);
37553 recycle_iovec_rx_bufs(card, (struct iovec *)iovb->data,
37554 NS_PRV_IOVCNT(iovb));
37555 vc->rx_iov = NULL;
37556@@ -2165,7 +2165,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37557 /* skb points to a small buffer */
37558 if (!atm_charge(vcc, skb->truesize)) {
37559 push_rxbufs(card, skb);
37560- atomic_inc(&vcc->stats->rx_drop);
37561+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37562 } else {
37563 skb_put(skb, len);
37564 dequeue_sm_buf(card, skb);
37565@@ -2175,7 +2175,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37566 ATM_SKB(skb)->vcc = vcc;
37567 __net_timestamp(skb);
37568 vcc->push(vcc, skb);
37569- atomic_inc(&vcc->stats->rx);
37570+ atomic_inc_unchecked(&vcc->stats->rx);
37571 }
37572 } else if (NS_PRV_IOVCNT(iovb) == 2) { /* One small plus one large buffer */
37573 struct sk_buff *sb;
37574@@ -2186,7 +2186,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37575 if (len <= NS_SMBUFSIZE) {
37576 if (!atm_charge(vcc, sb->truesize)) {
37577 push_rxbufs(card, sb);
37578- atomic_inc(&vcc->stats->rx_drop);
37579+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37580 } else {
37581 skb_put(sb, len);
37582 dequeue_sm_buf(card, sb);
37583@@ -2196,7 +2196,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37584 ATM_SKB(sb)->vcc = vcc;
37585 __net_timestamp(sb);
37586 vcc->push(vcc, sb);
37587- atomic_inc(&vcc->stats->rx);
37588+ atomic_inc_unchecked(&vcc->stats->rx);
37589 }
37590
37591 push_rxbufs(card, skb);
37592@@ -2205,7 +2205,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37593
37594 if (!atm_charge(vcc, skb->truesize)) {
37595 push_rxbufs(card, skb);
37596- atomic_inc(&vcc->stats->rx_drop);
37597+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37598 } else {
37599 dequeue_lg_buf(card, skb);
37600 #ifdef NS_USE_DESTRUCTORS
37601@@ -2218,7 +2218,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37602 ATM_SKB(skb)->vcc = vcc;
37603 __net_timestamp(skb);
37604 vcc->push(vcc, skb);
37605- atomic_inc(&vcc->stats->rx);
37606+ atomic_inc_unchecked(&vcc->stats->rx);
37607 }
37608
37609 push_rxbufs(card, sb);
37610@@ -2239,7 +2239,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37611 printk
37612 ("nicstar%d: Out of huge buffers.\n",
37613 card->index);
37614- atomic_inc(&vcc->stats->rx_drop);
37615+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37616 recycle_iovec_rx_bufs(card,
37617 (struct iovec *)
37618 iovb->data,
37619@@ -2290,7 +2290,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37620 card->hbpool.count++;
37621 } else
37622 dev_kfree_skb_any(hb);
37623- atomic_inc(&vcc->stats->rx_drop);
37624+ atomic_inc_unchecked(&vcc->stats->rx_drop);
37625 } else {
37626 /* Copy the small buffer to the huge buffer */
37627 sb = (struct sk_buff *)iov->iov_base;
37628@@ -2327,7 +2327,7 @@ static void dequeue_rx(ns_dev * card, ns_rsqe * rsqe)
37629 #endif /* NS_USE_DESTRUCTORS */
37630 __net_timestamp(hb);
37631 vcc->push(vcc, hb);
37632- atomic_inc(&vcc->stats->rx);
37633+ atomic_inc_unchecked(&vcc->stats->rx);
37634 }
37635 }
37636
37637diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
37638index 74e18b0..f16afa0 100644
37639--- a/drivers/atm/solos-pci.c
37640+++ b/drivers/atm/solos-pci.c
37641@@ -838,7 +838,7 @@ static void solos_bh(unsigned long card_arg)
37642 }
37643 atm_charge(vcc, skb->truesize);
37644 vcc->push(vcc, skb);
37645- atomic_inc(&vcc->stats->rx);
37646+ atomic_inc_unchecked(&vcc->stats->rx);
37647 break;
37648
37649 case PKT_STATUS:
37650@@ -1116,7 +1116,7 @@ static uint32_t fpga_tx(struct solos_card *card)
37651 vcc = SKB_CB(oldskb)->vcc;
37652
37653 if (vcc) {
37654- atomic_inc(&vcc->stats->tx);
37655+ atomic_inc_unchecked(&vcc->stats->tx);
37656 solos_pop(vcc, oldskb);
37657 } else {
37658 dev_kfree_skb_irq(oldskb);
37659diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c
37660index 0215934..ce9f5b1 100644
37661--- a/drivers/atm/suni.c
37662+++ b/drivers/atm/suni.c
37663@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
37664
37665
37666 #define ADD_LIMITED(s,v) \
37667- atomic_add((v),&stats->s); \
37668- if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX);
37669+ atomic_add_unchecked((v),&stats->s); \
37670+ if (atomic_read_unchecked(&stats->s) < 0) atomic_set_unchecked(&stats->s,INT_MAX);
37671
37672
37673 static void suni_hz(unsigned long from_timer)
37674diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c
37675index 5120a96..e2572bd 100644
37676--- a/drivers/atm/uPD98402.c
37677+++ b/drivers/atm/uPD98402.c
37678@@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *dev,struct sonet_stats __user *arg,int ze
37679 struct sonet_stats tmp;
37680 int error = 0;
37681
37682- atomic_add(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37683+ atomic_add_unchecked(GET(HECCT),&PRIV(dev)->sonet_stats.uncorr_hcs);
37684 sonet_copy_stats(&PRIV(dev)->sonet_stats,&tmp);
37685 if (arg) error = copy_to_user(arg,&tmp,sizeof(tmp));
37686 if (zero && !error) {
37687@@ -161,9 +161,9 @@ static int uPD98402_ioctl(struct atm_dev *dev,unsigned int cmd,void __user *arg)
37688
37689
37690 #define ADD_LIMITED(s,v) \
37691- { atomic_add(GET(v),&PRIV(dev)->sonet_stats.s); \
37692- if (atomic_read(&PRIV(dev)->sonet_stats.s) < 0) \
37693- atomic_set(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37694+ { atomic_add_unchecked(GET(v),&PRIV(dev)->sonet_stats.s); \
37695+ if (atomic_read_unchecked(&PRIV(dev)->sonet_stats.s) < 0) \
37696+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.s,INT_MAX); }
37697
37698
37699 static void stat_event(struct atm_dev *dev)
37700@@ -194,7 +194,7 @@ static void uPD98402_int(struct atm_dev *dev)
37701 if (reason & uPD98402_INT_PFM) stat_event(dev);
37702 if (reason & uPD98402_INT_PCO) {
37703 (void) GET(PCOCR); /* clear interrupt cause */
37704- atomic_add(GET(HECCT),
37705+ atomic_add_unchecked(GET(HECCT),
37706 &PRIV(dev)->sonet_stats.uncorr_hcs);
37707 }
37708 if ((reason & uPD98402_INT_RFO) &&
37709@@ -222,9 +222,9 @@ static int uPD98402_start(struct atm_dev *dev)
37710 PUT(~(uPD98402_INT_PFM | uPD98402_INT_ALM | uPD98402_INT_RFO |
37711 uPD98402_INT_LOS),PIMR); /* enable them */
37712 (void) fetch_stats(dev,NULL,1); /* clear kernel counters */
37713- atomic_set(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37714- atomic_set(&PRIV(dev)->sonet_stats.tx_cells,-1);
37715- atomic_set(&PRIV(dev)->sonet_stats.rx_cells,-1);
37716+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.corr_hcs,-1);
37717+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.tx_cells,-1);
37718+ atomic_set_unchecked(&PRIV(dev)->sonet_stats.rx_cells,-1);
37719 return 0;
37720 }
37721
37722diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c
37723index cecfb94..87009ec 100644
37724--- a/drivers/atm/zatm.c
37725+++ b/drivers/atm/zatm.c
37726@@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37727 }
37728 if (!size) {
37729 dev_kfree_skb_irq(skb);
37730- if (vcc) atomic_inc(&vcc->stats->rx_err);
37731+ if (vcc) atomic_inc_unchecked(&vcc->stats->rx_err);
37732 continue;
37733 }
37734 if (!atm_charge(vcc,skb->truesize)) {
37735@@ -469,7 +469,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy[0],dummy[1]);
37736 skb->len = size;
37737 ATM_SKB(skb)->vcc = vcc;
37738 vcc->push(vcc,skb);
37739- atomic_inc(&vcc->stats->rx);
37740+ atomic_inc_unchecked(&vcc->stats->rx);
37741 }
37742 zout(pos & 0xffff,MTA(mbx));
37743 #if 0 /* probably a stupid idea */
37744@@ -733,7 +733,7 @@ if (*ZATM_PRV_DSC(skb) != (uPD98401_TXPD_V | uPD98401_TXPD_DP |
37745 skb_queue_head(&zatm_vcc->backlog,skb);
37746 break;
37747 }
37748- atomic_inc(&vcc->stats->tx);
37749+ atomic_inc_unchecked(&vcc->stats->tx);
37750 wake_up(&zatm_vcc->tx_wait);
37751 }
37752
37753diff --git a/drivers/base/bus.c b/drivers/base/bus.c
37754index 79bc203..fa3945b 100644
37755--- a/drivers/base/bus.c
37756+++ b/drivers/base/bus.c
37757@@ -1126,7 +1126,7 @@ int subsys_interface_register(struct subsys_interface *sif)
37758 return -EINVAL;
37759
37760 mutex_lock(&subsys->p->mutex);
37761- list_add_tail(&sif->node, &subsys->p->interfaces);
37762+ pax_list_add_tail((struct list_head *)&sif->node, &subsys->p->interfaces);
37763 if (sif->add_dev) {
37764 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37765 while ((dev = subsys_dev_iter_next(&iter)))
37766@@ -1151,7 +1151,7 @@ void subsys_interface_unregister(struct subsys_interface *sif)
37767 subsys = sif->subsys;
37768
37769 mutex_lock(&subsys->p->mutex);
37770- list_del_init(&sif->node);
37771+ pax_list_del_init((struct list_head *)&sif->node);
37772 if (sif->remove_dev) {
37773 subsys_dev_iter_init(&iter, subsys, NULL, NULL);
37774 while ((dev = subsys_dev_iter_next(&iter)))
37775diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c
37776index 25798db..15f130e 100644
37777--- a/drivers/base/devtmpfs.c
37778+++ b/drivers/base/devtmpfs.c
37779@@ -354,7 +354,7 @@ int devtmpfs_mount(const char *mntdir)
37780 if (!thread)
37781 return 0;
37782
37783- err = sys_mount("devtmpfs", (char *)mntdir, "devtmpfs", MS_SILENT, NULL);
37784+ err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)mntdir, (char __force_user *)"devtmpfs", MS_SILENT, NULL);
37785 if (err)
37786 printk(KERN_INFO "devtmpfs: error mounting %i\n", err);
37787 else
37788@@ -380,11 +380,11 @@ static int devtmpfsd(void *p)
37789 *err = sys_unshare(CLONE_NEWNS);
37790 if (*err)
37791 goto out;
37792- *err = sys_mount("devtmpfs", "/", "devtmpfs", MS_SILENT, options);
37793+ *err = sys_mount((char __force_user *)"devtmpfs", (char __force_user *)"/", (char __force_user *)"devtmpfs", MS_SILENT, (char __force_user *)options);
37794 if (*err)
37795 goto out;
37796- sys_chdir("/.."); /* will traverse into overmounted root */
37797- sys_chroot(".");
37798+ sys_chdir((char __force_user *)"/.."); /* will traverse into overmounted root */
37799+ sys_chroot((char __force_user *)".");
37800 complete(&setup_done);
37801 while (1) {
37802 spin_lock(&req_lock);
37803diff --git a/drivers/base/node.c b/drivers/base/node.c
37804index 36fabe43..8cfc112 100644
37805--- a/drivers/base/node.c
37806+++ b/drivers/base/node.c
37807@@ -615,7 +615,7 @@ static ssize_t print_nodes_state(enum node_states state, char *buf)
37808 struct node_attr {
37809 struct device_attribute attr;
37810 enum node_states state;
37811-};
37812+} __do_const;
37813
37814 static ssize_t show_node_state(struct device *dev,
37815 struct device_attribute *attr, char *buf)
37816diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
37817index 45937f8..b9a342e 100644
37818--- a/drivers/base/power/domain.c
37819+++ b/drivers/base/power/domain.c
37820@@ -1698,7 +1698,7 @@ int pm_genpd_attach_cpuidle(struct generic_pm_domain *genpd, int state)
37821 {
37822 struct cpuidle_driver *cpuidle_drv;
37823 struct gpd_cpuidle_data *cpuidle_data;
37824- struct cpuidle_state *idle_state;
37825+ cpuidle_state_no_const *idle_state;
37826 int ret = 0;
37827
37828 if (IS_ERR_OR_NULL(genpd) || state < 0)
37829@@ -1766,7 +1766,7 @@ int pm_genpd_name_attach_cpuidle(const char *name, int state)
37830 int pm_genpd_detach_cpuidle(struct generic_pm_domain *genpd)
37831 {
37832 struct gpd_cpuidle_data *cpuidle_data;
37833- struct cpuidle_state *idle_state;
37834+ cpuidle_state_no_const *idle_state;
37835 int ret = 0;
37836
37837 if (IS_ERR_OR_NULL(genpd))
37838@@ -2195,7 +2195,10 @@ int genpd_dev_pm_attach(struct device *dev)
37839 return ret;
37840 }
37841
37842- dev->pm_domain->detach = genpd_dev_pm_detach;
37843+ pax_open_kernel();
37844+ *(void **)&dev->pm_domain->detach = genpd_dev_pm_detach;
37845+ pax_close_kernel();
37846+
37847 pm_genpd_poweron(pd);
37848
37849 return 0;
37850diff --git a/drivers/base/power/sysfs.c b/drivers/base/power/sysfs.c
37851index d2be3f9..0a3167a 100644
37852--- a/drivers/base/power/sysfs.c
37853+++ b/drivers/base/power/sysfs.c
37854@@ -181,7 +181,7 @@ static ssize_t rtpm_status_show(struct device *dev,
37855 return -EIO;
37856 }
37857 }
37858- return sprintf(buf, p);
37859+ return sprintf(buf, "%s", p);
37860 }
37861
37862 static DEVICE_ATTR(runtime_status, 0444, rtpm_status_show, NULL);
37863diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
37864index aab7158..b172db2 100644
37865--- a/drivers/base/power/wakeup.c
37866+++ b/drivers/base/power/wakeup.c
37867@@ -32,14 +32,14 @@ static bool pm_abort_suspend __read_mostly;
37868 * They need to be modified together atomically, so it's better to use one
37869 * atomic variable to hold them both.
37870 */
37871-static atomic_t combined_event_count = ATOMIC_INIT(0);
37872+static atomic_unchecked_t combined_event_count = ATOMIC_INIT(0);
37873
37874 #define IN_PROGRESS_BITS (sizeof(int) * 4)
37875 #define MAX_IN_PROGRESS ((1 << IN_PROGRESS_BITS) - 1)
37876
37877 static void split_counters(unsigned int *cnt, unsigned int *inpr)
37878 {
37879- unsigned int comb = atomic_read(&combined_event_count);
37880+ unsigned int comb = atomic_read_unchecked(&combined_event_count);
37881
37882 *cnt = (comb >> IN_PROGRESS_BITS);
37883 *inpr = comb & MAX_IN_PROGRESS;
37884@@ -404,7 +404,7 @@ static void wakeup_source_activate(struct wakeup_source *ws)
37885 ws->start_prevent_time = ws->last_time;
37886
37887 /* Increment the counter of events in progress. */
37888- cec = atomic_inc_return(&combined_event_count);
37889+ cec = atomic_inc_return_unchecked(&combined_event_count);
37890
37891 trace_wakeup_source_activate(ws->name, cec);
37892 }
37893@@ -530,7 +530,7 @@ static void wakeup_source_deactivate(struct wakeup_source *ws)
37894 * Increment the counter of registered wakeup events and decrement the
37895 * couter of wakeup events in progress simultaneously.
37896 */
37897- cec = atomic_add_return(MAX_IN_PROGRESS, &combined_event_count);
37898+ cec = atomic_add_return_unchecked(MAX_IN_PROGRESS, &combined_event_count);
37899 trace_wakeup_source_deactivate(ws->name, cec);
37900
37901 split_counters(&cnt, &inpr);
37902diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
37903index 8d98a32..61d3165 100644
37904--- a/drivers/base/syscore.c
37905+++ b/drivers/base/syscore.c
37906@@ -22,7 +22,7 @@ static DEFINE_MUTEX(syscore_ops_lock);
37907 void register_syscore_ops(struct syscore_ops *ops)
37908 {
37909 mutex_lock(&syscore_ops_lock);
37910- list_add_tail(&ops->node, &syscore_ops_list);
37911+ pax_list_add_tail((struct list_head *)&ops->node, &syscore_ops_list);
37912 mutex_unlock(&syscore_ops_lock);
37913 }
37914 EXPORT_SYMBOL_GPL(register_syscore_ops);
37915@@ -34,7 +34,7 @@ EXPORT_SYMBOL_GPL(register_syscore_ops);
37916 void unregister_syscore_ops(struct syscore_ops *ops)
37917 {
37918 mutex_lock(&syscore_ops_lock);
37919- list_del(&ops->node);
37920+ pax_list_del((struct list_head *)&ops->node);
37921 mutex_unlock(&syscore_ops_lock);
37922 }
37923 EXPORT_SYMBOL_GPL(unregister_syscore_ops);
37924diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
37925index ff20f19..018f1da 100644
37926--- a/drivers/block/cciss.c
37927+++ b/drivers/block/cciss.c
37928@@ -3008,7 +3008,7 @@ static void start_io(ctlr_info_t *h)
37929 while (!list_empty(&h->reqQ)) {
37930 c = list_entry(h->reqQ.next, CommandList_struct, list);
37931 /* can't do anything if fifo is full */
37932- if ((h->access.fifo_full(h))) {
37933+ if ((h->access->fifo_full(h))) {
37934 dev_warn(&h->pdev->dev, "fifo full\n");
37935 break;
37936 }
37937@@ -3018,7 +3018,7 @@ static void start_io(ctlr_info_t *h)
37938 h->Qdepth--;
37939
37940 /* Tell the controller execute command */
37941- h->access.submit_command(h, c);
37942+ h->access->submit_command(h, c);
37943
37944 /* Put job onto the completed Q */
37945 addQ(&h->cmpQ, c);
37946@@ -3444,17 +3444,17 @@ startio:
37947
37948 static inline unsigned long get_next_completion(ctlr_info_t *h)
37949 {
37950- return h->access.command_completed(h);
37951+ return h->access->command_completed(h);
37952 }
37953
37954 static inline int interrupt_pending(ctlr_info_t *h)
37955 {
37956- return h->access.intr_pending(h);
37957+ return h->access->intr_pending(h);
37958 }
37959
37960 static inline long interrupt_not_for_us(ctlr_info_t *h)
37961 {
37962- return ((h->access.intr_pending(h) == 0) ||
37963+ return ((h->access->intr_pending(h) == 0) ||
37964 (h->interrupts_enabled == 0));
37965 }
37966
37967@@ -3487,7 +3487,7 @@ static inline u32 next_command(ctlr_info_t *h)
37968 u32 a;
37969
37970 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
37971- return h->access.command_completed(h);
37972+ return h->access->command_completed(h);
37973
37974 if ((*(h->reply_pool_head) & 1) == (h->reply_pool_wraparound)) {
37975 a = *(h->reply_pool_head); /* Next cmd in ring buffer */
37976@@ -4044,7 +4044,7 @@ static void cciss_put_controller_into_performant_mode(ctlr_info_t *h)
37977 trans_support & CFGTBL_Trans_use_short_tags);
37978
37979 /* Change the access methods to the performant access methods */
37980- h->access = SA5_performant_access;
37981+ h->access = &SA5_performant_access;
37982 h->transMethod = CFGTBL_Trans_Performant;
37983
37984 return;
37985@@ -4318,7 +4318,7 @@ static int cciss_pci_init(ctlr_info_t *h)
37986 if (prod_index < 0)
37987 return -ENODEV;
37988 h->product_name = products[prod_index].product_name;
37989- h->access = *(products[prod_index].access);
37990+ h->access = products[prod_index].access;
37991
37992 if (cciss_board_disabled(h)) {
37993 dev_warn(&h->pdev->dev, "controller appears to be disabled\n");
37994@@ -5050,7 +5050,7 @@ reinit_after_soft_reset:
37995 }
37996
37997 /* make sure the board interrupts are off */
37998- h->access.set_intr_mask(h, CCISS_INTR_OFF);
37999+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38000 rc = cciss_request_irq(h, do_cciss_msix_intr, do_cciss_intx);
38001 if (rc)
38002 goto clean2;
38003@@ -5100,7 +5100,7 @@ reinit_after_soft_reset:
38004 * fake ones to scoop up any residual completions.
38005 */
38006 spin_lock_irqsave(&h->lock, flags);
38007- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38008+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38009 spin_unlock_irqrestore(&h->lock, flags);
38010 free_irq(h->intr[h->intr_mode], h);
38011 rc = cciss_request_irq(h, cciss_msix_discard_completions,
38012@@ -5120,9 +5120,9 @@ reinit_after_soft_reset:
38013 dev_info(&h->pdev->dev, "Board READY.\n");
38014 dev_info(&h->pdev->dev,
38015 "Waiting for stale completions to drain.\n");
38016- h->access.set_intr_mask(h, CCISS_INTR_ON);
38017+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38018 msleep(10000);
38019- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38020+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38021
38022 rc = controller_reset_failed(h->cfgtable);
38023 if (rc)
38024@@ -5145,7 +5145,7 @@ reinit_after_soft_reset:
38025 cciss_scsi_setup(h);
38026
38027 /* Turn the interrupts on so we can service requests */
38028- h->access.set_intr_mask(h, CCISS_INTR_ON);
38029+ h->access->set_intr_mask(h, CCISS_INTR_ON);
38030
38031 /* Get the firmware version */
38032 inq_buff = kzalloc(sizeof(InquiryData_struct), GFP_KERNEL);
38033@@ -5217,7 +5217,7 @@ static void cciss_shutdown(struct pci_dev *pdev)
38034 kfree(flush_buf);
38035 if (return_code != IO_OK)
38036 dev_warn(&h->pdev->dev, "Error flushing cache\n");
38037- h->access.set_intr_mask(h, CCISS_INTR_OFF);
38038+ h->access->set_intr_mask(h, CCISS_INTR_OFF);
38039 free_irq(h->intr[h->intr_mode], h);
38040 }
38041
38042diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h
38043index 7fda30e..2f27946 100644
38044--- a/drivers/block/cciss.h
38045+++ b/drivers/block/cciss.h
38046@@ -101,7 +101,7 @@ struct ctlr_info
38047 /* information about each logical volume */
38048 drive_info_struct *drv[CISS_MAX_LUN];
38049
38050- struct access_method access;
38051+ struct access_method *access;
38052
38053 /* queue and queue Info */
38054 struct list_head reqQ;
38055@@ -402,27 +402,27 @@ static bool SA5_performant_intr_pending(ctlr_info_t *h)
38056 }
38057
38058 static struct access_method SA5_access = {
38059- SA5_submit_command,
38060- SA5_intr_mask,
38061- SA5_fifo_full,
38062- SA5_intr_pending,
38063- SA5_completed,
38064+ .submit_command = SA5_submit_command,
38065+ .set_intr_mask = SA5_intr_mask,
38066+ .fifo_full = SA5_fifo_full,
38067+ .intr_pending = SA5_intr_pending,
38068+ .command_completed = SA5_completed,
38069 };
38070
38071 static struct access_method SA5B_access = {
38072- SA5_submit_command,
38073- SA5B_intr_mask,
38074- SA5_fifo_full,
38075- SA5B_intr_pending,
38076- SA5_completed,
38077+ .submit_command = SA5_submit_command,
38078+ .set_intr_mask = SA5B_intr_mask,
38079+ .fifo_full = SA5_fifo_full,
38080+ .intr_pending = SA5B_intr_pending,
38081+ .command_completed = SA5_completed,
38082 };
38083
38084 static struct access_method SA5_performant_access = {
38085- SA5_submit_command,
38086- SA5_performant_intr_mask,
38087- SA5_fifo_full,
38088- SA5_performant_intr_pending,
38089- SA5_performant_completed,
38090+ .submit_command = SA5_submit_command,
38091+ .set_intr_mask = SA5_performant_intr_mask,
38092+ .fifo_full = SA5_fifo_full,
38093+ .intr_pending = SA5_performant_intr_pending,
38094+ .command_completed = SA5_performant_completed,
38095 };
38096
38097 struct board_type {
38098diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
38099index 2b94403..fd6ad1f 100644
38100--- a/drivers/block/cpqarray.c
38101+++ b/drivers/block/cpqarray.c
38102@@ -404,7 +404,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38103 if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
38104 goto Enomem4;
38105 }
38106- hba[i]->access.set_intr_mask(hba[i], 0);
38107+ hba[i]->access->set_intr_mask(hba[i], 0);
38108 if (request_irq(hba[i]->intr, do_ida_intr,
38109 IRQF_DISABLED|IRQF_SHARED, hba[i]->devname, hba[i]))
38110 {
38111@@ -459,7 +459,7 @@ static int cpqarray_register_ctlr(int i, struct pci_dev *pdev)
38112 add_timer(&hba[i]->timer);
38113
38114 /* Enable IRQ now that spinlock and rate limit timer are set up */
38115- hba[i]->access.set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38116+ hba[i]->access->set_intr_mask(hba[i], FIFO_NOT_EMPTY);
38117
38118 for(j=0; j<NWD; j++) {
38119 struct gendisk *disk = ida_gendisk[i][j];
38120@@ -694,7 +694,7 @@ DBGINFO(
38121 for(i=0; i<NR_PRODUCTS; i++) {
38122 if (board_id == products[i].board_id) {
38123 c->product_name = products[i].product_name;
38124- c->access = *(products[i].access);
38125+ c->access = products[i].access;
38126 break;
38127 }
38128 }
38129@@ -792,7 +792,7 @@ static int cpqarray_eisa_detect(void)
38130 hba[ctlr]->intr = intr;
38131 sprintf(hba[ctlr]->devname, "ida%d", nr_ctlr);
38132 hba[ctlr]->product_name = products[j].product_name;
38133- hba[ctlr]->access = *(products[j].access);
38134+ hba[ctlr]->access = products[j].access;
38135 hba[ctlr]->ctlr = ctlr;
38136 hba[ctlr]->board_id = board_id;
38137 hba[ctlr]->pci_dev = NULL; /* not PCI */
38138@@ -978,7 +978,7 @@ static void start_io(ctlr_info_t *h)
38139
38140 while((c = h->reqQ) != NULL) {
38141 /* Can't do anything if we're busy */
38142- if (h->access.fifo_full(h) == 0)
38143+ if (h->access->fifo_full(h) == 0)
38144 return;
38145
38146 /* Get the first entry from the request Q */
38147@@ -986,7 +986,7 @@ static void start_io(ctlr_info_t *h)
38148 h->Qdepth--;
38149
38150 /* Tell the controller to do our bidding */
38151- h->access.submit_command(h, c);
38152+ h->access->submit_command(h, c);
38153
38154 /* Get onto the completion Q */
38155 addQ(&h->cmpQ, c);
38156@@ -1048,7 +1048,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38157 unsigned long flags;
38158 __u32 a,a1;
38159
38160- istat = h->access.intr_pending(h);
38161+ istat = h->access->intr_pending(h);
38162 /* Is this interrupt for us? */
38163 if (istat == 0)
38164 return IRQ_NONE;
38165@@ -1059,7 +1059,7 @@ static irqreturn_t do_ida_intr(int irq, void *dev_id)
38166 */
38167 spin_lock_irqsave(IDA_LOCK(h->ctlr), flags);
38168 if (istat & FIFO_NOT_EMPTY) {
38169- while((a = h->access.command_completed(h))) {
38170+ while((a = h->access->command_completed(h))) {
38171 a1 = a; a &= ~3;
38172 if ((c = h->cmpQ) == NULL)
38173 {
38174@@ -1448,11 +1448,11 @@ static int sendcmd(
38175 /*
38176 * Disable interrupt
38177 */
38178- info_p->access.set_intr_mask(info_p, 0);
38179+ info_p->access->set_intr_mask(info_p, 0);
38180 /* Make sure there is room in the command FIFO */
38181 /* Actually it should be completely empty at this time. */
38182 for (i = 200000; i > 0; i--) {
38183- temp = info_p->access.fifo_full(info_p);
38184+ temp = info_p->access->fifo_full(info_p);
38185 if (temp != 0) {
38186 break;
38187 }
38188@@ -1465,7 +1465,7 @@ DBG(
38189 /*
38190 * Send the cmd
38191 */
38192- info_p->access.submit_command(info_p, c);
38193+ info_p->access->submit_command(info_p, c);
38194 complete = pollcomplete(ctlr);
38195
38196 pci_unmap_single(info_p->pci_dev, (dma_addr_t) c->req.sg[0].addr,
38197@@ -1548,9 +1548,9 @@ static int revalidate_allvol(ctlr_info_t *host)
38198 * we check the new geometry. Then turn interrupts back on when
38199 * we're done.
38200 */
38201- host->access.set_intr_mask(host, 0);
38202+ host->access->set_intr_mask(host, 0);
38203 getgeometry(ctlr);
38204- host->access.set_intr_mask(host, FIFO_NOT_EMPTY);
38205+ host->access->set_intr_mask(host, FIFO_NOT_EMPTY);
38206
38207 for(i=0; i<NWD; i++) {
38208 struct gendisk *disk = ida_gendisk[ctlr][i];
38209@@ -1590,7 +1590,7 @@ static int pollcomplete(int ctlr)
38210 /* Wait (up to 2 seconds) for a command to complete */
38211
38212 for (i = 200000; i > 0; i--) {
38213- done = hba[ctlr]->access.command_completed(hba[ctlr]);
38214+ done = hba[ctlr]->access->command_completed(hba[ctlr]);
38215 if (done == 0) {
38216 udelay(10); /* a short fixed delay */
38217 } else
38218diff --git a/drivers/block/cpqarray.h b/drivers/block/cpqarray.h
38219index be73e9d..7fbf140 100644
38220--- a/drivers/block/cpqarray.h
38221+++ b/drivers/block/cpqarray.h
38222@@ -99,7 +99,7 @@ struct ctlr_info {
38223 drv_info_t drv[NWD];
38224 struct proc_dir_entry *proc;
38225
38226- struct access_method access;
38227+ struct access_method *access;
38228
38229 cmdlist_t *reqQ;
38230 cmdlist_t *cmpQ;
38231diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c
38232index 434c77d..6d3219a 100644
38233--- a/drivers/block/drbd/drbd_bitmap.c
38234+++ b/drivers/block/drbd/drbd_bitmap.c
38235@@ -1036,7 +1036,7 @@ static void bm_page_io_async(struct drbd_bm_aio_ctx *ctx, int page_nr) __must_ho
38236 submit_bio(rw, bio);
38237 /* this should not count as user activity and cause the
38238 * resync to throttle -- see drbd_rs_should_slow_down(). */
38239- atomic_add(len >> 9, &device->rs_sect_ev);
38240+ atomic_add_unchecked(len >> 9, &device->rs_sect_ev);
38241 }
38242 }
38243
38244diff --git a/drivers/block/drbd/drbd_int.h b/drivers/block/drbd/drbd_int.h
38245index b905e98..0812ed8 100644
38246--- a/drivers/block/drbd/drbd_int.h
38247+++ b/drivers/block/drbd/drbd_int.h
38248@@ -385,7 +385,7 @@ struct drbd_epoch {
38249 struct drbd_connection *connection;
38250 struct list_head list;
38251 unsigned int barrier_nr;
38252- atomic_t epoch_size; /* increased on every request added. */
38253+ atomic_unchecked_t epoch_size; /* increased on every request added. */
38254 atomic_t active; /* increased on every req. added, and dec on every finished. */
38255 unsigned long flags;
38256 };
38257@@ -946,7 +946,7 @@ struct drbd_device {
38258 unsigned int al_tr_number;
38259 int al_tr_cycle;
38260 wait_queue_head_t seq_wait;
38261- atomic_t packet_seq;
38262+ atomic_unchecked_t packet_seq;
38263 unsigned int peer_seq;
38264 spinlock_t peer_seq_lock;
38265 unsigned long comm_bm_set; /* communicated number of set bits. */
38266@@ -955,8 +955,8 @@ struct drbd_device {
38267 struct mutex own_state_mutex;
38268 struct mutex *state_mutex; /* either own_state_mutex or first_peer_device(device)->connection->cstate_mutex */
38269 char congestion_reason; /* Why we where congested... */
38270- atomic_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38271- atomic_t rs_sect_ev; /* for submitted resync data rate, both */
38272+ atomic_unchecked_t rs_sect_in; /* for incoming resync data rate, SyncTarget */
38273+ atomic_unchecked_t rs_sect_ev; /* for submitted resync data rate, both */
38274 int rs_last_sect_ev; /* counter to compare with */
38275 int rs_last_events; /* counter of read or write "events" (unit sectors)
38276 * on the lower level device when we last looked. */
38277diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
38278index 1fc8342..7e7742b 100644
38279--- a/drivers/block/drbd/drbd_main.c
38280+++ b/drivers/block/drbd/drbd_main.c
38281@@ -1328,7 +1328,7 @@ static int _drbd_send_ack(struct drbd_peer_device *peer_device, enum drbd_packet
38282 p->sector = sector;
38283 p->block_id = block_id;
38284 p->blksize = blksize;
38285- p->seq_num = cpu_to_be32(atomic_inc_return(&peer_device->device->packet_seq));
38286+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&peer_device->device->packet_seq));
38287 return drbd_send_command(peer_device, sock, cmd, sizeof(*p), NULL, 0);
38288 }
38289
38290@@ -1634,7 +1634,7 @@ int drbd_send_dblock(struct drbd_peer_device *peer_device, struct drbd_request *
38291 return -EIO;
38292 p->sector = cpu_to_be64(req->i.sector);
38293 p->block_id = (unsigned long)req;
38294- p->seq_num = cpu_to_be32(atomic_inc_return(&device->packet_seq));
38295+ p->seq_num = cpu_to_be32(atomic_inc_return_unchecked(&device->packet_seq));
38296 dp_flags = bio_flags_to_wire(peer_device->connection, req->master_bio->bi_rw);
38297 if (device->state.conn >= C_SYNC_SOURCE &&
38298 device->state.conn <= C_PAUSED_SYNC_T)
38299@@ -1915,8 +1915,8 @@ void drbd_init_set_defaults(struct drbd_device *device)
38300 atomic_set(&device->unacked_cnt, 0);
38301 atomic_set(&device->local_cnt, 0);
38302 atomic_set(&device->pp_in_use_by_net, 0);
38303- atomic_set(&device->rs_sect_in, 0);
38304- atomic_set(&device->rs_sect_ev, 0);
38305+ atomic_set_unchecked(&device->rs_sect_in, 0);
38306+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38307 atomic_set(&device->ap_in_flight, 0);
38308 atomic_set(&device->md_io.in_use, 0);
38309
38310@@ -2684,8 +2684,8 @@ void drbd_destroy_connection(struct kref *kref)
38311 struct drbd_connection *connection = container_of(kref, struct drbd_connection, kref);
38312 struct drbd_resource *resource = connection->resource;
38313
38314- if (atomic_read(&connection->current_epoch->epoch_size) != 0)
38315- drbd_err(connection, "epoch_size:%d\n", atomic_read(&connection->current_epoch->epoch_size));
38316+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size) != 0)
38317+ drbd_err(connection, "epoch_size:%d\n", atomic_read_unchecked(&connection->current_epoch->epoch_size));
38318 kfree(connection->current_epoch);
38319
38320 idr_destroy(&connection->peer_devices);
38321diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
38322index 74df8cf..e41fc24 100644
38323--- a/drivers/block/drbd/drbd_nl.c
38324+++ b/drivers/block/drbd/drbd_nl.c
38325@@ -3637,13 +3637,13 @@ finish:
38326
38327 void drbd_bcast_event(struct drbd_device *device, const struct sib_info *sib)
38328 {
38329- static atomic_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38330+ static atomic_unchecked_t drbd_genl_seq = ATOMIC_INIT(2); /* two. */
38331 struct sk_buff *msg;
38332 struct drbd_genlmsghdr *d_out;
38333 unsigned seq;
38334 int err = -ENOMEM;
38335
38336- seq = atomic_inc_return(&drbd_genl_seq);
38337+ seq = atomic_inc_return_unchecked(&drbd_genl_seq);
38338 msg = genlmsg_new(NLMSG_GOODSIZE, GFP_NOIO);
38339 if (!msg)
38340 goto failed;
38341diff --git a/drivers/block/drbd/drbd_receiver.c b/drivers/block/drbd/drbd_receiver.c
38342index cee2035..22f66bd 100644
38343--- a/drivers/block/drbd/drbd_receiver.c
38344+++ b/drivers/block/drbd/drbd_receiver.c
38345@@ -870,7 +870,7 @@ int drbd_connected(struct drbd_peer_device *peer_device)
38346 struct drbd_device *device = peer_device->device;
38347 int err;
38348
38349- atomic_set(&device->packet_seq, 0);
38350+ atomic_set_unchecked(&device->packet_seq, 0);
38351 device->peer_seq = 0;
38352
38353 device->state_mutex = peer_device->connection->agreed_pro_version < 100 ?
38354@@ -1233,7 +1233,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38355 do {
38356 next_epoch = NULL;
38357
38358- epoch_size = atomic_read(&epoch->epoch_size);
38359+ epoch_size = atomic_read_unchecked(&epoch->epoch_size);
38360
38361 switch (ev & ~EV_CLEANUP) {
38362 case EV_PUT:
38363@@ -1273,7 +1273,7 @@ static enum finish_epoch drbd_may_finish_epoch(struct drbd_connection *connectio
38364 rv = FE_DESTROYED;
38365 } else {
38366 epoch->flags = 0;
38367- atomic_set(&epoch->epoch_size, 0);
38368+ atomic_set_unchecked(&epoch->epoch_size, 0);
38369 /* atomic_set(&epoch->active, 0); is already zero */
38370 if (rv == FE_STILL_LIVE)
38371 rv = FE_RECYCLED;
38372@@ -1550,7 +1550,7 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38373 conn_wait_active_ee_empty(connection);
38374 drbd_flush(connection);
38375
38376- if (atomic_read(&connection->current_epoch->epoch_size)) {
38377+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38378 epoch = kmalloc(sizeof(struct drbd_epoch), GFP_NOIO);
38379 if (epoch)
38380 break;
38381@@ -1564,11 +1564,11 @@ static int receive_Barrier(struct drbd_connection *connection, struct packet_inf
38382 }
38383
38384 epoch->flags = 0;
38385- atomic_set(&epoch->epoch_size, 0);
38386+ atomic_set_unchecked(&epoch->epoch_size, 0);
38387 atomic_set(&epoch->active, 0);
38388
38389 spin_lock(&connection->epoch_lock);
38390- if (atomic_read(&connection->current_epoch->epoch_size)) {
38391+ if (atomic_read_unchecked(&connection->current_epoch->epoch_size)) {
38392 list_add(&epoch->list, &connection->current_epoch->list);
38393 connection->current_epoch = epoch;
38394 connection->epochs++;
38395@@ -1802,7 +1802,7 @@ static int recv_resync_read(struct drbd_peer_device *peer_device, sector_t secto
38396 list_add_tail(&peer_req->w.list, &device->sync_ee);
38397 spin_unlock_irq(&device->resource->req_lock);
38398
38399- atomic_add(pi->size >> 9, &device->rs_sect_ev);
38400+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_ev);
38401 if (drbd_submit_peer_request(device, peer_req, WRITE, DRBD_FAULT_RS_WR) == 0)
38402 return 0;
38403
38404@@ -1900,7 +1900,7 @@ static int receive_RSDataReply(struct drbd_connection *connection, struct packet
38405 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38406 }
38407
38408- atomic_add(pi->size >> 9, &device->rs_sect_in);
38409+ atomic_add_unchecked(pi->size >> 9, &device->rs_sect_in);
38410
38411 return err;
38412 }
38413@@ -2290,7 +2290,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38414
38415 err = wait_for_and_update_peer_seq(peer_device, peer_seq);
38416 drbd_send_ack_dp(peer_device, P_NEG_ACK, p, pi->size);
38417- atomic_inc(&connection->current_epoch->epoch_size);
38418+ atomic_inc_unchecked(&connection->current_epoch->epoch_size);
38419 err2 = drbd_drain_block(peer_device, pi->size);
38420 if (!err)
38421 err = err2;
38422@@ -2334,7 +2334,7 @@ static int receive_Data(struct drbd_connection *connection, struct packet_info *
38423
38424 spin_lock(&connection->epoch_lock);
38425 peer_req->epoch = connection->current_epoch;
38426- atomic_inc(&peer_req->epoch->epoch_size);
38427+ atomic_inc_unchecked(&peer_req->epoch->epoch_size);
38428 atomic_inc(&peer_req->epoch->active);
38429 spin_unlock(&connection->epoch_lock);
38430
38431@@ -2479,7 +2479,7 @@ bool drbd_rs_c_min_rate_throttle(struct drbd_device *device)
38432
38433 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
38434 (int)part_stat_read(&disk->part0, sectors[1]) -
38435- atomic_read(&device->rs_sect_ev);
38436+ atomic_read_unchecked(&device->rs_sect_ev);
38437
38438 if (atomic_read(&device->ap_actlog_cnt)
38439 || curr_events - device->rs_last_events > 64) {
38440@@ -2618,7 +2618,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38441 device->use_csums = true;
38442 } else if (pi->cmd == P_OV_REPLY) {
38443 /* track progress, we may need to throttle */
38444- atomic_add(size >> 9, &device->rs_sect_in);
38445+ atomic_add_unchecked(size >> 9, &device->rs_sect_in);
38446 peer_req->w.cb = w_e_end_ov_reply;
38447 dec_rs_pending(device);
38448 /* drbd_rs_begin_io done when we sent this request,
38449@@ -2691,7 +2691,7 @@ static int receive_DataRequest(struct drbd_connection *connection, struct packet
38450 goto out_free_e;
38451
38452 submit_for_resync:
38453- atomic_add(size >> 9, &device->rs_sect_ev);
38454+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38455
38456 submit:
38457 update_receiver_timing_details(connection, drbd_submit_peer_request);
38458@@ -4564,7 +4564,7 @@ struct data_cmd {
38459 int expect_payload;
38460 size_t pkt_size;
38461 int (*fn)(struct drbd_connection *, struct packet_info *);
38462-};
38463+} __do_const;
38464
38465 static struct data_cmd drbd_cmd_handler[] = {
38466 [P_DATA] = { 1, sizeof(struct p_data), receive_Data },
38467@@ -4678,7 +4678,7 @@ static void conn_disconnect(struct drbd_connection *connection)
38468 if (!list_empty(&connection->current_epoch->list))
38469 drbd_err(connection, "ASSERTION FAILED: connection->current_epoch->list not empty\n");
38470 /* ok, no more ee's on the fly, it is safe to reset the epoch_size */
38471- atomic_set(&connection->current_epoch->epoch_size, 0);
38472+ atomic_set_unchecked(&connection->current_epoch->epoch_size, 0);
38473 connection->send.seen_any_write_yet = false;
38474
38475 drbd_info(connection, "Connection closed\n");
38476@@ -5182,7 +5182,7 @@ static int got_IsInSync(struct drbd_connection *connection, struct packet_info *
38477 put_ldev(device);
38478 }
38479 dec_rs_pending(device);
38480- atomic_add(blksize >> 9, &device->rs_sect_in);
38481+ atomic_add_unchecked(blksize >> 9, &device->rs_sect_in);
38482
38483 return 0;
38484 }
38485@@ -5470,7 +5470,7 @@ static int connection_finish_peer_reqs(struct drbd_connection *connection)
38486 struct asender_cmd {
38487 size_t pkt_size;
38488 int (*fn)(struct drbd_connection *connection, struct packet_info *);
38489-};
38490+} __do_const;
38491
38492 static struct asender_cmd asender_tbl[] = {
38493 [P_PING] = { 0, got_Ping },
38494diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c
38495index d0fae55..4469096 100644
38496--- a/drivers/block/drbd/drbd_worker.c
38497+++ b/drivers/block/drbd/drbd_worker.c
38498@@ -408,7 +408,7 @@ static int read_for_csum(struct drbd_peer_device *peer_device, sector_t sector,
38499 list_add_tail(&peer_req->w.list, &device->read_ee);
38500 spin_unlock_irq(&device->resource->req_lock);
38501
38502- atomic_add(size >> 9, &device->rs_sect_ev);
38503+ atomic_add_unchecked(size >> 9, &device->rs_sect_ev);
38504 if (drbd_submit_peer_request(device, peer_req, READ, DRBD_FAULT_RS_RD) == 0)
38505 return 0;
38506
38507@@ -553,7 +553,7 @@ static int drbd_rs_number_requests(struct drbd_device *device)
38508 unsigned int sect_in; /* Number of sectors that came in since the last turn */
38509 int number, mxb;
38510
38511- sect_in = atomic_xchg(&device->rs_sect_in, 0);
38512+ sect_in = atomic_xchg_unchecked(&device->rs_sect_in, 0);
38513 device->rs_in_flight -= sect_in;
38514
38515 rcu_read_lock();
38516@@ -1595,8 +1595,8 @@ void drbd_rs_controller_reset(struct drbd_device *device)
38517 struct gendisk *disk = device->ldev->backing_bdev->bd_contains->bd_disk;
38518 struct fifo_buffer *plan;
38519
38520- atomic_set(&device->rs_sect_in, 0);
38521- atomic_set(&device->rs_sect_ev, 0);
38522+ atomic_set_unchecked(&device->rs_sect_in, 0);
38523+ atomic_set_unchecked(&device->rs_sect_ev, 0);
38524 device->rs_in_flight = 0;
38525 device->rs_last_events =
38526 (int)part_stat_read(&disk->part0, sectors[0]) +
38527diff --git a/drivers/block/loop.c b/drivers/block/loop.c
38528index d1f168b..8f8cc52 100644
38529--- a/drivers/block/loop.c
38530+++ b/drivers/block/loop.c
38531@@ -234,7 +234,7 @@ static int __do_lo_send_write(struct file *file,
38532
38533 file_start_write(file);
38534 set_fs(get_ds());
38535- bw = file->f_op->write(file, buf, len, &pos);
38536+ bw = file->f_op->write(file, (const char __force_user *)buf, len, &pos);
38537 set_fs(old_fs);
38538 file_end_write(file);
38539 if (likely(bw == len))
38540diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
38541index 09e628da..7607aaa 100644
38542--- a/drivers/block/pktcdvd.c
38543+++ b/drivers/block/pktcdvd.c
38544@@ -108,7 +108,7 @@ static int pkt_seq_show(struct seq_file *m, void *p);
38545
38546 static sector_t get_zone(sector_t sector, struct pktcdvd_device *pd)
38547 {
38548- return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1);
38549+ return (sector + pd->offset) & ~(sector_t)(pd->settings.size - 1UL);
38550 }
38551
38552 /*
38553@@ -1890,7 +1890,7 @@ static noinline_for_stack int pkt_probe_settings(struct pktcdvd_device *pd)
38554 return -EROFS;
38555 }
38556 pd->settings.fp = ti.fp;
38557- pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
38558+ pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1UL);
38559
38560 if (ti.nwa_v) {
38561 pd->nwa = be32_to_cpu(ti.next_writable);
38562diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
38563index b40af32..5fa825d 100644
38564--- a/drivers/block/rbd.c
38565+++ b/drivers/block/rbd.c
38566@@ -64,7 +64,7 @@
38567 * If the counter is already at its maximum value returns
38568 * -EINVAL without updating it.
38569 */
38570-static int atomic_inc_return_safe(atomic_t *v)
38571+static int __intentional_overflow(-1) atomic_inc_return_safe(atomic_t *v)
38572 {
38573 unsigned int counter;
38574
38575diff --git a/drivers/block/smart1,2.h b/drivers/block/smart1,2.h
38576index e5565fb..71be10b4 100644
38577--- a/drivers/block/smart1,2.h
38578+++ b/drivers/block/smart1,2.h
38579@@ -108,11 +108,11 @@ static unsigned long smart4_intr_pending(ctlr_info_t *h)
38580 }
38581
38582 static struct access_method smart4_access = {
38583- smart4_submit_command,
38584- smart4_intr_mask,
38585- smart4_fifo_full,
38586- smart4_intr_pending,
38587- smart4_completed,
38588+ .submit_command = smart4_submit_command,
38589+ .set_intr_mask = smart4_intr_mask,
38590+ .fifo_full = smart4_fifo_full,
38591+ .intr_pending = smart4_intr_pending,
38592+ .command_completed = smart4_completed,
38593 };
38594
38595 /*
38596@@ -144,11 +144,11 @@ static unsigned long smart2_intr_pending(ctlr_info_t *h)
38597 }
38598
38599 static struct access_method smart2_access = {
38600- smart2_submit_command,
38601- smart2_intr_mask,
38602- smart2_fifo_full,
38603- smart2_intr_pending,
38604- smart2_completed,
38605+ .submit_command = smart2_submit_command,
38606+ .set_intr_mask = smart2_intr_mask,
38607+ .fifo_full = smart2_fifo_full,
38608+ .intr_pending = smart2_intr_pending,
38609+ .command_completed = smart2_completed,
38610 };
38611
38612 /*
38613@@ -180,11 +180,11 @@ static unsigned long smart2e_intr_pending(ctlr_info_t *h)
38614 }
38615
38616 static struct access_method smart2e_access = {
38617- smart2e_submit_command,
38618- smart2e_intr_mask,
38619- smart2e_fifo_full,
38620- smart2e_intr_pending,
38621- smart2e_completed,
38622+ .submit_command = smart2e_submit_command,
38623+ .set_intr_mask = smart2e_intr_mask,
38624+ .fifo_full = smart2e_fifo_full,
38625+ .intr_pending = smart2e_intr_pending,
38626+ .command_completed = smart2e_completed,
38627 };
38628
38629 /*
38630@@ -270,9 +270,9 @@ static unsigned long smart1_intr_pending(ctlr_info_t *h)
38631 }
38632
38633 static struct access_method smart1_access = {
38634- smart1_submit_command,
38635- smart1_intr_mask,
38636- smart1_fifo_full,
38637- smart1_intr_pending,
38638- smart1_completed,
38639+ .submit_command = smart1_submit_command,
38640+ .set_intr_mask = smart1_intr_mask,
38641+ .fifo_full = smart1_fifo_full,
38642+ .intr_pending = smart1_intr_pending,
38643+ .command_completed = smart1_completed,
38644 };
38645diff --git a/drivers/bluetooth/btwilink.c b/drivers/bluetooth/btwilink.c
38646index 55c135b..9f8d60c 100644
38647--- a/drivers/bluetooth/btwilink.c
38648+++ b/drivers/bluetooth/btwilink.c
38649@@ -288,7 +288,7 @@ static int ti_st_send_frame(struct hci_dev *hdev, struct sk_buff *skb)
38650
38651 static int bt_ti_probe(struct platform_device *pdev)
38652 {
38653- static struct ti_st *hst;
38654+ struct ti_st *hst;
38655 struct hci_dev *hdev;
38656 int err;
38657
38658diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
38659index 5d28a45..a538f90 100644
38660--- a/drivers/cdrom/cdrom.c
38661+++ b/drivers/cdrom/cdrom.c
38662@@ -610,7 +610,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
38663 ENSURE(reset, CDC_RESET);
38664 ENSURE(generic_packet, CDC_GENERIC_PACKET);
38665 cdi->mc_flags = 0;
38666- cdo->n_minors = 0;
38667 cdi->options = CDO_USE_FFLAGS;
38668
38669 if (autoclose == 1 && CDROM_CAN(CDC_CLOSE_TRAY))
38670@@ -630,8 +629,11 @@ int register_cdrom(struct cdrom_device_info *cdi)
38671 else
38672 cdi->cdda_method = CDDA_OLD;
38673
38674- if (!cdo->generic_packet)
38675- cdo->generic_packet = cdrom_dummy_generic_packet;
38676+ if (!cdo->generic_packet) {
38677+ pax_open_kernel();
38678+ *(void **)&cdo->generic_packet = cdrom_dummy_generic_packet;
38679+ pax_close_kernel();
38680+ }
38681
38682 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" registered\n", cdi->name);
38683 mutex_lock(&cdrom_mutex);
38684@@ -652,7 +654,6 @@ void unregister_cdrom(struct cdrom_device_info *cdi)
38685 if (cdi->exit)
38686 cdi->exit(cdi);
38687
38688- cdi->ops->n_minors--;
38689 cd_dbg(CD_REG_UNREG, "drive \"/dev/%s\" unregistered\n", cdi->name);
38690 }
38691
38692@@ -2126,7 +2127,7 @@ static int cdrom_read_cdda_old(struct cdrom_device_info *cdi, __u8 __user *ubuf,
38693 */
38694 nr = nframes;
38695 do {
38696- cgc.buffer = kmalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38697+ cgc.buffer = kzalloc(CD_FRAMESIZE_RAW * nr, GFP_KERNEL);
38698 if (cgc.buffer)
38699 break;
38700
38701@@ -3434,7 +3435,7 @@ static int cdrom_print_info(const char *header, int val, char *info,
38702 struct cdrom_device_info *cdi;
38703 int ret;
38704
38705- ret = scnprintf(info + *pos, max_size - *pos, header);
38706+ ret = scnprintf(info + *pos, max_size - *pos, "%s", header);
38707 if (!ret)
38708 return 1;
38709
38710diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
38711index 584bc31..e64a12c 100644
38712--- a/drivers/cdrom/gdrom.c
38713+++ b/drivers/cdrom/gdrom.c
38714@@ -491,7 +491,6 @@ static struct cdrom_device_ops gdrom_ops = {
38715 .audio_ioctl = gdrom_audio_ioctl,
38716 .capability = CDC_MULTI_SESSION | CDC_MEDIA_CHANGED |
38717 CDC_RESET | CDC_DRIVE_STATUS | CDC_CD_R,
38718- .n_minors = 1,
38719 };
38720
38721 static int gdrom_bdops_open(struct block_device *bdev, fmode_t mode)
38722diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
38723index a4af822..ed58cd1 100644
38724--- a/drivers/char/Kconfig
38725+++ b/drivers/char/Kconfig
38726@@ -17,7 +17,8 @@ config DEVMEM
38727
38728 config DEVKMEM
38729 bool "/dev/kmem virtual device support"
38730- default y
38731+ default n
38732+ depends on !GRKERNSEC_KMEM
38733 help
38734 Say Y here if you want to support the /dev/kmem device. The
38735 /dev/kmem device is rarely used, but can be used for certain
38736@@ -586,6 +587,7 @@ config DEVPORT
38737 bool
38738 depends on !M68K
38739 depends on ISA || PCI
38740+ depends on !GRKERNSEC_KMEM
38741 default y
38742
38743 source "drivers/s390/char/Kconfig"
38744diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c
38745index a48e05b..6bac831 100644
38746--- a/drivers/char/agp/compat_ioctl.c
38747+++ b/drivers/char/agp/compat_ioctl.c
38748@@ -108,7 +108,7 @@ static int compat_agpioc_reserve_wrap(struct agp_file_private *priv, void __user
38749 return -ENOMEM;
38750 }
38751
38752- if (copy_from_user(usegment, (void __user *) ureserve.seg_list,
38753+ if (copy_from_user(usegment, (void __force_user *) ureserve.seg_list,
38754 sizeof(*usegment) * ureserve.seg_count)) {
38755 kfree(usegment);
38756 kfree(ksegment);
38757diff --git a/drivers/char/agp/frontend.c b/drivers/char/agp/frontend.c
38758index 09f17eb..8531d2f 100644
38759--- a/drivers/char/agp/frontend.c
38760+++ b/drivers/char/agp/frontend.c
38761@@ -806,7 +806,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38762 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
38763 return -EFAULT;
38764
38765- if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment))
38766+ if ((unsigned) reserve.seg_count >= ~0U/sizeof(struct agp_segment_priv))
38767 return -EFAULT;
38768
38769 client = agp_find_client_by_pid(reserve.pid);
38770@@ -836,7 +836,7 @@ static int agpioc_reserve_wrap(struct agp_file_private *priv, void __user *arg)
38771 if (segment == NULL)
38772 return -ENOMEM;
38773
38774- if (copy_from_user(segment, (void __user *) reserve.seg_list,
38775+ if (copy_from_user(segment, (void __force_user *) reserve.seg_list,
38776 sizeof(struct agp_segment) * reserve.seg_count)) {
38777 kfree(segment);
38778 return -EFAULT;
38779diff --git a/drivers/char/genrtc.c b/drivers/char/genrtc.c
38780index 4f94375..413694e 100644
38781--- a/drivers/char/genrtc.c
38782+++ b/drivers/char/genrtc.c
38783@@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *file,
38784 switch (cmd) {
38785
38786 case RTC_PLL_GET:
38787+ memset(&pll, 0, sizeof(pll));
38788 if (get_rtc_pll(&pll))
38789 return -EINVAL;
38790 else
38791diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
38792index 5c0baa9..44011b1 100644
38793--- a/drivers/char/hpet.c
38794+++ b/drivers/char/hpet.c
38795@@ -575,7 +575,7 @@ static inline unsigned long hpet_time_div(struct hpets *hpets,
38796 }
38797
38798 static int
38799-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg,
38800+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg,
38801 struct hpet_info *info)
38802 {
38803 struct hpet_timer __iomem *timer;
38804diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c
38805index 24cc4ed..f9807cf 100644
38806--- a/drivers/char/i8k.c
38807+++ b/drivers/char/i8k.c
38808@@ -788,7 +788,7 @@ static const struct i8k_config_data i8k_config_data[] = {
38809 },
38810 };
38811
38812-static struct dmi_system_id i8k_dmi_table[] __initdata = {
38813+static const struct dmi_system_id i8k_dmi_table[] __initconst = {
38814 {
38815 .ident = "Dell Inspiron",
38816 .matches = {
38817diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c
38818index 9bb5928..57a7801 100644
38819--- a/drivers/char/ipmi/ipmi_msghandler.c
38820+++ b/drivers/char/ipmi/ipmi_msghandler.c
38821@@ -436,7 +436,7 @@ struct ipmi_smi {
38822 struct proc_dir_entry *proc_dir;
38823 char proc_dir_name[10];
38824
38825- atomic_t stats[IPMI_NUM_STATS];
38826+ atomic_unchecked_t stats[IPMI_NUM_STATS];
38827
38828 /*
38829 * run_to_completion duplicate of smb_info, smi_info
38830@@ -468,9 +468,9 @@ static LIST_HEAD(smi_watchers);
38831 static DEFINE_MUTEX(smi_watchers_mutex);
38832
38833 #define ipmi_inc_stat(intf, stat) \
38834- atomic_inc(&(intf)->stats[IPMI_STAT_ ## stat])
38835+ atomic_inc_unchecked(&(intf)->stats[IPMI_STAT_ ## stat])
38836 #define ipmi_get_stat(intf, stat) \
38837- ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat]))
38838+ ((unsigned int) atomic_read_unchecked(&(intf)->stats[IPMI_STAT_ ## stat]))
38839
38840 static char *addr_src_to_str[] = { "invalid", "hotmod", "hardcoded", "SPMI",
38841 "ACPI", "SMBIOS", "PCI",
38842@@ -2828,7 +2828,7 @@ int ipmi_register_smi(struct ipmi_smi_handlers *handlers,
38843 INIT_LIST_HEAD(&intf->cmd_rcvrs);
38844 init_waitqueue_head(&intf->waitq);
38845 for (i = 0; i < IPMI_NUM_STATS; i++)
38846- atomic_set(&intf->stats[i], 0);
38847+ atomic_set_unchecked(&intf->stats[i], 0);
38848
38849 intf->proc_dir = NULL;
38850
38851diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
38852index 518585c..6c985cef 100644
38853--- a/drivers/char/ipmi/ipmi_si_intf.c
38854+++ b/drivers/char/ipmi/ipmi_si_intf.c
38855@@ -289,7 +289,7 @@ struct smi_info {
38856 unsigned char slave_addr;
38857
38858 /* Counters and things for the proc filesystem. */
38859- atomic_t stats[SI_NUM_STATS];
38860+ atomic_unchecked_t stats[SI_NUM_STATS];
38861
38862 struct task_struct *thread;
38863
38864@@ -298,9 +298,9 @@ struct smi_info {
38865 };
38866
38867 #define smi_inc_stat(smi, stat) \
38868- atomic_inc(&(smi)->stats[SI_STAT_ ## stat])
38869+ atomic_inc_unchecked(&(smi)->stats[SI_STAT_ ## stat])
38870 #define smi_get_stat(smi, stat) \
38871- ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat]))
38872+ ((unsigned int) atomic_read_unchecked(&(smi)->stats[SI_STAT_ ## stat]))
38873
38874 #define SI_MAX_PARMS 4
38875
38876@@ -3498,7 +3498,7 @@ static int try_smi_init(struct smi_info *new_smi)
38877 atomic_set(&new_smi->req_events, 0);
38878 new_smi->run_to_completion = false;
38879 for (i = 0; i < SI_NUM_STATS; i++)
38880- atomic_set(&new_smi->stats[i], 0);
38881+ atomic_set_unchecked(&new_smi->stats[i], 0);
38882
38883 new_smi->interrupt_disabled = true;
38884 atomic_set(&new_smi->need_watch, 0);
38885diff --git a/drivers/char/mem.c b/drivers/char/mem.c
38886index 297110c..3f69b43 100644
38887--- a/drivers/char/mem.c
38888+++ b/drivers/char/mem.c
38889@@ -18,6 +18,7 @@
38890 #include <linux/raw.h>
38891 #include <linux/tty.h>
38892 #include <linux/capability.h>
38893+#include <linux/security.h>
38894 #include <linux/ptrace.h>
38895 #include <linux/device.h>
38896 #include <linux/highmem.h>
38897@@ -36,6 +37,10 @@
38898
38899 #define DEVPORT_MINOR 4
38900
38901+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
38902+extern const struct file_operations grsec_fops;
38903+#endif
38904+
38905 static inline unsigned long size_inside_page(unsigned long start,
38906 unsigned long size)
38907 {
38908@@ -67,9 +72,13 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38909
38910 while (cursor < to) {
38911 if (!devmem_is_allowed(pfn)) {
38912+#ifdef CONFIG_GRKERNSEC_KMEM
38913+ gr_handle_mem_readwrite(from, to);
38914+#else
38915 printk(KERN_INFO
38916 "Program %s tried to access /dev/mem between %Lx->%Lx.\n",
38917 current->comm, from, to);
38918+#endif
38919 return 0;
38920 }
38921 cursor += PAGE_SIZE;
38922@@ -77,6 +86,11 @@ static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38923 }
38924 return 1;
38925 }
38926+#elif defined(CONFIG_GRKERNSEC_KMEM)
38927+static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38928+{
38929+ return 0;
38930+}
38931 #else
38932 static inline int range_is_allowed(unsigned long pfn, unsigned long size)
38933 {
38934@@ -124,7 +138,8 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38935 #endif
38936
38937 while (count > 0) {
38938- unsigned long remaining;
38939+ unsigned long remaining = 0;
38940+ char *temp;
38941
38942 sz = size_inside_page(p, count);
38943
38944@@ -140,7 +155,24 @@ static ssize_t read_mem(struct file *file, char __user *buf,
38945 if (!ptr)
38946 return -EFAULT;
38947
38948- remaining = copy_to_user(buf, ptr, sz);
38949+#ifdef CONFIG_PAX_USERCOPY
38950+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38951+ if (!temp) {
38952+ unxlate_dev_mem_ptr(p, ptr);
38953+ return -ENOMEM;
38954+ }
38955+ remaining = probe_kernel_read(temp, ptr, sz);
38956+#else
38957+ temp = ptr;
38958+#endif
38959+
38960+ if (!remaining)
38961+ remaining = copy_to_user(buf, temp, sz);
38962+
38963+#ifdef CONFIG_PAX_USERCOPY
38964+ kfree(temp);
38965+#endif
38966+
38967 unxlate_dev_mem_ptr(p, ptr);
38968 if (remaining)
38969 return -EFAULT;
38970@@ -380,9 +412,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38971 size_t count, loff_t *ppos)
38972 {
38973 unsigned long p = *ppos;
38974- ssize_t low_count, read, sz;
38975+ ssize_t low_count, read, sz, err = 0;
38976 char *kbuf; /* k-addr because vread() takes vmlist_lock rwlock */
38977- int err = 0;
38978
38979 read = 0;
38980 if (p < (unsigned long) high_memory) {
38981@@ -404,6 +435,8 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38982 }
38983 #endif
38984 while (low_count > 0) {
38985+ char *temp;
38986+
38987 sz = size_inside_page(p, low_count);
38988
38989 /*
38990@@ -413,7 +446,23 @@ static ssize_t read_kmem(struct file *file, char __user *buf,
38991 */
38992 kbuf = xlate_dev_kmem_ptr((void *)p);
38993
38994- if (copy_to_user(buf, kbuf, sz))
38995+#ifdef CONFIG_PAX_USERCOPY
38996+ temp = kmalloc(sz, GFP_KERNEL|GFP_USERCOPY);
38997+ if (!temp)
38998+ return -ENOMEM;
38999+ err = probe_kernel_read(temp, kbuf, sz);
39000+#else
39001+ temp = kbuf;
39002+#endif
39003+
39004+ if (!err)
39005+ err = copy_to_user(buf, temp, sz);
39006+
39007+#ifdef CONFIG_PAX_USERCOPY
39008+ kfree(temp);
39009+#endif
39010+
39011+ if (err)
39012 return -EFAULT;
39013 buf += sz;
39014 p += sz;
39015@@ -804,6 +853,9 @@ static const struct memdev {
39016 #ifdef CONFIG_PRINTK
39017 [11] = { "kmsg", 0644, &kmsg_fops, 0 },
39018 #endif
39019+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
39020+ [13] = { "grsec",S_IRUSR | S_IWUGO, &grsec_fops, 0 },
39021+#endif
39022 };
39023
39024 static int memory_open(struct inode *inode, struct file *filp)
39025@@ -865,7 +917,7 @@ static int __init chr_dev_init(void)
39026 continue;
39027
39028 device_create(mem_class, NULL, MKDEV(MEM_MAJOR, minor),
39029- NULL, devlist[minor].name);
39030+ NULL, "%s", devlist[minor].name);
39031 }
39032
39033 return tty_init();
39034diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
39035index 9df78e2..01ba9ae 100644
39036--- a/drivers/char/nvram.c
39037+++ b/drivers/char/nvram.c
39038@@ -247,7 +247,7 @@ static ssize_t nvram_read(struct file *file, char __user *buf,
39039
39040 spin_unlock_irq(&rtc_lock);
39041
39042- if (copy_to_user(buf, contents, tmp - contents))
39043+ if (tmp - contents > sizeof(contents) || copy_to_user(buf, contents, tmp - contents))
39044 return -EFAULT;
39045
39046 *ppos = i;
39047diff --git a/drivers/char/pcmcia/synclink_cs.c b/drivers/char/pcmcia/synclink_cs.c
39048index 0ea9986..e7b07e4 100644
39049--- a/drivers/char/pcmcia/synclink_cs.c
39050+++ b/drivers/char/pcmcia/synclink_cs.c
39051@@ -2345,7 +2345,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39052
39053 if (debug_level >= DEBUG_LEVEL_INFO)
39054 printk("%s(%d):mgslpc_close(%s) entry, count=%d\n",
39055- __FILE__, __LINE__, info->device_name, port->count);
39056+ __FILE__, __LINE__, info->device_name, atomic_read(&port->count));
39057
39058 if (tty_port_close_start(port, tty, filp) == 0)
39059 goto cleanup;
39060@@ -2363,7 +2363,7 @@ static void mgslpc_close(struct tty_struct *tty, struct file * filp)
39061 cleanup:
39062 if (debug_level >= DEBUG_LEVEL_INFO)
39063 printk("%s(%d):mgslpc_close(%s) exit, count=%d\n", __FILE__, __LINE__,
39064- tty->driver->name, port->count);
39065+ tty->driver->name, atomic_read(&port->count));
39066 }
39067
39068 /* Wait until the transmitter is empty.
39069@@ -2505,7 +2505,7 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39070
39071 if (debug_level >= DEBUG_LEVEL_INFO)
39072 printk("%s(%d):mgslpc_open(%s), old ref count = %d\n",
39073- __FILE__, __LINE__, tty->driver->name, port->count);
39074+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
39075
39076 /* If port is closing, signal caller to try again */
39077 if (port->flags & ASYNC_CLOSING){
39078@@ -2525,11 +2525,11 @@ static int mgslpc_open(struct tty_struct *tty, struct file * filp)
39079 goto cleanup;
39080 }
39081 spin_lock(&port->lock);
39082- port->count++;
39083+ atomic_inc(&port->count);
39084 spin_unlock(&port->lock);
39085 spin_unlock_irqrestore(&info->netlock, flags);
39086
39087- if (port->count == 1) {
39088+ if (atomic_read(&port->count) == 1) {
39089 /* 1st open on this device, init hardware */
39090 retval = startup(info, tty);
39091 if (retval < 0)
39092@@ -3918,7 +3918,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
39093 unsigned short new_crctype;
39094
39095 /* return error if TTY interface open */
39096- if (info->port.count)
39097+ if (atomic_read(&info->port.count))
39098 return -EBUSY;
39099
39100 switch (encoding)
39101@@ -4022,7 +4022,7 @@ static int hdlcdev_open(struct net_device *dev)
39102
39103 /* arbitrate between network and tty opens */
39104 spin_lock_irqsave(&info->netlock, flags);
39105- if (info->port.count != 0 || info->netcount != 0) {
39106+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
39107 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
39108 spin_unlock_irqrestore(&info->netlock, flags);
39109 return -EBUSY;
39110@@ -4112,7 +4112,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
39111 printk("%s:hdlcdev_ioctl(%s)\n", __FILE__, dev->name);
39112
39113 /* return error if TTY interface open */
39114- if (info->port.count)
39115+ if (atomic_read(&info->port.count))
39116 return -EBUSY;
39117
39118 if (cmd != SIOCWANDEV)
39119diff --git a/drivers/char/random.c b/drivers/char/random.c
39120index 9cd6968..6416f00 100644
39121--- a/drivers/char/random.c
39122+++ b/drivers/char/random.c
39123@@ -289,9 +289,6 @@
39124 /*
39125 * To allow fractional bits to be tracked, the entropy_count field is
39126 * denominated in units of 1/8th bits.
39127- *
39128- * 2*(ENTROPY_SHIFT + log2(poolbits)) must <= 31, or the multiply in
39129- * credit_entropy_bits() needs to be 64 bits wide.
39130 */
39131 #define ENTROPY_SHIFT 3
39132 #define ENTROPY_BITS(r) ((r)->entropy_count >> ENTROPY_SHIFT)
39133@@ -439,9 +436,9 @@ struct entropy_store {
39134 };
39135
39136 static void push_to_pool(struct work_struct *work);
39137-static __u32 input_pool_data[INPUT_POOL_WORDS];
39138-static __u32 blocking_pool_data[OUTPUT_POOL_WORDS];
39139-static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS];
39140+static __u32 input_pool_data[INPUT_POOL_WORDS] __latent_entropy;
39141+static __u32 blocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39142+static __u32 nonblocking_pool_data[OUTPUT_POOL_WORDS] __latent_entropy;
39143
39144 static struct entropy_store input_pool = {
39145 .poolinfo = &poolinfo_table[0],
39146@@ -635,7 +632,7 @@ retry:
39147 /* The +2 corresponds to the /4 in the denominator */
39148
39149 do {
39150- unsigned int anfrac = min(pnfrac, pool_size/2);
39151+ u64 anfrac = min(pnfrac, pool_size/2);
39152 unsigned int add =
39153 ((pool_size - entropy_count)*anfrac*3) >> s;
39154
39155@@ -1207,7 +1204,7 @@ static ssize_t extract_entropy_user(struct entropy_store *r, void __user *buf,
39156
39157 extract_buf(r, tmp);
39158 i = min_t(int, nbytes, EXTRACT_SIZE);
39159- if (copy_to_user(buf, tmp, i)) {
39160+ if (i > sizeof(tmp) || copy_to_user(buf, tmp, i)) {
39161 ret = -EFAULT;
39162 break;
39163 }
39164@@ -1590,7 +1587,7 @@ static char sysctl_bootid[16];
39165 static int proc_do_uuid(struct ctl_table *table, int write,
39166 void __user *buffer, size_t *lenp, loff_t *ppos)
39167 {
39168- struct ctl_table fake_table;
39169+ ctl_table_no_const fake_table;
39170 unsigned char buf[64], tmp_uuid[16], *uuid;
39171
39172 uuid = table->data;
39173@@ -1620,7 +1617,7 @@ static int proc_do_uuid(struct ctl_table *table, int write,
39174 static int proc_do_entropy(struct ctl_table *table, int write,
39175 void __user *buffer, size_t *lenp, loff_t *ppos)
39176 {
39177- struct ctl_table fake_table;
39178+ ctl_table_no_const fake_table;
39179 int entropy_count;
39180
39181 entropy_count = *(int *)table->data >> ENTROPY_SHIFT;
39182diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
39183index e496dae..3db53b6 100644
39184--- a/drivers/char/sonypi.c
39185+++ b/drivers/char/sonypi.c
39186@@ -54,6 +54,7 @@
39187
39188 #include <asm/uaccess.h>
39189 #include <asm/io.h>
39190+#include <asm/local.h>
39191
39192 #include <linux/sonypi.h>
39193
39194@@ -490,7 +491,7 @@ static struct sonypi_device {
39195 spinlock_t fifo_lock;
39196 wait_queue_head_t fifo_proc_list;
39197 struct fasync_struct *fifo_async;
39198- int open_count;
39199+ local_t open_count;
39200 int model;
39201 struct input_dev *input_jog_dev;
39202 struct input_dev *input_key_dev;
39203@@ -892,7 +893,7 @@ static int sonypi_misc_fasync(int fd, struct file *filp, int on)
39204 static int sonypi_misc_release(struct inode *inode, struct file *file)
39205 {
39206 mutex_lock(&sonypi_device.lock);
39207- sonypi_device.open_count--;
39208+ local_dec(&sonypi_device.open_count);
39209 mutex_unlock(&sonypi_device.lock);
39210 return 0;
39211 }
39212@@ -901,9 +902,9 @@ static int sonypi_misc_open(struct inode *inode, struct file *file)
39213 {
39214 mutex_lock(&sonypi_device.lock);
39215 /* Flush input queue on first open */
39216- if (!sonypi_device.open_count)
39217+ if (!local_read(&sonypi_device.open_count))
39218 kfifo_reset(&sonypi_device.fifo);
39219- sonypi_device.open_count++;
39220+ local_inc(&sonypi_device.open_count);
39221 mutex_unlock(&sonypi_device.lock);
39222
39223 return 0;
39224@@ -1491,7 +1492,7 @@ static struct platform_driver sonypi_driver = {
39225
39226 static struct platform_device *sonypi_platform_device;
39227
39228-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
39229+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
39230 {
39231 .ident = "Sony Vaio",
39232 .matches = {
39233diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c
39234index 565a947..dcdc06e 100644
39235--- a/drivers/char/tpm/tpm_acpi.c
39236+++ b/drivers/char/tpm/tpm_acpi.c
39237@@ -98,11 +98,12 @@ int read_log(struct tpm_bios_log *log)
39238 virt = acpi_os_map_iomem(start, len);
39239 if (!virt) {
39240 kfree(log->bios_event_log);
39241+ log->bios_event_log = NULL;
39242 printk("%s: ERROR - Unable to map memory\n", __func__);
39243 return -EIO;
39244 }
39245
39246- memcpy_fromio(log->bios_event_log, virt, len);
39247+ memcpy_fromio(log->bios_event_log, (const char __force_kernel *)virt, len);
39248
39249 acpi_os_unmap_iomem(virt, len);
39250 return 0;
39251diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c
39252index 3a56a13..f8cbd25 100644
39253--- a/drivers/char/tpm/tpm_eventlog.c
39254+++ b/drivers/char/tpm/tpm_eventlog.c
39255@@ -95,7 +95,7 @@ static void *tpm_bios_measurements_start(struct seq_file *m, loff_t *pos)
39256 event = addr;
39257
39258 if ((event->event_type == 0 && event->event_size == 0) ||
39259- ((addr + sizeof(struct tcpa_event) + event->event_size) >= limit))
39260+ (event->event_size >= limit - addr - sizeof(struct tcpa_event)))
39261 return NULL;
39262
39263 return addr;
39264@@ -120,7 +120,7 @@ static void *tpm_bios_measurements_next(struct seq_file *m, void *v,
39265 return NULL;
39266
39267 if ((event->event_type == 0 && event->event_size == 0) ||
39268- ((v + sizeof(struct tcpa_event) + event->event_size) >= limit))
39269+ (event->event_size >= limit - v - sizeof(struct tcpa_event)))
39270 return NULL;
39271
39272 (*pos)++;
39273@@ -213,7 +213,8 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v)
39274 int i;
39275
39276 for (i = 0; i < sizeof(struct tcpa_event) + event->event_size; i++)
39277- seq_putc(m, data[i]);
39278+ if (!seq_putc(m, data[i]))
39279+ return -EFAULT;
39280
39281 return 0;
39282 }
39283diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
39284index 72d7028..1586601 100644
39285--- a/drivers/char/virtio_console.c
39286+++ b/drivers/char/virtio_console.c
39287@@ -685,7 +685,7 @@ static ssize_t fill_readbuf(struct port *port, char __user *out_buf,
39288 if (to_user) {
39289 ssize_t ret;
39290
39291- ret = copy_to_user(out_buf, buf->buf + buf->offset, out_count);
39292+ ret = copy_to_user((char __force_user *)out_buf, buf->buf + buf->offset, out_count);
39293 if (ret)
39294 return -EFAULT;
39295 } else {
39296@@ -789,7 +789,7 @@ static ssize_t port_fops_read(struct file *filp, char __user *ubuf,
39297 if (!port_has_data(port) && !port->host_connected)
39298 return 0;
39299
39300- return fill_readbuf(port, ubuf, count, true);
39301+ return fill_readbuf(port, (char __force_kernel *)ubuf, count, true);
39302 }
39303
39304 static int wait_port_writable(struct port *port, bool nonblock)
39305diff --git a/drivers/clk/clk-composite.c b/drivers/clk/clk-composite.c
39306index 956b7e5..b655045 100644
39307--- a/drivers/clk/clk-composite.c
39308+++ b/drivers/clk/clk-composite.c
39309@@ -197,7 +197,7 @@ struct clk *clk_register_composite(struct device *dev, const char *name,
39310 struct clk *clk;
39311 struct clk_init_data init;
39312 struct clk_composite *composite;
39313- struct clk_ops *clk_composite_ops;
39314+ clk_ops_no_const *clk_composite_ops;
39315
39316 composite = kzalloc(sizeof(*composite), GFP_KERNEL);
39317 if (!composite) {
39318diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c
39319index dd3a78c..386d49c 100644
39320--- a/drivers/clk/socfpga/clk-gate.c
39321+++ b/drivers/clk/socfpga/clk-gate.c
39322@@ -22,6 +22,7 @@
39323 #include <linux/mfd/syscon.h>
39324 #include <linux/of.h>
39325 #include <linux/regmap.h>
39326+#include <asm/pgtable.h>
39327
39328 #include "clk.h"
39329
39330@@ -174,7 +175,7 @@ static int socfpga_clk_prepare(struct clk_hw *hwclk)
39331 return 0;
39332 }
39333
39334-static struct clk_ops gateclk_ops = {
39335+static clk_ops_no_const gateclk_ops __read_only = {
39336 .prepare = socfpga_clk_prepare,
39337 .recalc_rate = socfpga_clk_recalc_rate,
39338 .get_parent = socfpga_clk_get_parent,
39339@@ -208,8 +209,10 @@ static void __init __socfpga_gate_init(struct device_node *node,
39340 socfpga_clk->hw.reg = clk_mgr_base_addr + clk_gate[0];
39341 socfpga_clk->hw.bit_idx = clk_gate[1];
39342
39343- gateclk_ops.enable = clk_gate_ops.enable;
39344- gateclk_ops.disable = clk_gate_ops.disable;
39345+ pax_open_kernel();
39346+ *(void **)&gateclk_ops.enable = clk_gate_ops.enable;
39347+ *(void **)&gateclk_ops.disable = clk_gate_ops.disable;
39348+ pax_close_kernel();
39349 }
39350
39351 rc = of_property_read_u32(node, "fixed-divider", &fixed_div);
39352diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c
39353index de6da95..c98278b 100644
39354--- a/drivers/clk/socfpga/clk-pll.c
39355+++ b/drivers/clk/socfpga/clk-pll.c
39356@@ -21,6 +21,7 @@
39357 #include <linux/io.h>
39358 #include <linux/of.h>
39359 #include <linux/of_address.h>
39360+#include <asm/pgtable.h>
39361
39362 #include "clk.h"
39363
39364@@ -76,7 +77,7 @@ static u8 clk_pll_get_parent(struct clk_hw *hwclk)
39365 CLK_MGR_PLL_CLK_SRC_MASK;
39366 }
39367
39368-static struct clk_ops clk_pll_ops = {
39369+static clk_ops_no_const clk_pll_ops __read_only = {
39370 .recalc_rate = clk_pll_recalc_rate,
39371 .get_parent = clk_pll_get_parent,
39372 };
39373@@ -120,8 +121,10 @@ static __init struct clk *__socfpga_pll_init(struct device_node *node,
39374 pll_clk->hw.hw.init = &init;
39375
39376 pll_clk->hw.bit_idx = SOCFPGA_PLL_EXT_ENA;
39377- clk_pll_ops.enable = clk_gate_ops.enable;
39378- clk_pll_ops.disable = clk_gate_ops.disable;
39379+ pax_open_kernel();
39380+ *(void **)&clk_pll_ops.enable = clk_gate_ops.enable;
39381+ *(void **)&clk_pll_ops.disable = clk_gate_ops.disable;
39382+ pax_close_kernel();
39383
39384 clk = clk_register(NULL, &pll_clk->hw.hw);
39385 if (WARN_ON(IS_ERR(clk))) {
39386diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c
39387index b0c18ed..1713a80 100644
39388--- a/drivers/cpufreq/acpi-cpufreq.c
39389+++ b/drivers/cpufreq/acpi-cpufreq.c
39390@@ -675,8 +675,11 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39391 data->acpi_data = per_cpu_ptr(acpi_perf_data, cpu);
39392 per_cpu(acfreq_data, cpu) = data;
39393
39394- if (cpu_has(c, X86_FEATURE_CONSTANT_TSC))
39395- acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39396+ if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
39397+ pax_open_kernel();
39398+ *(u8 *)&acpi_cpufreq_driver.flags |= CPUFREQ_CONST_LOOPS;
39399+ pax_close_kernel();
39400+ }
39401
39402 result = acpi_processor_register_performance(data->acpi_data, cpu);
39403 if (result)
39404@@ -809,7 +812,9 @@ static int acpi_cpufreq_cpu_init(struct cpufreq_policy *policy)
39405 policy->cur = acpi_cpufreq_guess_freq(data, policy->cpu);
39406 break;
39407 case ACPI_ADR_SPACE_FIXED_HARDWARE:
39408- acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39409+ pax_open_kernel();
39410+ *(void **)&acpi_cpufreq_driver.get = get_cur_freq_on_cpu;
39411+ pax_close_kernel();
39412 break;
39413 default:
39414 break;
39415@@ -903,8 +908,10 @@ static void __init acpi_cpufreq_boost_init(void)
39416 if (!msrs)
39417 return;
39418
39419- acpi_cpufreq_driver.boost_supported = true;
39420- acpi_cpufreq_driver.boost_enabled = boost_state(0);
39421+ pax_open_kernel();
39422+ *(bool *)&acpi_cpufreq_driver.boost_supported = true;
39423+ *(bool *)&acpi_cpufreq_driver.boost_enabled = boost_state(0);
39424+ pax_close_kernel();
39425
39426 cpu_notifier_register_begin();
39427
39428diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
39429index bab67db..91af7e3 100644
39430--- a/drivers/cpufreq/cpufreq-dt.c
39431+++ b/drivers/cpufreq/cpufreq-dt.c
39432@@ -392,7 +392,9 @@ static int dt_cpufreq_probe(struct platform_device *pdev)
39433 if (!IS_ERR(cpu_reg))
39434 regulator_put(cpu_reg);
39435
39436- dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39437+ pax_open_kernel();
39438+ *(void **)&dt_cpufreq_driver.driver_data = dev_get_platdata(&pdev->dev);
39439+ pax_close_kernel();
39440
39441 ret = cpufreq_register_driver(&dt_cpufreq_driver);
39442 if (ret)
39443diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
39444index 8ae655c..3141442 100644
39445--- a/drivers/cpufreq/cpufreq.c
39446+++ b/drivers/cpufreq/cpufreq.c
39447@@ -2108,7 +2108,7 @@ void cpufreq_unregister_governor(struct cpufreq_governor *governor)
39448 }
39449
39450 mutex_lock(&cpufreq_governor_mutex);
39451- list_del(&governor->governor_list);
39452+ pax_list_del(&governor->governor_list);
39453 mutex_unlock(&cpufreq_governor_mutex);
39454 return;
39455 }
39456@@ -2323,7 +2323,7 @@ static int cpufreq_cpu_callback(struct notifier_block *nfb,
39457 return NOTIFY_OK;
39458 }
39459
39460-static struct notifier_block __refdata cpufreq_cpu_notifier = {
39461+static struct notifier_block cpufreq_cpu_notifier = {
39462 .notifier_call = cpufreq_cpu_callback,
39463 };
39464
39465@@ -2363,13 +2363,17 @@ int cpufreq_boost_trigger_state(int state)
39466 return 0;
39467
39468 write_lock_irqsave(&cpufreq_driver_lock, flags);
39469- cpufreq_driver->boost_enabled = state;
39470+ pax_open_kernel();
39471+ *(bool *)&cpufreq_driver->boost_enabled = state;
39472+ pax_close_kernel();
39473 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39474
39475 ret = cpufreq_driver->set_boost(state);
39476 if (ret) {
39477 write_lock_irqsave(&cpufreq_driver_lock, flags);
39478- cpufreq_driver->boost_enabled = !state;
39479+ pax_open_kernel();
39480+ *(bool *)&cpufreq_driver->boost_enabled = !state;
39481+ pax_close_kernel();
39482 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39483
39484 pr_err("%s: Cannot %s BOOST\n",
39485@@ -2434,16 +2438,22 @@ int cpufreq_register_driver(struct cpufreq_driver *driver_data)
39486 cpufreq_driver = driver_data;
39487 write_unlock_irqrestore(&cpufreq_driver_lock, flags);
39488
39489- if (driver_data->setpolicy)
39490- driver_data->flags |= CPUFREQ_CONST_LOOPS;
39491+ if (driver_data->setpolicy) {
39492+ pax_open_kernel();
39493+ *(u8 *)&driver_data->flags |= CPUFREQ_CONST_LOOPS;
39494+ pax_close_kernel();
39495+ }
39496
39497 if (cpufreq_boost_supported()) {
39498 /*
39499 * Check if driver provides function to enable boost -
39500 * if not, use cpufreq_boost_set_sw as default
39501 */
39502- if (!cpufreq_driver->set_boost)
39503- cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39504+ if (!cpufreq_driver->set_boost) {
39505+ pax_open_kernel();
39506+ *(void **)&cpufreq_driver->set_boost = cpufreq_boost_set_sw;
39507+ pax_close_kernel();
39508+ }
39509
39510 ret = cpufreq_sysfs_create_file(&boost.attr);
39511 if (ret) {
39512diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c
39513index 1b44496..b80ff5e 100644
39514--- a/drivers/cpufreq/cpufreq_governor.c
39515+++ b/drivers/cpufreq/cpufreq_governor.c
39516@@ -245,7 +245,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39517 struct dbs_data *dbs_data;
39518 struct od_cpu_dbs_info_s *od_dbs_info = NULL;
39519 struct cs_cpu_dbs_info_s *cs_dbs_info = NULL;
39520- struct od_ops *od_ops = NULL;
39521+ const struct od_ops *od_ops = NULL;
39522 struct od_dbs_tuners *od_tuners = NULL;
39523 struct cs_dbs_tuners *cs_tuners = NULL;
39524 struct cpu_dbs_common_info *cpu_cdbs;
39525@@ -311,7 +311,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39526
39527 if ((cdata->governor == GOV_CONSERVATIVE) &&
39528 (!policy->governor->initialized)) {
39529- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39530+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39531
39532 cpufreq_register_notifier(cs_ops->notifier_block,
39533 CPUFREQ_TRANSITION_NOTIFIER);
39534@@ -331,7 +331,7 @@ int cpufreq_governor_dbs(struct cpufreq_policy *policy,
39535
39536 if ((dbs_data->cdata->governor == GOV_CONSERVATIVE) &&
39537 (policy->governor->initialized == 1)) {
39538- struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39539+ const struct cs_ops *cs_ops = dbs_data->cdata->gov_ops;
39540
39541 cpufreq_unregister_notifier(cs_ops->notifier_block,
39542 CPUFREQ_TRANSITION_NOTIFIER);
39543diff --git a/drivers/cpufreq/cpufreq_governor.h b/drivers/cpufreq/cpufreq_governor.h
39544index cc401d1..8197340 100644
39545--- a/drivers/cpufreq/cpufreq_governor.h
39546+++ b/drivers/cpufreq/cpufreq_governor.h
39547@@ -212,7 +212,7 @@ struct common_dbs_data {
39548 void (*exit)(struct dbs_data *dbs_data);
39549
39550 /* Governor specific ops, see below */
39551- void *gov_ops;
39552+ const void *gov_ops;
39553 };
39554
39555 /* Governor Per policy data */
39556@@ -232,7 +232,7 @@ struct od_ops {
39557 unsigned int (*powersave_bias_target)(struct cpufreq_policy *policy,
39558 unsigned int freq_next, unsigned int relation);
39559 void (*freq_increase)(struct cpufreq_policy *policy, unsigned int freq);
39560-};
39561+} __no_const;
39562
39563 struct cs_ops {
39564 struct notifier_block *notifier_block;
39565diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c
39566index ad3f38f..8f086cd 100644
39567--- a/drivers/cpufreq/cpufreq_ondemand.c
39568+++ b/drivers/cpufreq/cpufreq_ondemand.c
39569@@ -524,7 +524,7 @@ static void od_exit(struct dbs_data *dbs_data)
39570
39571 define_get_cpu_dbs_routines(od_cpu_dbs_info);
39572
39573-static struct od_ops od_ops = {
39574+static struct od_ops od_ops __read_only = {
39575 .powersave_bias_init_cpu = ondemand_powersave_bias_init_cpu,
39576 .powersave_bias_target = generic_powersave_bias_target,
39577 .freq_increase = dbs_freq_increase,
39578@@ -579,14 +579,18 @@ void od_register_powersave_bias_handler(unsigned int (*f)
39579 (struct cpufreq_policy *, unsigned int, unsigned int),
39580 unsigned int powersave_bias)
39581 {
39582- od_ops.powersave_bias_target = f;
39583+ pax_open_kernel();
39584+ *(void **)&od_ops.powersave_bias_target = f;
39585+ pax_close_kernel();
39586 od_set_powersave_bias(powersave_bias);
39587 }
39588 EXPORT_SYMBOL_GPL(od_register_powersave_bias_handler);
39589
39590 void od_unregister_powersave_bias_handler(void)
39591 {
39592- od_ops.powersave_bias_target = generic_powersave_bias_target;
39593+ pax_open_kernel();
39594+ *(void **)&od_ops.powersave_bias_target = generic_powersave_bias_target;
39595+ pax_close_kernel();
39596 od_set_powersave_bias(0);
39597 }
39598 EXPORT_SYMBOL_GPL(od_unregister_powersave_bias_handler);
39599diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
39600index 872c577..5fb3c20 100644
39601--- a/drivers/cpufreq/intel_pstate.c
39602+++ b/drivers/cpufreq/intel_pstate.c
39603@@ -133,10 +133,10 @@ struct pstate_funcs {
39604 struct cpu_defaults {
39605 struct pstate_adjust_policy pid_policy;
39606 struct pstate_funcs funcs;
39607-};
39608+} __do_const;
39609
39610 static struct pstate_adjust_policy pid_params;
39611-static struct pstate_funcs pstate_funcs;
39612+static struct pstate_funcs *pstate_funcs;
39613 static int hwp_active;
39614
39615 struct perf_limits {
39616@@ -690,18 +690,18 @@ static void intel_pstate_set_pstate(struct cpudata *cpu, int pstate)
39617
39618 cpu->pstate.current_pstate = pstate;
39619
39620- pstate_funcs.set(cpu, pstate);
39621+ pstate_funcs->set(cpu, pstate);
39622 }
39623
39624 static void intel_pstate_get_cpu_pstates(struct cpudata *cpu)
39625 {
39626- cpu->pstate.min_pstate = pstate_funcs.get_min();
39627- cpu->pstate.max_pstate = pstate_funcs.get_max();
39628- cpu->pstate.turbo_pstate = pstate_funcs.get_turbo();
39629- cpu->pstate.scaling = pstate_funcs.get_scaling();
39630+ cpu->pstate.min_pstate = pstate_funcs->get_min();
39631+ cpu->pstate.max_pstate = pstate_funcs->get_max();
39632+ cpu->pstate.turbo_pstate = pstate_funcs->get_turbo();
39633+ cpu->pstate.scaling = pstate_funcs->get_scaling();
39634
39635- if (pstate_funcs.get_vid)
39636- pstate_funcs.get_vid(cpu);
39637+ if (pstate_funcs->get_vid)
39638+ pstate_funcs->get_vid(cpu);
39639 intel_pstate_set_pstate(cpu, cpu->pstate.min_pstate);
39640 }
39641
39642@@ -1030,9 +1030,9 @@ static int intel_pstate_msrs_not_valid(void)
39643 rdmsrl(MSR_IA32_APERF, aperf);
39644 rdmsrl(MSR_IA32_MPERF, mperf);
39645
39646- if (!pstate_funcs.get_max() ||
39647- !pstate_funcs.get_min() ||
39648- !pstate_funcs.get_turbo())
39649+ if (!pstate_funcs->get_max() ||
39650+ !pstate_funcs->get_min() ||
39651+ !pstate_funcs->get_turbo())
39652 return -ENODEV;
39653
39654 rdmsrl(MSR_IA32_APERF, tmp);
39655@@ -1046,7 +1046,7 @@ static int intel_pstate_msrs_not_valid(void)
39656 return 0;
39657 }
39658
39659-static void copy_pid_params(struct pstate_adjust_policy *policy)
39660+static void copy_pid_params(const struct pstate_adjust_policy *policy)
39661 {
39662 pid_params.sample_rate_ms = policy->sample_rate_ms;
39663 pid_params.p_gain_pct = policy->p_gain_pct;
39664@@ -1058,12 +1058,7 @@ static void copy_pid_params(struct pstate_adjust_policy *policy)
39665
39666 static void copy_cpu_funcs(struct pstate_funcs *funcs)
39667 {
39668- pstate_funcs.get_max = funcs->get_max;
39669- pstate_funcs.get_min = funcs->get_min;
39670- pstate_funcs.get_turbo = funcs->get_turbo;
39671- pstate_funcs.get_scaling = funcs->get_scaling;
39672- pstate_funcs.set = funcs->set;
39673- pstate_funcs.get_vid = funcs->get_vid;
39674+ pstate_funcs = funcs;
39675 }
39676
39677 #if IS_ENABLED(CONFIG_ACPI)
39678diff --git a/drivers/cpufreq/p4-clockmod.c b/drivers/cpufreq/p4-clockmod.c
39679index 529cfd9..0e28fff 100644
39680--- a/drivers/cpufreq/p4-clockmod.c
39681+++ b/drivers/cpufreq/p4-clockmod.c
39682@@ -134,10 +134,14 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39683 case 0x0F: /* Core Duo */
39684 case 0x16: /* Celeron Core */
39685 case 0x1C: /* Atom */
39686- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39687+ pax_open_kernel();
39688+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39689+ pax_close_kernel();
39690 return speedstep_get_frequency(SPEEDSTEP_CPU_PCORE);
39691 case 0x0D: /* Pentium M (Dothan) */
39692- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39693+ pax_open_kernel();
39694+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39695+ pax_close_kernel();
39696 /* fall through */
39697 case 0x09: /* Pentium M (Banias) */
39698 return speedstep_get_frequency(SPEEDSTEP_CPU_PM);
39699@@ -149,7 +153,9 @@ static unsigned int cpufreq_p4_get_frequency(struct cpuinfo_x86 *c)
39700
39701 /* on P-4s, the TSC runs with constant frequency independent whether
39702 * throttling is active or not. */
39703- p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39704+ pax_open_kernel();
39705+ *(u8 *)&p4clockmod_driver.flags |= CPUFREQ_CONST_LOOPS;
39706+ pax_close_kernel();
39707
39708 if (speedstep_detect_processor() == SPEEDSTEP_CPU_P4M) {
39709 printk(KERN_WARNING PFX "Warning: Pentium 4-M detected. "
39710diff --git a/drivers/cpufreq/sparc-us3-cpufreq.c b/drivers/cpufreq/sparc-us3-cpufreq.c
39711index 9bb42ba..b01b4a2 100644
39712--- a/drivers/cpufreq/sparc-us3-cpufreq.c
39713+++ b/drivers/cpufreq/sparc-us3-cpufreq.c
39714@@ -18,14 +18,12 @@
39715 #include <asm/head.h>
39716 #include <asm/timer.h>
39717
39718-static struct cpufreq_driver *cpufreq_us3_driver;
39719-
39720 struct us3_freq_percpu_info {
39721 struct cpufreq_frequency_table table[4];
39722 };
39723
39724 /* Indexed by cpu number. */
39725-static struct us3_freq_percpu_info *us3_freq_table;
39726+static struct us3_freq_percpu_info us3_freq_table[NR_CPUS];
39727
39728 /* UltraSPARC-III has three dividers: 1, 2, and 32. These are controlled
39729 * in the Safari config register.
39730@@ -156,16 +154,27 @@ static int __init us3_freq_cpu_init(struct cpufreq_policy *policy)
39731
39732 static int us3_freq_cpu_exit(struct cpufreq_policy *policy)
39733 {
39734- if (cpufreq_us3_driver)
39735- us3_freq_target(policy, 0);
39736+ us3_freq_target(policy, 0);
39737
39738 return 0;
39739 }
39740
39741+static int __init us3_freq_init(void);
39742+static void __exit us3_freq_exit(void);
39743+
39744+static struct cpufreq_driver cpufreq_us3_driver = {
39745+ .init = us3_freq_cpu_init,
39746+ .verify = cpufreq_generic_frequency_table_verify,
39747+ .target_index = us3_freq_target,
39748+ .get = us3_freq_get,
39749+ .exit = us3_freq_cpu_exit,
39750+ .name = "UltraSPARC-III",
39751+
39752+};
39753+
39754 static int __init us3_freq_init(void)
39755 {
39756 unsigned long manuf, impl, ver;
39757- int ret;
39758
39759 if (tlb_type != cheetah && tlb_type != cheetah_plus)
39760 return -ENODEV;
39761@@ -178,55 +187,15 @@ static int __init us3_freq_init(void)
39762 (impl == CHEETAH_IMPL ||
39763 impl == CHEETAH_PLUS_IMPL ||
39764 impl == JAGUAR_IMPL ||
39765- impl == PANTHER_IMPL)) {
39766- struct cpufreq_driver *driver;
39767-
39768- ret = -ENOMEM;
39769- driver = kzalloc(sizeof(*driver), GFP_KERNEL);
39770- if (!driver)
39771- goto err_out;
39772-
39773- us3_freq_table = kzalloc((NR_CPUS * sizeof(*us3_freq_table)),
39774- GFP_KERNEL);
39775- if (!us3_freq_table)
39776- goto err_out;
39777-
39778- driver->init = us3_freq_cpu_init;
39779- driver->verify = cpufreq_generic_frequency_table_verify;
39780- driver->target_index = us3_freq_target;
39781- driver->get = us3_freq_get;
39782- driver->exit = us3_freq_cpu_exit;
39783- strcpy(driver->name, "UltraSPARC-III");
39784-
39785- cpufreq_us3_driver = driver;
39786- ret = cpufreq_register_driver(driver);
39787- if (ret)
39788- goto err_out;
39789-
39790- return 0;
39791-
39792-err_out:
39793- if (driver) {
39794- kfree(driver);
39795- cpufreq_us3_driver = NULL;
39796- }
39797- kfree(us3_freq_table);
39798- us3_freq_table = NULL;
39799- return ret;
39800- }
39801+ impl == PANTHER_IMPL))
39802+ return cpufreq_register_driver(&cpufreq_us3_driver);
39803
39804 return -ENODEV;
39805 }
39806
39807 static void __exit us3_freq_exit(void)
39808 {
39809- if (cpufreq_us3_driver) {
39810- cpufreq_unregister_driver(cpufreq_us3_driver);
39811- kfree(cpufreq_us3_driver);
39812- cpufreq_us3_driver = NULL;
39813- kfree(us3_freq_table);
39814- us3_freq_table = NULL;
39815- }
39816+ cpufreq_unregister_driver(&cpufreq_us3_driver);
39817 }
39818
39819 MODULE_AUTHOR("David S. Miller <davem@redhat.com>");
39820diff --git a/drivers/cpufreq/speedstep-centrino.c b/drivers/cpufreq/speedstep-centrino.c
39821index 7d4a315..21bb886 100644
39822--- a/drivers/cpufreq/speedstep-centrino.c
39823+++ b/drivers/cpufreq/speedstep-centrino.c
39824@@ -351,8 +351,11 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
39825 !cpu_has(cpu, X86_FEATURE_EST))
39826 return -ENODEV;
39827
39828- if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC))
39829- centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39830+ if (cpu_has(cpu, X86_FEATURE_CONSTANT_TSC)) {
39831+ pax_open_kernel();
39832+ *(u8 *)&centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
39833+ pax_close_kernel();
39834+ }
39835
39836 if (policy->cpu != 0)
39837 return -ENODEV;
39838diff --git a/drivers/cpuidle/driver.c b/drivers/cpuidle/driver.c
39839index 2697e87..c32476c 100644
39840--- a/drivers/cpuidle/driver.c
39841+++ b/drivers/cpuidle/driver.c
39842@@ -194,7 +194,7 @@ static int poll_idle(struct cpuidle_device *dev,
39843
39844 static void poll_idle_init(struct cpuidle_driver *drv)
39845 {
39846- struct cpuidle_state *state = &drv->states[0];
39847+ cpuidle_state_no_const *state = &drv->states[0];
39848
39849 snprintf(state->name, CPUIDLE_NAME_LEN, "POLL");
39850 snprintf(state->desc, CPUIDLE_DESC_LEN, "CPUIDLE CORE POLL IDLE");
39851diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c
39852index fb9f511..213e6cc 100644
39853--- a/drivers/cpuidle/governor.c
39854+++ b/drivers/cpuidle/governor.c
39855@@ -87,7 +87,7 @@ int cpuidle_register_governor(struct cpuidle_governor *gov)
39856 mutex_lock(&cpuidle_lock);
39857 if (__cpuidle_find_governor(gov->name) == NULL) {
39858 ret = 0;
39859- list_add_tail(&gov->governor_list, &cpuidle_governors);
39860+ pax_list_add_tail((struct list_head *)&gov->governor_list, &cpuidle_governors);
39861 if (!cpuidle_curr_governor ||
39862 cpuidle_curr_governor->rating < gov->rating)
39863 cpuidle_switch_governor(gov);
39864diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
39865index 832a2c3..1794080 100644
39866--- a/drivers/cpuidle/sysfs.c
39867+++ b/drivers/cpuidle/sysfs.c
39868@@ -135,7 +135,7 @@ static struct attribute *cpuidle_switch_attrs[] = {
39869 NULL
39870 };
39871
39872-static struct attribute_group cpuidle_attr_group = {
39873+static attribute_group_no_const cpuidle_attr_group = {
39874 .attrs = cpuidle_default_attrs,
39875 .name = "cpuidle",
39876 };
39877diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c
39878index 8d2a772..33826c9 100644
39879--- a/drivers/crypto/hifn_795x.c
39880+++ b/drivers/crypto/hifn_795x.c
39881@@ -51,7 +51,7 @@ module_param_string(hifn_pll_ref, hifn_pll_ref, sizeof(hifn_pll_ref), 0444);
39882 MODULE_PARM_DESC(hifn_pll_ref,
39883 "PLL reference clock (pci[freq] or ext[freq], default ext)");
39884
39885-static atomic_t hifn_dev_number;
39886+static atomic_unchecked_t hifn_dev_number;
39887
39888 #define ACRYPTO_OP_DECRYPT 0
39889 #define ACRYPTO_OP_ENCRYPT 1
39890@@ -2577,7 +2577,7 @@ static int hifn_probe(struct pci_dev *pdev, const struct pci_device_id *id)
39891 goto err_out_disable_pci_device;
39892
39893 snprintf(name, sizeof(name), "hifn%d",
39894- atomic_inc_return(&hifn_dev_number)-1);
39895+ atomic_inc_return_unchecked(&hifn_dev_number)-1);
39896
39897 err = pci_request_regions(pdev, name);
39898 if (err)
39899diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
39900index 30b538d8..1610d75 100644
39901--- a/drivers/devfreq/devfreq.c
39902+++ b/drivers/devfreq/devfreq.c
39903@@ -673,7 +673,7 @@ int devfreq_add_governor(struct devfreq_governor *governor)
39904 goto err_out;
39905 }
39906
39907- list_add(&governor->node, &devfreq_governor_list);
39908+ pax_list_add((struct list_head *)&governor->node, &devfreq_governor_list);
39909
39910 list_for_each_entry(devfreq, &devfreq_list, node) {
39911 int ret = 0;
39912@@ -761,7 +761,7 @@ int devfreq_remove_governor(struct devfreq_governor *governor)
39913 }
39914 }
39915
39916- list_del(&governor->node);
39917+ pax_list_del((struct list_head *)&governor->node);
39918 err_out:
39919 mutex_unlock(&devfreq_list_lock);
39920
39921diff --git a/drivers/dma/sh/shdma-base.c b/drivers/dma/sh/shdma-base.c
39922index 8ee383d..736b5de 100644
39923--- a/drivers/dma/sh/shdma-base.c
39924+++ b/drivers/dma/sh/shdma-base.c
39925@@ -228,8 +228,8 @@ static int shdma_alloc_chan_resources(struct dma_chan *chan)
39926 schan->slave_id = -EINVAL;
39927 }
39928
39929- schan->desc = kcalloc(NR_DESCS_PER_CHANNEL,
39930- sdev->desc_size, GFP_KERNEL);
39931+ schan->desc = kcalloc(sdev->desc_size,
39932+ NR_DESCS_PER_CHANNEL, GFP_KERNEL);
39933 if (!schan->desc) {
39934 ret = -ENOMEM;
39935 goto edescalloc;
39936diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c
39937index 9f1d4c7..fceff78 100644
39938--- a/drivers/dma/sh/shdmac.c
39939+++ b/drivers/dma/sh/shdmac.c
39940@@ -513,7 +513,7 @@ static int sh_dmae_nmi_handler(struct notifier_block *self,
39941 return ret;
39942 }
39943
39944-static struct notifier_block sh_dmae_nmi_notifier __read_mostly = {
39945+static struct notifier_block sh_dmae_nmi_notifier = {
39946 .notifier_call = sh_dmae_nmi_handler,
39947
39948 /* Run before NMI debug handler and KGDB */
39949diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
39950index 592af5f..bb1d583 100644
39951--- a/drivers/edac/edac_device.c
39952+++ b/drivers/edac/edac_device.c
39953@@ -477,9 +477,9 @@ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev,
39954 */
39955 int edac_device_alloc_index(void)
39956 {
39957- static atomic_t device_indexes = ATOMIC_INIT(0);
39958+ static atomic_unchecked_t device_indexes = ATOMIC_INIT(0);
39959
39960- return atomic_inc_return(&device_indexes) - 1;
39961+ return atomic_inc_return_unchecked(&device_indexes) - 1;
39962 }
39963 EXPORT_SYMBOL_GPL(edac_device_alloc_index);
39964
39965diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c
39966index c84eecb..4d7381d 100644
39967--- a/drivers/edac/edac_mc_sysfs.c
39968+++ b/drivers/edac/edac_mc_sysfs.c
39969@@ -154,7 +154,7 @@ static const char * const edac_caps[] = {
39970 struct dev_ch_attribute {
39971 struct device_attribute attr;
39972 int channel;
39973-};
39974+} __do_const;
39975
39976 #define DEVICE_CHANNEL(_name, _mode, _show, _store, _var) \
39977 static struct dev_ch_attribute dev_attr_legacy_##_name = \
39978@@ -1009,15 +1009,17 @@ int edac_create_sysfs_mci_device(struct mem_ctl_info *mci)
39979 }
39980
39981 if (mci->set_sdram_scrub_rate || mci->get_sdram_scrub_rate) {
39982+ pax_open_kernel();
39983 if (mci->get_sdram_scrub_rate) {
39984- dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39985- dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39986+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IRUGO;
39987+ *(void **)&dev_attr_sdram_scrub_rate.show = &mci_sdram_scrub_rate_show;
39988 }
39989
39990 if (mci->set_sdram_scrub_rate) {
39991- dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39992- dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39993+ *(umode_t *)&dev_attr_sdram_scrub_rate.attr.mode |= S_IWUSR;
39994+ *(void **)&dev_attr_sdram_scrub_rate.store = &mci_sdram_scrub_rate_store;
39995 }
39996+ pax_close_kernel();
39997
39998 err = device_create_file(&mci->dev, &dev_attr_sdram_scrub_rate);
39999 if (err) {
40000diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
40001index 2cf44b4d..6dd2dc7 100644
40002--- a/drivers/edac/edac_pci.c
40003+++ b/drivers/edac/edac_pci.c
40004@@ -29,7 +29,7 @@
40005
40006 static DEFINE_MUTEX(edac_pci_ctls_mutex);
40007 static LIST_HEAD(edac_pci_list);
40008-static atomic_t pci_indexes = ATOMIC_INIT(0);
40009+static atomic_unchecked_t pci_indexes = ATOMIC_INIT(0);
40010
40011 /*
40012 * edac_pci_alloc_ctl_info
40013@@ -315,7 +315,7 @@ EXPORT_SYMBOL_GPL(edac_pci_reset_delay_period);
40014 */
40015 int edac_pci_alloc_index(void)
40016 {
40017- return atomic_inc_return(&pci_indexes) - 1;
40018+ return atomic_inc_return_unchecked(&pci_indexes) - 1;
40019 }
40020 EXPORT_SYMBOL_GPL(edac_pci_alloc_index);
40021
40022diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c
40023index 24d877f..4e30133 100644
40024--- a/drivers/edac/edac_pci_sysfs.c
40025+++ b/drivers/edac/edac_pci_sysfs.c
40026@@ -23,8 +23,8 @@ static int edac_pci_log_pe = 1; /* log PCI parity errors */
40027 static int edac_pci_log_npe = 1; /* log PCI non-parity error errors */
40028 static int edac_pci_poll_msec = 1000; /* one second workq period */
40029
40030-static atomic_t pci_parity_count = ATOMIC_INIT(0);
40031-static atomic_t pci_nonparity_count = ATOMIC_INIT(0);
40032+static atomic_unchecked_t pci_parity_count = ATOMIC_INIT(0);
40033+static atomic_unchecked_t pci_nonparity_count = ATOMIC_INIT(0);
40034
40035 static struct kobject *edac_pci_top_main_kobj;
40036 static atomic_t edac_pci_sysfs_refcount = ATOMIC_INIT(0);
40037@@ -232,7 +232,7 @@ struct edac_pci_dev_attribute {
40038 void *value;
40039 ssize_t(*show) (void *, char *);
40040 ssize_t(*store) (void *, const char *, size_t);
40041-};
40042+} __do_const;
40043
40044 /* Set of show/store abstract level functions for PCI Parity object */
40045 static ssize_t edac_pci_dev_show(struct kobject *kobj, struct attribute *attr,
40046@@ -576,7 +576,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40047 edac_printk(KERN_CRIT, EDAC_PCI,
40048 "Signaled System Error on %s\n",
40049 pci_name(dev));
40050- atomic_inc(&pci_nonparity_count);
40051+ atomic_inc_unchecked(&pci_nonparity_count);
40052 }
40053
40054 if (status & (PCI_STATUS_PARITY)) {
40055@@ -584,7 +584,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40056 "Master Data Parity Error on %s\n",
40057 pci_name(dev));
40058
40059- atomic_inc(&pci_parity_count);
40060+ atomic_inc_unchecked(&pci_parity_count);
40061 }
40062
40063 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40064@@ -592,7 +592,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40065 "Detected Parity Error on %s\n",
40066 pci_name(dev));
40067
40068- atomic_inc(&pci_parity_count);
40069+ atomic_inc_unchecked(&pci_parity_count);
40070 }
40071 }
40072
40073@@ -615,7 +615,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40074 edac_printk(KERN_CRIT, EDAC_PCI, "Bridge "
40075 "Signaled System Error on %s\n",
40076 pci_name(dev));
40077- atomic_inc(&pci_nonparity_count);
40078+ atomic_inc_unchecked(&pci_nonparity_count);
40079 }
40080
40081 if (status & (PCI_STATUS_PARITY)) {
40082@@ -623,7 +623,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40083 "Master Data Parity Error on "
40084 "%s\n", pci_name(dev));
40085
40086- atomic_inc(&pci_parity_count);
40087+ atomic_inc_unchecked(&pci_parity_count);
40088 }
40089
40090 if (status & (PCI_STATUS_DETECTED_PARITY)) {
40091@@ -631,7 +631,7 @@ static void edac_pci_dev_parity_test(struct pci_dev *dev)
40092 "Detected Parity Error on %s\n",
40093 pci_name(dev));
40094
40095- atomic_inc(&pci_parity_count);
40096+ atomic_inc_unchecked(&pci_parity_count);
40097 }
40098 }
40099 }
40100@@ -669,7 +669,7 @@ void edac_pci_do_parity_check(void)
40101 if (!check_pci_errors)
40102 return;
40103
40104- before_count = atomic_read(&pci_parity_count);
40105+ before_count = atomic_read_unchecked(&pci_parity_count);
40106
40107 /* scan all PCI devices looking for a Parity Error on devices and
40108 * bridges.
40109@@ -681,7 +681,7 @@ void edac_pci_do_parity_check(void)
40110 /* Only if operator has selected panic on PCI Error */
40111 if (edac_pci_get_panic_on_pe()) {
40112 /* If the count is different 'after' from 'before' */
40113- if (before_count != atomic_read(&pci_parity_count))
40114+ if (before_count != atomic_read_unchecked(&pci_parity_count))
40115 panic("EDAC: PCI Parity Error");
40116 }
40117 }
40118diff --git a/drivers/edac/mce_amd.h b/drivers/edac/mce_amd.h
40119index c2359a1..8bd119d 100644
40120--- a/drivers/edac/mce_amd.h
40121+++ b/drivers/edac/mce_amd.h
40122@@ -74,7 +74,7 @@ struct amd_decoder_ops {
40123 bool (*mc0_mce)(u16, u8);
40124 bool (*mc1_mce)(u16, u8);
40125 bool (*mc2_mce)(u16, u8);
40126-};
40127+} __no_const;
40128
40129 void amd_report_gart_errors(bool);
40130 void amd_register_ecc_decoder(void (*f)(int, struct mce *));
40131diff --git a/drivers/firewire/core-card.c b/drivers/firewire/core-card.c
40132index 57ea7f4..af06b76 100644
40133--- a/drivers/firewire/core-card.c
40134+++ b/drivers/firewire/core-card.c
40135@@ -528,9 +528,9 @@ void fw_card_initialize(struct fw_card *card,
40136 const struct fw_card_driver *driver,
40137 struct device *device)
40138 {
40139- static atomic_t index = ATOMIC_INIT(-1);
40140+ static atomic_unchecked_t index = ATOMIC_INIT(-1);
40141
40142- card->index = atomic_inc_return(&index);
40143+ card->index = atomic_inc_return_unchecked(&index);
40144 card->driver = driver;
40145 card->device = device;
40146 card->current_tlabel = 0;
40147@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(fw_card_release);
40148
40149 void fw_core_remove_card(struct fw_card *card)
40150 {
40151- struct fw_card_driver dummy_driver = dummy_driver_template;
40152+ fw_card_driver_no_const dummy_driver = dummy_driver_template;
40153
40154 card->driver->update_phy_reg(card, 4,
40155 PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
40156diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c
40157index f9e3aee..269dbdb 100644
40158--- a/drivers/firewire/core-device.c
40159+++ b/drivers/firewire/core-device.c
40160@@ -256,7 +256,7 @@ EXPORT_SYMBOL(fw_device_enable_phys_dma);
40161 struct config_rom_attribute {
40162 struct device_attribute attr;
40163 u32 key;
40164-};
40165+} __do_const;
40166
40167 static ssize_t show_immediate(struct device *dev,
40168 struct device_attribute *dattr, char *buf)
40169diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c
40170index d6a09b9..18e90dd 100644
40171--- a/drivers/firewire/core-transaction.c
40172+++ b/drivers/firewire/core-transaction.c
40173@@ -38,6 +38,7 @@
40174 #include <linux/timer.h>
40175 #include <linux/types.h>
40176 #include <linux/workqueue.h>
40177+#include <linux/sched.h>
40178
40179 #include <asm/byteorder.h>
40180
40181diff --git a/drivers/firewire/core.h b/drivers/firewire/core.h
40182index e1480ff6..1a429bd 100644
40183--- a/drivers/firewire/core.h
40184+++ b/drivers/firewire/core.h
40185@@ -111,6 +111,7 @@ struct fw_card_driver {
40186
40187 int (*stop_iso)(struct fw_iso_context *ctx);
40188 };
40189+typedef struct fw_card_driver __no_const fw_card_driver_no_const;
40190
40191 void fw_card_initialize(struct fw_card *card,
40192 const struct fw_card_driver *driver, struct device *device);
40193diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
40194index f51d376..b118e40 100644
40195--- a/drivers/firewire/ohci.c
40196+++ b/drivers/firewire/ohci.c
40197@@ -2049,10 +2049,12 @@ static void bus_reset_work(struct work_struct *work)
40198 be32_to_cpu(ohci->next_header));
40199 }
40200
40201+#ifndef CONFIG_GRKERNSEC
40202 if (param_remote_dma) {
40203 reg_write(ohci, OHCI1394_PhyReqFilterHiSet, ~0);
40204 reg_write(ohci, OHCI1394_PhyReqFilterLoSet, ~0);
40205 }
40206+#endif
40207
40208 spin_unlock_irq(&ohci->lock);
40209
40210@@ -2584,8 +2586,10 @@ static int ohci_enable_phys_dma(struct fw_card *card,
40211 unsigned long flags;
40212 int n, ret = 0;
40213
40214+#ifndef CONFIG_GRKERNSEC
40215 if (param_remote_dma)
40216 return 0;
40217+#endif
40218
40219 /*
40220 * FIXME: Make sure this bitmask is cleared when we clear the busReset
40221diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c
40222index 94a58a0..f5eba42 100644
40223--- a/drivers/firmware/dmi-id.c
40224+++ b/drivers/firmware/dmi-id.c
40225@@ -16,7 +16,7 @@
40226 struct dmi_device_attribute{
40227 struct device_attribute dev_attr;
40228 int field;
40229-};
40230+} __do_const;
40231 #define to_dmi_dev_attr(_dev_attr) \
40232 container_of(_dev_attr, struct dmi_device_attribute, dev_attr)
40233
40234diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
40235index 2eebd28b..4261350 100644
40236--- a/drivers/firmware/dmi_scan.c
40237+++ b/drivers/firmware/dmi_scan.c
40238@@ -893,7 +893,7 @@ int dmi_walk(void (*decode)(const struct dmi_header *, void *),
40239 if (buf == NULL)
40240 return -1;
40241
40242- dmi_table(buf, dmi_len, dmi_num, decode, private_data);
40243+ dmi_table((char __force_kernel *)buf, dmi_len, dmi_num, decode, private_data);
40244
40245 dmi_unmap(buf);
40246 return 0;
40247diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c
40248index 4fd9961..52d60ce 100644
40249--- a/drivers/firmware/efi/cper.c
40250+++ b/drivers/firmware/efi/cper.c
40251@@ -44,12 +44,12 @@ static char rcd_decode_str[CPER_REC_LEN];
40252 */
40253 u64 cper_next_record_id(void)
40254 {
40255- static atomic64_t seq;
40256+ static atomic64_unchecked_t seq;
40257
40258- if (!atomic64_read(&seq))
40259- atomic64_set(&seq, ((u64)get_seconds()) << 32);
40260+ if (!atomic64_read_unchecked(&seq))
40261+ atomic64_set_unchecked(&seq, ((u64)get_seconds()) << 32);
40262
40263- return atomic64_inc_return(&seq);
40264+ return atomic64_inc_return_unchecked(&seq);
40265 }
40266 EXPORT_SYMBOL_GPL(cper_next_record_id);
40267
40268diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c
40269index 3061bb8..92b5fcc 100644
40270--- a/drivers/firmware/efi/efi.c
40271+++ b/drivers/firmware/efi/efi.c
40272@@ -160,14 +160,16 @@ static struct attribute_group efi_subsys_attr_group = {
40273 };
40274
40275 static struct efivars generic_efivars;
40276-static struct efivar_operations generic_ops;
40277+static efivar_operations_no_const generic_ops __read_only;
40278
40279 static int generic_ops_register(void)
40280 {
40281- generic_ops.get_variable = efi.get_variable;
40282- generic_ops.set_variable = efi.set_variable;
40283- generic_ops.get_next_variable = efi.get_next_variable;
40284- generic_ops.query_variable_store = efi_query_variable_store;
40285+ pax_open_kernel();
40286+ *(void **)&generic_ops.get_variable = efi.get_variable;
40287+ *(void **)&generic_ops.set_variable = efi.set_variable;
40288+ *(void **)&generic_ops.get_next_variable = efi.get_next_variable;
40289+ *(void **)&generic_ops.query_variable_store = efi_query_variable_store;
40290+ pax_close_kernel();
40291
40292 return efivars_register(&generic_efivars, &generic_ops, efi_kobj);
40293 }
40294diff --git a/drivers/firmware/efi/efivars.c b/drivers/firmware/efi/efivars.c
40295index 7b2e049..a253334 100644
40296--- a/drivers/firmware/efi/efivars.c
40297+++ b/drivers/firmware/efi/efivars.c
40298@@ -589,7 +589,7 @@ efivar_create_sysfs_entry(struct efivar_entry *new_var)
40299 static int
40300 create_efivars_bin_attributes(void)
40301 {
40302- struct bin_attribute *attr;
40303+ bin_attribute_no_const *attr;
40304 int error;
40305
40306 /* new_var */
40307diff --git a/drivers/firmware/efi/runtime-map.c b/drivers/firmware/efi/runtime-map.c
40308index 87b8e3b..c4afb35 100644
40309--- a/drivers/firmware/efi/runtime-map.c
40310+++ b/drivers/firmware/efi/runtime-map.c
40311@@ -97,7 +97,7 @@ static void map_release(struct kobject *kobj)
40312 kfree(entry);
40313 }
40314
40315-static struct kobj_type __refdata map_ktype = {
40316+static const struct kobj_type __refconst map_ktype = {
40317 .sysfs_ops = &map_attr_ops,
40318 .default_attrs = def_attrs,
40319 .release = map_release,
40320diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c
40321index f1ab05e..ab51228 100644
40322--- a/drivers/firmware/google/gsmi.c
40323+++ b/drivers/firmware/google/gsmi.c
40324@@ -709,7 +709,7 @@ static u32 __init hash_oem_table_id(char s[8])
40325 return local_hash_64(input, 32);
40326 }
40327
40328-static struct dmi_system_id gsmi_dmi_table[] __initdata = {
40329+static const struct dmi_system_id gsmi_dmi_table[] __initconst = {
40330 {
40331 .ident = "Google Board",
40332 .matches = {
40333diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google/memconsole.c
40334index 2f569aa..26e4f39 100644
40335--- a/drivers/firmware/google/memconsole.c
40336+++ b/drivers/firmware/google/memconsole.c
40337@@ -136,7 +136,7 @@ static bool __init found_memconsole(void)
40338 return false;
40339 }
40340
40341-static struct dmi_system_id memconsole_dmi_table[] __initdata = {
40342+static const struct dmi_system_id memconsole_dmi_table[] __initconst = {
40343 {
40344 .ident = "Google Board",
40345 .matches = {
40346@@ -155,7 +155,10 @@ static int __init memconsole_init(void)
40347 if (!found_memconsole())
40348 return -ENODEV;
40349
40350- memconsole_bin_attr.size = memconsole_length;
40351+ pax_open_kernel();
40352+ *(size_t *)&memconsole_bin_attr.size = memconsole_length;
40353+ pax_close_kernel();
40354+
40355 return sysfs_create_bin_file(firmware_kobj, &memconsole_bin_attr);
40356 }
40357
40358diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c
40359index cc016c61..d35279e 100644
40360--- a/drivers/firmware/memmap.c
40361+++ b/drivers/firmware/memmap.c
40362@@ -124,7 +124,7 @@ static void __meminit release_firmware_map_entry(struct kobject *kobj)
40363 kfree(entry);
40364 }
40365
40366-static struct kobj_type __refdata memmap_ktype = {
40367+static const struct kobj_type __refconst memmap_ktype = {
40368 .release = release_firmware_map_entry,
40369 .sysfs_ops = &memmap_attr_ops,
40370 .default_attrs = def_attrs,
40371diff --git a/drivers/gpio/gpio-em.c b/drivers/gpio/gpio-em.c
40372index 3cfcfc6..09d6f117 100644
40373--- a/drivers/gpio/gpio-em.c
40374+++ b/drivers/gpio/gpio-em.c
40375@@ -278,7 +278,7 @@ static int em_gio_probe(struct platform_device *pdev)
40376 struct em_gio_priv *p;
40377 struct resource *io[2], *irq[2];
40378 struct gpio_chip *gpio_chip;
40379- struct irq_chip *irq_chip;
40380+ irq_chip_no_const *irq_chip;
40381 const char *name = dev_name(&pdev->dev);
40382 int ret;
40383
40384diff --git a/drivers/gpio/gpio-ich.c b/drivers/gpio/gpio-ich.c
40385index 7818cd1..1be40e5 100644
40386--- a/drivers/gpio/gpio-ich.c
40387+++ b/drivers/gpio/gpio-ich.c
40388@@ -94,7 +94,7 @@ struct ichx_desc {
40389 * this option allows driver caching written output values
40390 */
40391 bool use_outlvl_cache;
40392-};
40393+} __do_const;
40394
40395 static struct {
40396 spinlock_t lock;
40397diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
40398index f476ae2..05e1bdd 100644
40399--- a/drivers/gpio/gpio-omap.c
40400+++ b/drivers/gpio/gpio-omap.c
40401@@ -1188,7 +1188,7 @@ static int omap_gpio_probe(struct platform_device *pdev)
40402 const struct omap_gpio_platform_data *pdata;
40403 struct resource *res;
40404 struct gpio_bank *bank;
40405- struct irq_chip *irqc;
40406+ irq_chip_no_const *irqc;
40407 int ret;
40408
40409 match = of_match_device(of_match_ptr(omap_gpio_match), dev);
40410diff --git a/drivers/gpio/gpio-rcar.c b/drivers/gpio/gpio-rcar.c
40411index c49522e..9a7ee54 100644
40412--- a/drivers/gpio/gpio-rcar.c
40413+++ b/drivers/gpio/gpio-rcar.c
40414@@ -348,7 +348,7 @@ static int gpio_rcar_probe(struct platform_device *pdev)
40415 struct gpio_rcar_priv *p;
40416 struct resource *io, *irq;
40417 struct gpio_chip *gpio_chip;
40418- struct irq_chip *irq_chip;
40419+ irq_chip_no_const *irq_chip;
40420 struct device *dev = &pdev->dev;
40421 const char *name = dev_name(dev);
40422 int ret;
40423diff --git a/drivers/gpio/gpio-vr41xx.c b/drivers/gpio/gpio-vr41xx.c
40424index c1caa45..f0f97d2 100644
40425--- a/drivers/gpio/gpio-vr41xx.c
40426+++ b/drivers/gpio/gpio-vr41xx.c
40427@@ -224,7 +224,7 @@ static int giu_get_irq(unsigned int irq)
40428 printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
40429 maskl, pendl, maskh, pendh);
40430
40431- atomic_inc(&irq_err_count);
40432+ atomic_inc_unchecked(&irq_err_count);
40433
40434 return -EINVAL;
40435 }
40436diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
40437index 1ca9295..9f3d481 100644
40438--- a/drivers/gpio/gpiolib.c
40439+++ b/drivers/gpio/gpiolib.c
40440@@ -554,8 +554,10 @@ static void gpiochip_irqchip_remove(struct gpio_chip *gpiochip)
40441 }
40442
40443 if (gpiochip->irqchip) {
40444- gpiochip->irqchip->irq_request_resources = NULL;
40445- gpiochip->irqchip->irq_release_resources = NULL;
40446+ pax_open_kernel();
40447+ *(void **)&gpiochip->irqchip->irq_request_resources = NULL;
40448+ *(void **)&gpiochip->irqchip->irq_release_resources = NULL;
40449+ pax_close_kernel();
40450 gpiochip->irqchip = NULL;
40451 }
40452 }
40453@@ -621,8 +623,11 @@ int gpiochip_irqchip_add(struct gpio_chip *gpiochip,
40454 gpiochip->irqchip = NULL;
40455 return -EINVAL;
40456 }
40457- irqchip->irq_request_resources = gpiochip_irq_reqres;
40458- irqchip->irq_release_resources = gpiochip_irq_relres;
40459+
40460+ pax_open_kernel();
40461+ *(void **)&irqchip->irq_request_resources = gpiochip_irq_reqres;
40462+ *(void **)&irqchip->irq_release_resources = gpiochip_irq_relres;
40463+ pax_close_kernel();
40464
40465 /*
40466 * Prepare the mapping since the irqchip shall be orthogonal to
40467diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40468index 488f51d..301d462 100644
40469--- a/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40470+++ b/drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.h
40471@@ -118,7 +118,7 @@ struct device_queue_manager_ops {
40472 enum cache_policy alternate_policy,
40473 void __user *alternate_aperture_base,
40474 uint64_t alternate_aperture_size);
40475-};
40476+} __no_const;
40477
40478 /**
40479 * struct device_queue_manager
40480diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40481index 5940531..a75b0e5 100644
40482--- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40483+++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h
40484@@ -62,7 +62,7 @@ struct kernel_queue_ops {
40485
40486 void (*submit_packet)(struct kernel_queue *kq);
40487 void (*rollback_packet)(struct kernel_queue *kq);
40488-};
40489+} __no_const;
40490
40491 struct kernel_queue {
40492 struct kernel_queue_ops ops;
40493diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
40494index b6f076b..2918de2 100644
40495--- a/drivers/gpu/drm/drm_crtc.c
40496+++ b/drivers/gpu/drm/drm_crtc.c
40497@@ -4118,7 +4118,7 @@ int drm_mode_getproperty_ioctl(struct drm_device *dev,
40498 goto done;
40499 }
40500
40501- if (copy_to_user(&enum_ptr[copied].name,
40502+ if (copy_to_user(enum_ptr[copied].name,
40503 &prop_enum->name, DRM_PROP_NAME_LEN)) {
40504 ret = -EFAULT;
40505 goto done;
40506diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
40507index d512134..046f258 100644
40508--- a/drivers/gpu/drm/drm_drv.c
40509+++ b/drivers/gpu/drm/drm_drv.c
40510@@ -448,7 +448,7 @@ void drm_unplug_dev(struct drm_device *dev)
40511
40512 drm_device_set_unplugged(dev);
40513
40514- if (dev->open_count == 0) {
40515+ if (local_read(&dev->open_count) == 0) {
40516 drm_put_dev(dev);
40517 }
40518 mutex_unlock(&drm_global_mutex);
40519diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
40520index 076dd60..e4a4ba7 100644
40521--- a/drivers/gpu/drm/drm_fops.c
40522+++ b/drivers/gpu/drm/drm_fops.c
40523@@ -89,7 +89,7 @@ int drm_open(struct inode *inode, struct file *filp)
40524 return PTR_ERR(minor);
40525
40526 dev = minor->dev;
40527- if (!dev->open_count++)
40528+ if (local_inc_return(&dev->open_count) == 1)
40529 need_setup = 1;
40530
40531 /* share address_space across all char-devs of a single device */
40532@@ -106,7 +106,7 @@ int drm_open(struct inode *inode, struct file *filp)
40533 return 0;
40534
40535 err_undo:
40536- dev->open_count--;
40537+ local_dec(&dev->open_count);
40538 drm_minor_release(minor);
40539 return retcode;
40540 }
40541@@ -376,7 +376,7 @@ int drm_release(struct inode *inode, struct file *filp)
40542
40543 mutex_lock(&drm_global_mutex);
40544
40545- DRM_DEBUG("open_count = %d\n", dev->open_count);
40546+ DRM_DEBUG("open_count = %ld\n", local_read(&dev->open_count));
40547
40548 mutex_lock(&dev->struct_mutex);
40549 list_del(&file_priv->lhead);
40550@@ -389,10 +389,10 @@ int drm_release(struct inode *inode, struct file *filp)
40551 * Begin inline drm_release
40552 */
40553
40554- DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
40555+ DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %ld\n",
40556 task_pid_nr(current),
40557 (long)old_encode_dev(file_priv->minor->kdev->devt),
40558- dev->open_count);
40559+ local_read(&dev->open_count));
40560
40561 /* Release any auth tokens that might point to this file_priv,
40562 (do that under the drm_global_mutex) */
40563@@ -465,7 +465,7 @@ int drm_release(struct inode *inode, struct file *filp)
40564 * End inline drm_release
40565 */
40566
40567- if (!--dev->open_count) {
40568+ if (local_dec_and_test(&dev->open_count)) {
40569 retcode = drm_lastclose(dev);
40570 if (drm_device_is_unplugged(dev))
40571 drm_put_dev(dev);
40572diff --git a/drivers/gpu/drm/drm_global.c b/drivers/gpu/drm/drm_global.c
40573index 3d2e91c..d31c4c9 100644
40574--- a/drivers/gpu/drm/drm_global.c
40575+++ b/drivers/gpu/drm/drm_global.c
40576@@ -36,7 +36,7 @@
40577 struct drm_global_item {
40578 struct mutex mutex;
40579 void *object;
40580- int refcount;
40581+ atomic_t refcount;
40582 };
40583
40584 static struct drm_global_item glob[DRM_GLOBAL_NUM];
40585@@ -49,7 +49,7 @@ void drm_global_init(void)
40586 struct drm_global_item *item = &glob[i];
40587 mutex_init(&item->mutex);
40588 item->object = NULL;
40589- item->refcount = 0;
40590+ atomic_set(&item->refcount, 0);
40591 }
40592 }
40593
40594@@ -59,7 +59,7 @@ void drm_global_release(void)
40595 for (i = 0; i < DRM_GLOBAL_NUM; ++i) {
40596 struct drm_global_item *item = &glob[i];
40597 BUG_ON(item->object != NULL);
40598- BUG_ON(item->refcount != 0);
40599+ BUG_ON(atomic_read(&item->refcount) != 0);
40600 }
40601 }
40602
40603@@ -69,7 +69,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40604 struct drm_global_item *item = &glob[ref->global_type];
40605
40606 mutex_lock(&item->mutex);
40607- if (item->refcount == 0) {
40608+ if (atomic_read(&item->refcount) == 0) {
40609 item->object = kzalloc(ref->size, GFP_KERNEL);
40610 if (unlikely(item->object == NULL)) {
40611 ret = -ENOMEM;
40612@@ -82,7 +82,7 @@ int drm_global_item_ref(struct drm_global_reference *ref)
40613 goto out_err;
40614
40615 }
40616- ++item->refcount;
40617+ atomic_inc(&item->refcount);
40618 ref->object = item->object;
40619 mutex_unlock(&item->mutex);
40620 return 0;
40621@@ -98,9 +98,9 @@ void drm_global_item_unref(struct drm_global_reference *ref)
40622 struct drm_global_item *item = &glob[ref->global_type];
40623
40624 mutex_lock(&item->mutex);
40625- BUG_ON(item->refcount == 0);
40626+ BUG_ON(atomic_read(&item->refcount) == 0);
40627 BUG_ON(ref->object != item->object);
40628- if (--item->refcount == 0) {
40629+ if (atomic_dec_and_test(&item->refcount)) {
40630 ref->release(ref);
40631 item->object = NULL;
40632 }
40633diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
40634index f1b32f9..394f791 100644
40635--- a/drivers/gpu/drm/drm_info.c
40636+++ b/drivers/gpu/drm/drm_info.c
40637@@ -76,10 +76,13 @@ int drm_vm_info(struct seq_file *m, void *data)
40638 struct drm_local_map *map;
40639 struct drm_map_list *r_list;
40640
40641- /* Hardcoded from _DRM_FRAME_BUFFER,
40642- _DRM_REGISTERS, _DRM_SHM, _DRM_AGP, and
40643- _DRM_SCATTER_GATHER and _DRM_CONSISTENT */
40644- const char *types[] = { "FB", "REG", "SHM", "AGP", "SG", "PCI" };
40645+ static const char * const types[] = {
40646+ [_DRM_FRAME_BUFFER] = "FB",
40647+ [_DRM_REGISTERS] = "REG",
40648+ [_DRM_SHM] = "SHM",
40649+ [_DRM_AGP] = "AGP",
40650+ [_DRM_SCATTER_GATHER] = "SG",
40651+ [_DRM_CONSISTENT] = "PCI"};
40652 const char *type;
40653 int i;
40654
40655@@ -90,7 +93,7 @@ int drm_vm_info(struct seq_file *m, void *data)
40656 map = r_list->map;
40657 if (!map)
40658 continue;
40659- if (map->type < 0 || map->type > 5)
40660+ if (map->type >= ARRAY_SIZE(types))
40661 type = "??";
40662 else
40663 type = types[map->type];
40664diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c
40665index 2f4c4343..dd12cd2 100644
40666--- a/drivers/gpu/drm/drm_ioc32.c
40667+++ b/drivers/gpu/drm/drm_ioc32.c
40668@@ -457,7 +457,7 @@ static int compat_drm_infobufs(struct file *file, unsigned int cmd,
40669 request = compat_alloc_user_space(nbytes);
40670 if (!access_ok(VERIFY_WRITE, request, nbytes))
40671 return -EFAULT;
40672- list = (struct drm_buf_desc *) (request + 1);
40673+ list = (struct drm_buf_desc __user *) (request + 1);
40674
40675 if (__put_user(count, &request->count)
40676 || __put_user(list, &request->list))
40677@@ -518,7 +518,7 @@ static int compat_drm_mapbufs(struct file *file, unsigned int cmd,
40678 request = compat_alloc_user_space(nbytes);
40679 if (!access_ok(VERIFY_WRITE, request, nbytes))
40680 return -EFAULT;
40681- list = (struct drm_buf_pub *) (request + 1);
40682+ list = (struct drm_buf_pub __user *) (request + 1);
40683
40684 if (__put_user(count, &request->count)
40685 || __put_user(list, &request->list))
40686@@ -1016,7 +1016,7 @@ static int compat_drm_wait_vblank(struct file *file, unsigned int cmd,
40687 return 0;
40688 }
40689
40690-drm_ioctl_compat_t *drm_compat_ioctls[] = {
40691+drm_ioctl_compat_t drm_compat_ioctls[] = {
40692 [DRM_IOCTL_NR(DRM_IOCTL_VERSION32)] = compat_drm_version,
40693 [DRM_IOCTL_NR(DRM_IOCTL_GET_UNIQUE32)] = compat_drm_getunique,
40694 [DRM_IOCTL_NR(DRM_IOCTL_GET_MAP32)] = compat_drm_getmap,
40695@@ -1062,7 +1062,6 @@ drm_ioctl_compat_t *drm_compat_ioctls[] = {
40696 long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40697 {
40698 unsigned int nr = DRM_IOCTL_NR(cmd);
40699- drm_ioctl_compat_t *fn;
40700 int ret;
40701
40702 /* Assume that ioctls without an explicit compat routine will just
40703@@ -1072,10 +1071,8 @@ long drm_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40704 if (nr >= ARRAY_SIZE(drm_compat_ioctls))
40705 return drm_ioctl(filp, cmd, arg);
40706
40707- fn = drm_compat_ioctls[nr];
40708-
40709- if (fn != NULL)
40710- ret = (*fn) (filp, cmd, arg);
40711+ if (drm_compat_ioctls[nr] != NULL)
40712+ ret = (*drm_compat_ioctls[nr]) (filp, cmd, arg);
40713 else
40714 ret = drm_ioctl(filp, cmd, arg);
40715
40716diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
40717index 3785d66..1c489ef 100644
40718--- a/drivers/gpu/drm/drm_ioctl.c
40719+++ b/drivers/gpu/drm/drm_ioctl.c
40720@@ -655,7 +655,7 @@ long drm_ioctl(struct file *filp,
40721 struct drm_file *file_priv = filp->private_data;
40722 struct drm_device *dev;
40723 const struct drm_ioctl_desc *ioctl = NULL;
40724- drm_ioctl_t *func;
40725+ drm_ioctl_no_const_t func;
40726 unsigned int nr = DRM_IOCTL_NR(cmd);
40727 int retcode = -EINVAL;
40728 char stack_kdata[128];
40729diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
40730index d4813e0..6c1ab4d 100644
40731--- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
40732+++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c
40733@@ -825,10 +825,16 @@ void mdfld_dsi_dpi_mode_set(struct drm_encoder *encoder,
40734 u32 pipeconf_reg = PIPEACONF;
40735 u32 dspcntr_reg = DSPACNTR;
40736
40737- u32 pipeconf = dev_priv->pipeconf[pipe];
40738- u32 dspcntr = dev_priv->dspcntr[pipe];
40739+ u32 pipeconf;
40740+ u32 dspcntr;
40741 u32 mipi = MIPI_PORT_EN | PASS_FROM_SPHY_TO_AFE | SEL_FLOPPED_HSTX;
40742
40743+ if (pipe == -1)
40744+ return;
40745+
40746+ pipeconf = dev_priv->pipeconf[pipe];
40747+ dspcntr = dev_priv->dspcntr[pipe];
40748+
40749 if (pipe) {
40750 pipeconf_reg = PIPECCONF;
40751 dspcntr_reg = DSPCCNTR;
40752diff --git a/drivers/gpu/drm/i810/i810_drv.h b/drivers/gpu/drm/i810/i810_drv.h
40753index 93ec5dc..82acbaf 100644
40754--- a/drivers/gpu/drm/i810/i810_drv.h
40755+++ b/drivers/gpu/drm/i810/i810_drv.h
40756@@ -110,8 +110,8 @@ typedef struct drm_i810_private {
40757 int page_flipping;
40758
40759 wait_queue_head_t irq_queue;
40760- atomic_t irq_received;
40761- atomic_t irq_emitted;
40762+ atomic_unchecked_t irq_received;
40763+ atomic_unchecked_t irq_emitted;
40764
40765 int front_offset;
40766 } drm_i810_private_t;
40767diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
40768index 1a46787..0ff2ff4 100644
40769--- a/drivers/gpu/drm/i915/i915_dma.c
40770+++ b/drivers/gpu/drm/i915/i915_dma.c
40771@@ -362,7 +362,7 @@ static bool i915_switcheroo_can_switch(struct pci_dev *pdev)
40772 * locking inversion with the driver load path. And the access here is
40773 * completely racy anyway. So don't bother with locking for now.
40774 */
40775- return dev->open_count == 0;
40776+ return local_read(&dev->open_count) == 0;
40777 }
40778
40779 static const struct vga_switcheroo_client_ops i915_switcheroo_ops = {
40780diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40781index 38a7425..5322b16 100644
40782--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40783+++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
40784@@ -872,12 +872,12 @@ i915_gem_check_execbuffer(struct drm_i915_gem_execbuffer2 *exec)
40785 static int
40786 validate_exec_list(struct drm_device *dev,
40787 struct drm_i915_gem_exec_object2 *exec,
40788- int count)
40789+ unsigned int count)
40790 {
40791 unsigned relocs_total = 0;
40792 unsigned relocs_max = UINT_MAX / sizeof(struct drm_i915_gem_relocation_entry);
40793 unsigned invalid_flags;
40794- int i;
40795+ unsigned int i;
40796
40797 invalid_flags = __EXEC_OBJECT_UNKNOWN_FLAGS;
40798 if (USES_FULL_PPGTT(dev))
40799diff --git a/drivers/gpu/drm/i915/i915_ioc32.c b/drivers/gpu/drm/i915/i915_ioc32.c
40800index 176de63..b50b66a 100644
40801--- a/drivers/gpu/drm/i915/i915_ioc32.c
40802+++ b/drivers/gpu/drm/i915/i915_ioc32.c
40803@@ -62,7 +62,7 @@ static int compat_i915_batchbuffer(struct file *file, unsigned int cmd,
40804 || __put_user(batchbuffer32.DR4, &batchbuffer->DR4)
40805 || __put_user(batchbuffer32.num_cliprects,
40806 &batchbuffer->num_cliprects)
40807- || __put_user((int __user *)(unsigned long)batchbuffer32.cliprects,
40808+ || __put_user((struct drm_clip_rect __user *)(unsigned long)batchbuffer32.cliprects,
40809 &batchbuffer->cliprects))
40810 return -EFAULT;
40811
40812@@ -91,13 +91,13 @@ static int compat_i915_cmdbuffer(struct file *file, unsigned int cmd,
40813
40814 cmdbuffer = compat_alloc_user_space(sizeof(*cmdbuffer));
40815 if (!access_ok(VERIFY_WRITE, cmdbuffer, sizeof(*cmdbuffer))
40816- || __put_user((int __user *)(unsigned long)cmdbuffer32.buf,
40817+ || __put_user((char __user *)(unsigned long)cmdbuffer32.buf,
40818 &cmdbuffer->buf)
40819 || __put_user(cmdbuffer32.sz, &cmdbuffer->sz)
40820 || __put_user(cmdbuffer32.DR1, &cmdbuffer->DR1)
40821 || __put_user(cmdbuffer32.DR4, &cmdbuffer->DR4)
40822 || __put_user(cmdbuffer32.num_cliprects, &cmdbuffer->num_cliprects)
40823- || __put_user((int __user *)(unsigned long)cmdbuffer32.cliprects,
40824+ || __put_user((struct drm_clip_rect __user *)(unsigned long)cmdbuffer32.cliprects,
40825 &cmdbuffer->cliprects))
40826 return -EFAULT;
40827
40828@@ -181,7 +181,7 @@ static int compat_i915_alloc(struct file *file, unsigned int cmd,
40829 (unsigned long)request);
40830 }
40831
40832-static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40833+static drm_ioctl_compat_t i915_compat_ioctls[] = {
40834 [DRM_I915_BATCHBUFFER] = compat_i915_batchbuffer,
40835 [DRM_I915_CMDBUFFER] = compat_i915_cmdbuffer,
40836 [DRM_I915_GETPARAM] = compat_i915_getparam,
40837@@ -201,17 +201,13 @@ static drm_ioctl_compat_t *i915_compat_ioctls[] = {
40838 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40839 {
40840 unsigned int nr = DRM_IOCTL_NR(cmd);
40841- drm_ioctl_compat_t *fn = NULL;
40842 int ret;
40843
40844 if (nr < DRM_COMMAND_BASE)
40845 return drm_compat_ioctl(filp, cmd, arg);
40846
40847- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls))
40848- fn = i915_compat_ioctls[nr - DRM_COMMAND_BASE];
40849-
40850- if (fn != NULL)
40851- ret = (*fn) (filp, cmd, arg);
40852+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(i915_compat_ioctls) && i915_compat_ioctls[nr - DRM_COMMAND_BASE])
40853+ ret = (*i915_compat_ioctls[nr - DRM_COMMAND_BASE])(filp, cmd, arg);
40854 else
40855 ret = drm_ioctl(filp, cmd, arg);
40856
40857diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
40858index f75173c..f283e45 100644
40859--- a/drivers/gpu/drm/i915/intel_display.c
40860+++ b/drivers/gpu/drm/i915/intel_display.c
40861@@ -13056,13 +13056,13 @@ struct intel_quirk {
40862 int subsystem_vendor;
40863 int subsystem_device;
40864 void (*hook)(struct drm_device *dev);
40865-};
40866+} __do_const;
40867
40868 /* For systems that don't have a meaningful PCI subdevice/subvendor ID */
40869 struct intel_dmi_quirk {
40870 void (*hook)(struct drm_device *dev);
40871 const struct dmi_system_id (*dmi_id_list)[];
40872-};
40873+} __do_const;
40874
40875 static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40876 {
40877@@ -13070,18 +13070,20 @@ static int intel_dmi_reverse_brightness(const struct dmi_system_id *id)
40878 return 1;
40879 }
40880
40881-static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40882+static const struct dmi_system_id intel_dmi_quirks_table[] = {
40883 {
40884- .dmi_id_list = &(const struct dmi_system_id[]) {
40885- {
40886- .callback = intel_dmi_reverse_brightness,
40887- .ident = "NCR Corporation",
40888- .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40889- DMI_MATCH(DMI_PRODUCT_NAME, ""),
40890- },
40891- },
40892- { } /* terminating entry */
40893+ .callback = intel_dmi_reverse_brightness,
40894+ .ident = "NCR Corporation",
40895+ .matches = {DMI_MATCH(DMI_SYS_VENDOR, "NCR Corporation"),
40896+ DMI_MATCH(DMI_PRODUCT_NAME, ""),
40897 },
40898+ },
40899+ { } /* terminating entry */
40900+};
40901+
40902+static const struct intel_dmi_quirk intel_dmi_quirks[] = {
40903+ {
40904+ .dmi_id_list = &intel_dmi_quirks_table,
40905 .hook = quirk_invert_brightness,
40906 },
40907 };
40908diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
40909index a002f53..0d60514 100644
40910--- a/drivers/gpu/drm/imx/imx-drm-core.c
40911+++ b/drivers/gpu/drm/imx/imx-drm-core.c
40912@@ -355,7 +355,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
40913 if (imxdrm->pipes >= MAX_CRTC)
40914 return -EINVAL;
40915
40916- if (imxdrm->drm->open_count)
40917+ if (local_read(&imxdrm->drm->open_count))
40918 return -EBUSY;
40919
40920 imx_drm_crtc = kzalloc(sizeof(*imx_drm_crtc), GFP_KERNEL);
40921diff --git a/drivers/gpu/drm/mga/mga_drv.h b/drivers/gpu/drm/mga/mga_drv.h
40922index b4a20149..219ab78 100644
40923--- a/drivers/gpu/drm/mga/mga_drv.h
40924+++ b/drivers/gpu/drm/mga/mga_drv.h
40925@@ -122,9 +122,9 @@ typedef struct drm_mga_private {
40926 u32 clear_cmd;
40927 u32 maccess;
40928
40929- atomic_t vbl_received; /**< Number of vblanks received. */
40930+ atomic_unchecked_t vbl_received; /**< Number of vblanks received. */
40931 wait_queue_head_t fence_queue;
40932- atomic_t last_fence_retired;
40933+ atomic_unchecked_t last_fence_retired;
40934 u32 next_fence_to_post;
40935
40936 unsigned int fb_cpp;
40937diff --git a/drivers/gpu/drm/mga/mga_ioc32.c b/drivers/gpu/drm/mga/mga_ioc32.c
40938index 729bfd5..14bae78 100644
40939--- a/drivers/gpu/drm/mga/mga_ioc32.c
40940+++ b/drivers/gpu/drm/mga/mga_ioc32.c
40941@@ -190,7 +190,7 @@ static int compat_mga_dma_bootstrap(struct file *file, unsigned int cmd,
40942 return 0;
40943 }
40944
40945-drm_ioctl_compat_t *mga_compat_ioctls[] = {
40946+drm_ioctl_compat_t mga_compat_ioctls[] = {
40947 [DRM_MGA_INIT] = compat_mga_init,
40948 [DRM_MGA_GETPARAM] = compat_mga_getparam,
40949 [DRM_MGA_DMA_BOOTSTRAP] = compat_mga_dma_bootstrap,
40950@@ -208,17 +208,13 @@ drm_ioctl_compat_t *mga_compat_ioctls[] = {
40951 long mga_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
40952 {
40953 unsigned int nr = DRM_IOCTL_NR(cmd);
40954- drm_ioctl_compat_t *fn = NULL;
40955 int ret;
40956
40957 if (nr < DRM_COMMAND_BASE)
40958 return drm_compat_ioctl(filp, cmd, arg);
40959
40960- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls))
40961- fn = mga_compat_ioctls[nr - DRM_COMMAND_BASE];
40962-
40963- if (fn != NULL)
40964- ret = (*fn) (filp, cmd, arg);
40965+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(mga_compat_ioctls) && mga_compat_ioctls[nr - DRM_COMMAND_BASE])
40966+ ret = (*mga_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
40967 else
40968 ret = drm_ioctl(filp, cmd, arg);
40969
40970diff --git a/drivers/gpu/drm/mga/mga_irq.c b/drivers/gpu/drm/mga/mga_irq.c
40971index 1b071b8..de8601a 100644
40972--- a/drivers/gpu/drm/mga/mga_irq.c
40973+++ b/drivers/gpu/drm/mga/mga_irq.c
40974@@ -43,7 +43,7 @@ u32 mga_get_vblank_counter(struct drm_device *dev, int crtc)
40975 if (crtc != 0)
40976 return 0;
40977
40978- return atomic_read(&dev_priv->vbl_received);
40979+ return atomic_read_unchecked(&dev_priv->vbl_received);
40980 }
40981
40982
40983@@ -59,7 +59,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40984 /* VBLANK interrupt */
40985 if (status & MGA_VLINEPEN) {
40986 MGA_WRITE(MGA_ICLEAR, MGA_VLINEICLR);
40987- atomic_inc(&dev_priv->vbl_received);
40988+ atomic_inc_unchecked(&dev_priv->vbl_received);
40989 drm_handle_vblank(dev, 0);
40990 handled = 1;
40991 }
40992@@ -78,7 +78,7 @@ irqreturn_t mga_driver_irq_handler(int irq, void *arg)
40993 if ((prim_start & ~0x03) != (prim_end & ~0x03))
40994 MGA_WRITE(MGA_PRIMEND, prim_end);
40995
40996- atomic_inc(&dev_priv->last_fence_retired);
40997+ atomic_inc_unchecked(&dev_priv->last_fence_retired);
40998 wake_up(&dev_priv->fence_queue);
40999 handled = 1;
41000 }
41001@@ -129,7 +129,7 @@ int mga_driver_fence_wait(struct drm_device *dev, unsigned int *sequence)
41002 * using fences.
41003 */
41004 DRM_WAIT_ON(ret, dev_priv->fence_queue, 3 * HZ,
41005- (((cur_fence = atomic_read(&dev_priv->last_fence_retired))
41006+ (((cur_fence = atomic_read_unchecked(&dev_priv->last_fence_retired))
41007 - *sequence) <= (1 << 23)));
41008
41009 *sequence = cur_fence;
41010diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c
41011index 0190b69..60c3eaf 100644
41012--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
41013+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
41014@@ -963,7 +963,7 @@ static int parse_bit_tmds_tbl_entry(struct drm_device *dev, struct nvbios *bios,
41015 struct bit_table {
41016 const char id;
41017 int (* const parse_fn)(struct drm_device *, struct nvbios *, struct bit_entry *);
41018-};
41019+} __no_const;
41020
41021 #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
41022
41023diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.h b/drivers/gpu/drm/nouveau/nouveau_drm.h
41024index fc68f09..0511d71 100644
41025--- a/drivers/gpu/drm/nouveau/nouveau_drm.h
41026+++ b/drivers/gpu/drm/nouveau/nouveau_drm.h
41027@@ -121,7 +121,6 @@ struct nouveau_drm {
41028 struct drm_global_reference mem_global_ref;
41029 struct ttm_bo_global_ref bo_global_ref;
41030 struct ttm_bo_device bdev;
41031- atomic_t validate_sequence;
41032 int (*move)(struct nouveau_channel *,
41033 struct ttm_buffer_object *,
41034 struct ttm_mem_reg *, struct ttm_mem_reg *);
41035diff --git a/drivers/gpu/drm/nouveau/nouveau_ioc32.c b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41036index 462679a..88e32a7 100644
41037--- a/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41038+++ b/drivers/gpu/drm/nouveau/nouveau_ioc32.c
41039@@ -50,7 +50,7 @@ long nouveau_compat_ioctl(struct file *filp, unsigned int cmd,
41040 unsigned long arg)
41041 {
41042 unsigned int nr = DRM_IOCTL_NR(cmd);
41043- drm_ioctl_compat_t *fn = NULL;
41044+ drm_ioctl_compat_t fn = NULL;
41045 int ret;
41046
41047 if (nr < DRM_COMMAND_BASE)
41048diff --git a/drivers/gpu/drm/nouveau/nouveau_ttm.c b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41049index 273e501..3b6c0a2 100644
41050--- a/drivers/gpu/drm/nouveau/nouveau_ttm.c
41051+++ b/drivers/gpu/drm/nouveau/nouveau_ttm.c
41052@@ -127,11 +127,11 @@ nouveau_vram_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41053 }
41054
41055 const struct ttm_mem_type_manager_func nouveau_vram_manager = {
41056- nouveau_vram_manager_init,
41057- nouveau_vram_manager_fini,
41058- nouveau_vram_manager_new,
41059- nouveau_vram_manager_del,
41060- nouveau_vram_manager_debug
41061+ .init = nouveau_vram_manager_init,
41062+ .takedown = nouveau_vram_manager_fini,
41063+ .get_node = nouveau_vram_manager_new,
41064+ .put_node = nouveau_vram_manager_del,
41065+ .debug = nouveau_vram_manager_debug
41066 };
41067
41068 static int
41069@@ -195,11 +195,11 @@ nouveau_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41070 }
41071
41072 const struct ttm_mem_type_manager_func nouveau_gart_manager = {
41073- nouveau_gart_manager_init,
41074- nouveau_gart_manager_fini,
41075- nouveau_gart_manager_new,
41076- nouveau_gart_manager_del,
41077- nouveau_gart_manager_debug
41078+ .init = nouveau_gart_manager_init,
41079+ .takedown = nouveau_gart_manager_fini,
41080+ .get_node = nouveau_gart_manager_new,
41081+ .put_node = nouveau_gart_manager_del,
41082+ .debug = nouveau_gart_manager_debug
41083 };
41084
41085 /*XXX*/
41086@@ -268,11 +268,11 @@ nv04_gart_manager_debug(struct ttm_mem_type_manager *man, const char *prefix)
41087 }
41088
41089 const struct ttm_mem_type_manager_func nv04_gart_manager = {
41090- nv04_gart_manager_init,
41091- nv04_gart_manager_fini,
41092- nv04_gart_manager_new,
41093- nv04_gart_manager_del,
41094- nv04_gart_manager_debug
41095+ .init = nv04_gart_manager_init,
41096+ .takedown = nv04_gart_manager_fini,
41097+ .get_node = nv04_gart_manager_new,
41098+ .put_node = nv04_gart_manager_del,
41099+ .debug = nv04_gart_manager_debug
41100 };
41101
41102 int
41103diff --git a/drivers/gpu/drm/nouveau/nouveau_vga.c b/drivers/gpu/drm/nouveau/nouveau_vga.c
41104index c7592ec..dd45ebc 100644
41105--- a/drivers/gpu/drm/nouveau/nouveau_vga.c
41106+++ b/drivers/gpu/drm/nouveau/nouveau_vga.c
41107@@ -72,7 +72,7 @@ nouveau_switcheroo_can_switch(struct pci_dev *pdev)
41108 * locking inversion with the driver load path. And the access here is
41109 * completely racy anyway. So don't bother with locking for now.
41110 */
41111- return dev->open_count == 0;
41112+ return local_read(&dev->open_count) == 0;
41113 }
41114
41115 static const struct vga_switcheroo_client_ops
41116diff --git a/drivers/gpu/drm/qxl/qxl_cmd.c b/drivers/gpu/drm/qxl/qxl_cmd.c
41117index 9782364..89bd954 100644
41118--- a/drivers/gpu/drm/qxl/qxl_cmd.c
41119+++ b/drivers/gpu/drm/qxl/qxl_cmd.c
41120@@ -285,27 +285,27 @@ static int wait_for_io_cmd_user(struct qxl_device *qdev, uint8_t val, long port,
41121 int ret;
41122
41123 mutex_lock(&qdev->async_io_mutex);
41124- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41125+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41126 if (qdev->last_sent_io_cmd > irq_num) {
41127 if (intr)
41128 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41129- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41130+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41131 else
41132 ret = wait_event_timeout(qdev->io_cmd_event,
41133- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41134+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41135 /* 0 is timeout, just bail the "hw" has gone away */
41136 if (ret <= 0)
41137 goto out;
41138- irq_num = atomic_read(&qdev->irq_received_io_cmd);
41139+ irq_num = atomic_read_unchecked(&qdev->irq_received_io_cmd);
41140 }
41141 outb(val, addr);
41142 qdev->last_sent_io_cmd = irq_num + 1;
41143 if (intr)
41144 ret = wait_event_interruptible_timeout(qdev->io_cmd_event,
41145- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41146+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41147 else
41148 ret = wait_event_timeout(qdev->io_cmd_event,
41149- atomic_read(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41150+ atomic_read_unchecked(&qdev->irq_received_io_cmd) > irq_num, 5*HZ);
41151 out:
41152 if (ret > 0)
41153 ret = 0;
41154diff --git a/drivers/gpu/drm/qxl/qxl_debugfs.c b/drivers/gpu/drm/qxl/qxl_debugfs.c
41155index 6911b8c..89d6867 100644
41156--- a/drivers/gpu/drm/qxl/qxl_debugfs.c
41157+++ b/drivers/gpu/drm/qxl/qxl_debugfs.c
41158@@ -42,10 +42,10 @@ qxl_debugfs_irq_received(struct seq_file *m, void *data)
41159 struct drm_info_node *node = (struct drm_info_node *) m->private;
41160 struct qxl_device *qdev = node->minor->dev->dev_private;
41161
41162- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received));
41163- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_display));
41164- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_cursor));
41165- seq_printf(m, "%d\n", atomic_read(&qdev->irq_received_io_cmd));
41166+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received));
41167+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_display));
41168+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_cursor));
41169+ seq_printf(m, "%d\n", atomic_read_unchecked(&qdev->irq_received_io_cmd));
41170 seq_printf(m, "%d\n", qdev->irq_received_error);
41171 return 0;
41172 }
41173diff --git a/drivers/gpu/drm/qxl/qxl_drv.h b/drivers/gpu/drm/qxl/qxl_drv.h
41174index 7c6cafe..460f542 100644
41175--- a/drivers/gpu/drm/qxl/qxl_drv.h
41176+++ b/drivers/gpu/drm/qxl/qxl_drv.h
41177@@ -290,10 +290,10 @@ struct qxl_device {
41178 unsigned int last_sent_io_cmd;
41179
41180 /* interrupt handling */
41181- atomic_t irq_received;
41182- atomic_t irq_received_display;
41183- atomic_t irq_received_cursor;
41184- atomic_t irq_received_io_cmd;
41185+ atomic_unchecked_t irq_received;
41186+ atomic_unchecked_t irq_received_display;
41187+ atomic_unchecked_t irq_received_cursor;
41188+ atomic_unchecked_t irq_received_io_cmd;
41189 unsigned irq_received_error;
41190 wait_queue_head_t display_event;
41191 wait_queue_head_t cursor_event;
41192diff --git a/drivers/gpu/drm/qxl/qxl_ioctl.c b/drivers/gpu/drm/qxl/qxl_ioctl.c
41193index b110883..dd06418 100644
41194--- a/drivers/gpu/drm/qxl/qxl_ioctl.c
41195+++ b/drivers/gpu/drm/qxl/qxl_ioctl.c
41196@@ -181,7 +181,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41197
41198 /* TODO copy slow path code from i915 */
41199 fb_cmd = qxl_bo_kmap_atomic_page(qdev, cmd_bo, (release->release_offset & PAGE_SIZE));
41200- 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);
41201+ 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);
41202
41203 {
41204 struct qxl_drawable *draw = fb_cmd;
41205@@ -201,7 +201,7 @@ static int qxl_process_single_command(struct qxl_device *qdev,
41206 struct drm_qxl_reloc reloc;
41207
41208 if (copy_from_user(&reloc,
41209- &((struct drm_qxl_reloc *)(uintptr_t)cmd->relocs)[i],
41210+ &((struct drm_qxl_reloc __force_user *)(uintptr_t)cmd->relocs)[i],
41211 sizeof(reloc))) {
41212 ret = -EFAULT;
41213 goto out_free_bos;
41214@@ -294,10 +294,10 @@ static int qxl_execbuffer_ioctl(struct drm_device *dev, void *data,
41215
41216 for (cmd_num = 0; cmd_num < execbuffer->commands_num; ++cmd_num) {
41217
41218- struct drm_qxl_command *commands =
41219- (struct drm_qxl_command *)(uintptr_t)execbuffer->commands;
41220+ struct drm_qxl_command __user *commands =
41221+ (struct drm_qxl_command __user *)(uintptr_t)execbuffer->commands;
41222
41223- if (copy_from_user(&user_cmd, &commands[cmd_num],
41224+ if (copy_from_user(&user_cmd, (struct drm_qxl_command __force_user *)&commands[cmd_num],
41225 sizeof(user_cmd)))
41226 return -EFAULT;
41227
41228diff --git a/drivers/gpu/drm/qxl/qxl_irq.c b/drivers/gpu/drm/qxl/qxl_irq.c
41229index 0bf1e20..42a7310 100644
41230--- a/drivers/gpu/drm/qxl/qxl_irq.c
41231+++ b/drivers/gpu/drm/qxl/qxl_irq.c
41232@@ -36,19 +36,19 @@ irqreturn_t qxl_irq_handler(int irq, void *arg)
41233 if (!pending)
41234 return IRQ_NONE;
41235
41236- atomic_inc(&qdev->irq_received);
41237+ atomic_inc_unchecked(&qdev->irq_received);
41238
41239 if (pending & QXL_INTERRUPT_DISPLAY) {
41240- atomic_inc(&qdev->irq_received_display);
41241+ atomic_inc_unchecked(&qdev->irq_received_display);
41242 wake_up_all(&qdev->display_event);
41243 qxl_queue_garbage_collect(qdev, false);
41244 }
41245 if (pending & QXL_INTERRUPT_CURSOR) {
41246- atomic_inc(&qdev->irq_received_cursor);
41247+ atomic_inc_unchecked(&qdev->irq_received_cursor);
41248 wake_up_all(&qdev->cursor_event);
41249 }
41250 if (pending & QXL_INTERRUPT_IO_CMD) {
41251- atomic_inc(&qdev->irq_received_io_cmd);
41252+ atomic_inc_unchecked(&qdev->irq_received_io_cmd);
41253 wake_up_all(&qdev->io_cmd_event);
41254 }
41255 if (pending & QXL_INTERRUPT_ERROR) {
41256@@ -85,10 +85,10 @@ int qxl_irq_init(struct qxl_device *qdev)
41257 init_waitqueue_head(&qdev->io_cmd_event);
41258 INIT_WORK(&qdev->client_monitors_config_work,
41259 qxl_client_monitors_config_work_func);
41260- atomic_set(&qdev->irq_received, 0);
41261- atomic_set(&qdev->irq_received_display, 0);
41262- atomic_set(&qdev->irq_received_cursor, 0);
41263- atomic_set(&qdev->irq_received_io_cmd, 0);
41264+ atomic_set_unchecked(&qdev->irq_received, 0);
41265+ atomic_set_unchecked(&qdev->irq_received_display, 0);
41266+ atomic_set_unchecked(&qdev->irq_received_cursor, 0);
41267+ atomic_set_unchecked(&qdev->irq_received_io_cmd, 0);
41268 qdev->irq_received_error = 0;
41269 ret = drm_irq_install(qdev->ddev, qdev->ddev->pdev->irq);
41270 qdev->ram_header->int_mask = QXL_INTERRUPT_MASK;
41271diff --git a/drivers/gpu/drm/qxl/qxl_ttm.c b/drivers/gpu/drm/qxl/qxl_ttm.c
41272index 0cbc4c9..0e46686 100644
41273--- a/drivers/gpu/drm/qxl/qxl_ttm.c
41274+++ b/drivers/gpu/drm/qxl/qxl_ttm.c
41275@@ -103,7 +103,7 @@ static void qxl_ttm_global_fini(struct qxl_device *qdev)
41276 }
41277 }
41278
41279-static struct vm_operations_struct qxl_ttm_vm_ops;
41280+static vm_operations_struct_no_const qxl_ttm_vm_ops __read_only;
41281 static const struct vm_operations_struct *ttm_vm_ops;
41282
41283 static int qxl_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41284@@ -145,8 +145,10 @@ int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
41285 return r;
41286 if (unlikely(ttm_vm_ops == NULL)) {
41287 ttm_vm_ops = vma->vm_ops;
41288+ pax_open_kernel();
41289 qxl_ttm_vm_ops = *ttm_vm_ops;
41290 qxl_ttm_vm_ops.fault = &qxl_ttm_fault;
41291+ pax_close_kernel();
41292 }
41293 vma->vm_ops = &qxl_ttm_vm_ops;
41294 return 0;
41295@@ -464,25 +466,23 @@ static int qxl_mm_dump_table(struct seq_file *m, void *data)
41296 static int qxl_ttm_debugfs_init(struct qxl_device *qdev)
41297 {
41298 #if defined(CONFIG_DEBUG_FS)
41299- static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES];
41300- static char qxl_mem_types_names[QXL_DEBUGFS_MEM_TYPES][32];
41301- unsigned i;
41302+ static struct drm_info_list qxl_mem_types_list[QXL_DEBUGFS_MEM_TYPES] = {
41303+ {
41304+ .name = "qxl_mem_mm",
41305+ .show = &qxl_mm_dump_table,
41306+ },
41307+ {
41308+ .name = "qxl_surf_mm",
41309+ .show = &qxl_mm_dump_table,
41310+ }
41311+ };
41312
41313- for (i = 0; i < QXL_DEBUGFS_MEM_TYPES; i++) {
41314- if (i == 0)
41315- sprintf(qxl_mem_types_names[i], "qxl_mem_mm");
41316- else
41317- sprintf(qxl_mem_types_names[i], "qxl_surf_mm");
41318- qxl_mem_types_list[i].name = qxl_mem_types_names[i];
41319- qxl_mem_types_list[i].show = &qxl_mm_dump_table;
41320- qxl_mem_types_list[i].driver_features = 0;
41321- if (i == 0)
41322- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41323- else
41324- qxl_mem_types_list[i].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41325+ pax_open_kernel();
41326+ *(void **)&qxl_mem_types_list[0].data = qdev->mman.bdev.man[TTM_PL_VRAM].priv;
41327+ *(void **)&qxl_mem_types_list[1].data = qdev->mman.bdev.man[TTM_PL_PRIV0].priv;
41328+ pax_close_kernel();
41329
41330- }
41331- return qxl_debugfs_add_files(qdev, qxl_mem_types_list, i);
41332+ return qxl_debugfs_add_files(qdev, qxl_mem_types_list, QXL_DEBUGFS_MEM_TYPES);
41333 #else
41334 return 0;
41335 #endif
41336diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
41337index 2c45ac9..5d740f8 100644
41338--- a/drivers/gpu/drm/r128/r128_cce.c
41339+++ b/drivers/gpu/drm/r128/r128_cce.c
41340@@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_device *dev, drm_r128_init_t *init)
41341
41342 /* GH: Simple idle check.
41343 */
41344- atomic_set(&dev_priv->idle_count, 0);
41345+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41346
41347 /* We don't support anything other than bus-mastering ring mode,
41348 * but the ring can be in either AGP or PCI space for the ring
41349diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
41350index 723e5d6..102dbaf 100644
41351--- a/drivers/gpu/drm/r128/r128_drv.h
41352+++ b/drivers/gpu/drm/r128/r128_drv.h
41353@@ -93,14 +93,14 @@ typedef struct drm_r128_private {
41354 int is_pci;
41355 unsigned long cce_buffers_offset;
41356
41357- atomic_t idle_count;
41358+ atomic_unchecked_t idle_count;
41359
41360 int page_flipping;
41361 int current_page;
41362 u32 crtc_offset;
41363 u32 crtc_offset_cntl;
41364
41365- atomic_t vbl_received;
41366+ atomic_unchecked_t vbl_received;
41367
41368 u32 color_fmt;
41369 unsigned int front_offset;
41370diff --git a/drivers/gpu/drm/r128/r128_ioc32.c b/drivers/gpu/drm/r128/r128_ioc32.c
41371index 663f38c..ec159a1 100644
41372--- a/drivers/gpu/drm/r128/r128_ioc32.c
41373+++ b/drivers/gpu/drm/r128/r128_ioc32.c
41374@@ -178,7 +178,7 @@ static int compat_r128_getparam(struct file *file, unsigned int cmd,
41375 return drm_ioctl(file, DRM_IOCTL_R128_GETPARAM, (unsigned long)getparam);
41376 }
41377
41378-drm_ioctl_compat_t *r128_compat_ioctls[] = {
41379+drm_ioctl_compat_t r128_compat_ioctls[] = {
41380 [DRM_R128_INIT] = compat_r128_init,
41381 [DRM_R128_DEPTH] = compat_r128_depth,
41382 [DRM_R128_STIPPLE] = compat_r128_stipple,
41383@@ -197,17 +197,13 @@ drm_ioctl_compat_t *r128_compat_ioctls[] = {
41384 long r128_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41385 {
41386 unsigned int nr = DRM_IOCTL_NR(cmd);
41387- drm_ioctl_compat_t *fn = NULL;
41388 int ret;
41389
41390 if (nr < DRM_COMMAND_BASE)
41391 return drm_compat_ioctl(filp, cmd, arg);
41392
41393- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls))
41394- fn = r128_compat_ioctls[nr - DRM_COMMAND_BASE];
41395-
41396- if (fn != NULL)
41397- ret = (*fn) (filp, cmd, arg);
41398+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(r128_compat_ioctls) && r128_compat_ioctls[nr - DRM_COMMAND_BASE])
41399+ ret = (*r128_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41400 else
41401 ret = drm_ioctl(filp, cmd, arg);
41402
41403diff --git a/drivers/gpu/drm/r128/r128_irq.c b/drivers/gpu/drm/r128/r128_irq.c
41404index c2ae496..30b5993 100644
41405--- a/drivers/gpu/drm/r128/r128_irq.c
41406+++ b/drivers/gpu/drm/r128/r128_irq.c
41407@@ -41,7 +41,7 @@ u32 r128_get_vblank_counter(struct drm_device *dev, int crtc)
41408 if (crtc != 0)
41409 return 0;
41410
41411- return atomic_read(&dev_priv->vbl_received);
41412+ return atomic_read_unchecked(&dev_priv->vbl_received);
41413 }
41414
41415 irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41416@@ -55,7 +55,7 @@ irqreturn_t r128_driver_irq_handler(int irq, void *arg)
41417 /* VBLANK interrupt */
41418 if (status & R128_CRTC_VBLANK_INT) {
41419 R128_WRITE(R128_GEN_INT_STATUS, R128_CRTC_VBLANK_INT_AK);
41420- atomic_inc(&dev_priv->vbl_received);
41421+ atomic_inc_unchecked(&dev_priv->vbl_received);
41422 drm_handle_vblank(dev, 0);
41423 return IRQ_HANDLED;
41424 }
41425diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
41426index 8fd2d9f..18c9660 100644
41427--- a/drivers/gpu/drm/r128/r128_state.c
41428+++ b/drivers/gpu/drm/r128/r128_state.c
41429@@ -320,10 +320,10 @@ static void r128_clear_box(drm_r128_private_t *dev_priv,
41430
41431 static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
41432 {
41433- if (atomic_read(&dev_priv->idle_count) == 0)
41434+ if (atomic_read_unchecked(&dev_priv->idle_count) == 0)
41435 r128_clear_box(dev_priv, 64, 4, 8, 8, 0, 255, 0);
41436 else
41437- atomic_set(&dev_priv->idle_count, 0);
41438+ atomic_set_unchecked(&dev_priv->idle_count, 0);
41439 }
41440
41441 #endif
41442diff --git a/drivers/gpu/drm/radeon/mkregtable.c b/drivers/gpu/drm/radeon/mkregtable.c
41443index b928c17..e5d9400 100644
41444--- a/drivers/gpu/drm/radeon/mkregtable.c
41445+++ b/drivers/gpu/drm/radeon/mkregtable.c
41446@@ -624,14 +624,14 @@ static int parser_auth(struct table *t, const char *filename)
41447 regex_t mask_rex;
41448 regmatch_t match[4];
41449 char buf[1024];
41450- size_t end;
41451+ long end;
41452 int len;
41453 int done = 0;
41454 int r;
41455 unsigned o;
41456 struct offset *offset;
41457 char last_reg_s[10];
41458- int last_reg;
41459+ unsigned long last_reg;
41460
41461 if (regcomp
41462 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
41463diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c
41464index bd7519f..e1c2cd95 100644
41465--- a/drivers/gpu/drm/radeon/radeon_device.c
41466+++ b/drivers/gpu/drm/radeon/radeon_device.c
41467@@ -1247,7 +1247,7 @@ static bool radeon_switcheroo_can_switch(struct pci_dev *pdev)
41468 * locking inversion with the driver load path. And the access here is
41469 * completely racy anyway. So don't bother with locking for now.
41470 */
41471- return dev->open_count == 0;
41472+ return local_read(&dev->open_count) == 0;
41473 }
41474
41475 static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {
41476diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h
41477index 46bd393..6ae4719 100644
41478--- a/drivers/gpu/drm/radeon/radeon_drv.h
41479+++ b/drivers/gpu/drm/radeon/radeon_drv.h
41480@@ -264,7 +264,7 @@ typedef struct drm_radeon_private {
41481
41482 /* SW interrupt */
41483 wait_queue_head_t swi_queue;
41484- atomic_t swi_emitted;
41485+ atomic_unchecked_t swi_emitted;
41486 int vblank_crtc;
41487 uint32_t irq_enable_reg;
41488 uint32_t r500_disp_irq_reg;
41489diff --git a/drivers/gpu/drm/radeon/radeon_ioc32.c b/drivers/gpu/drm/radeon/radeon_ioc32.c
41490index 0b98ea1..a3c770f 100644
41491--- a/drivers/gpu/drm/radeon/radeon_ioc32.c
41492+++ b/drivers/gpu/drm/radeon/radeon_ioc32.c
41493@@ -358,7 +358,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41494 request = compat_alloc_user_space(sizeof(*request));
41495 if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
41496 || __put_user(req32.param, &request->param)
41497- || __put_user((void __user *)(unsigned long)req32.value,
41498+ || __put_user((unsigned long)req32.value,
41499 &request->value))
41500 return -EFAULT;
41501
41502@@ -368,7 +368,7 @@ static int compat_radeon_cp_setparam(struct file *file, unsigned int cmd,
41503 #define compat_radeon_cp_setparam NULL
41504 #endif /* X86_64 || IA64 */
41505
41506-static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41507+static drm_ioctl_compat_t radeon_compat_ioctls[] = {
41508 [DRM_RADEON_CP_INIT] = compat_radeon_cp_init,
41509 [DRM_RADEON_CLEAR] = compat_radeon_cp_clear,
41510 [DRM_RADEON_STIPPLE] = compat_radeon_cp_stipple,
41511@@ -393,17 +393,13 @@ static drm_ioctl_compat_t *radeon_compat_ioctls[] = {
41512 long radeon_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
41513 {
41514 unsigned int nr = DRM_IOCTL_NR(cmd);
41515- drm_ioctl_compat_t *fn = NULL;
41516 int ret;
41517
41518 if (nr < DRM_COMMAND_BASE)
41519 return drm_compat_ioctl(filp, cmd, arg);
41520
41521- if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls))
41522- fn = radeon_compat_ioctls[nr - DRM_COMMAND_BASE];
41523-
41524- if (fn != NULL)
41525- ret = (*fn) (filp, cmd, arg);
41526+ if (nr < DRM_COMMAND_BASE + ARRAY_SIZE(radeon_compat_ioctls) && radeon_compat_ioctls[nr - DRM_COMMAND_BASE])
41527+ ret = (*radeon_compat_ioctls[nr - DRM_COMMAND_BASE]) (filp, cmd, arg);
41528 else
41529 ret = drm_ioctl(filp, cmd, arg);
41530
41531diff --git a/drivers/gpu/drm/radeon/radeon_irq.c b/drivers/gpu/drm/radeon/radeon_irq.c
41532index 244b19b..c19226d 100644
41533--- a/drivers/gpu/drm/radeon/radeon_irq.c
41534+++ b/drivers/gpu/drm/radeon/radeon_irq.c
41535@@ -226,8 +226,8 @@ static int radeon_emit_irq(struct drm_device * dev)
41536 unsigned int ret;
41537 RING_LOCALS;
41538
41539- atomic_inc(&dev_priv->swi_emitted);
41540- ret = atomic_read(&dev_priv->swi_emitted);
41541+ atomic_inc_unchecked(&dev_priv->swi_emitted);
41542+ ret = atomic_read_unchecked(&dev_priv->swi_emitted);
41543
41544 BEGIN_RING(4);
41545 OUT_RING_REG(RADEON_LAST_SWI_REG, ret);
41546@@ -353,7 +353,7 @@ int radeon_driver_irq_postinstall(struct drm_device *dev)
41547 drm_radeon_private_t *dev_priv =
41548 (drm_radeon_private_t *) dev->dev_private;
41549
41550- atomic_set(&dev_priv->swi_emitted, 0);
41551+ atomic_set_unchecked(&dev_priv->swi_emitted, 0);
41552 init_waitqueue_head(&dev_priv->swi_queue);
41553
41554 dev->max_vblank_count = 0x001fffff;
41555diff --git a/drivers/gpu/drm/radeon/radeon_state.c b/drivers/gpu/drm/radeon/radeon_state.c
41556index 15aee72..cda326e 100644
41557--- a/drivers/gpu/drm/radeon/radeon_state.c
41558+++ b/drivers/gpu/drm/radeon/radeon_state.c
41559@@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_device *dev, void *data, struct drm_file *
41560 if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
41561 sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
41562
41563- if (copy_from_user(&depth_boxes, clear->depth_boxes,
41564+ if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS || copy_from_user(&depth_boxes, clear->depth_boxes,
41565 sarea_priv->nbox * sizeof(depth_boxes[0])))
41566 return -EFAULT;
41567
41568@@ -3031,7 +3031,7 @@ static int radeon_cp_getparam(struct drm_device *dev, void *data, struct drm_fil
41569 {
41570 drm_radeon_private_t *dev_priv = dev->dev_private;
41571 drm_radeon_getparam_t *param = data;
41572- int value;
41573+ int value = 0;
41574
41575 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
41576
41577diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c
41578index b292aca..4e338b5 100644
41579--- a/drivers/gpu/drm/radeon/radeon_ttm.c
41580+++ b/drivers/gpu/drm/radeon/radeon_ttm.c
41581@@ -963,7 +963,7 @@ void radeon_ttm_set_active_vram_size(struct radeon_device *rdev, u64 size)
41582 man->size = size >> PAGE_SHIFT;
41583 }
41584
41585-static struct vm_operations_struct radeon_ttm_vm_ops;
41586+static vm_operations_struct_no_const radeon_ttm_vm_ops __read_only;
41587 static const struct vm_operations_struct *ttm_vm_ops = NULL;
41588
41589 static int radeon_ttm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
41590@@ -1004,8 +1004,10 @@ int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
41591 }
41592 if (unlikely(ttm_vm_ops == NULL)) {
41593 ttm_vm_ops = vma->vm_ops;
41594+ pax_open_kernel();
41595 radeon_ttm_vm_ops = *ttm_vm_ops;
41596 radeon_ttm_vm_ops.fault = &radeon_ttm_fault;
41597+ pax_close_kernel();
41598 }
41599 vma->vm_ops = &radeon_ttm_vm_ops;
41600 return 0;
41601diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c
41602index 1a52522..8e78043 100644
41603--- a/drivers/gpu/drm/tegra/dc.c
41604+++ b/drivers/gpu/drm/tegra/dc.c
41605@@ -1585,7 +1585,7 @@ static int tegra_dc_debugfs_init(struct tegra_dc *dc, struct drm_minor *minor)
41606 }
41607
41608 for (i = 0; i < ARRAY_SIZE(debugfs_files); i++)
41609- dc->debugfs_files[i].data = dc;
41610+ *(void **)&dc->debugfs_files[i].data = dc;
41611
41612 err = drm_debugfs_create_files(dc->debugfs_files,
41613 ARRAY_SIZE(debugfs_files),
41614diff --git a/drivers/gpu/drm/tegra/dsi.c b/drivers/gpu/drm/tegra/dsi.c
41615index ed970f6..4eeea42 100644
41616--- a/drivers/gpu/drm/tegra/dsi.c
41617+++ b/drivers/gpu/drm/tegra/dsi.c
41618@@ -62,7 +62,7 @@ struct tegra_dsi {
41619 struct clk *clk_lp;
41620 struct clk *clk;
41621
41622- struct drm_info_list *debugfs_files;
41623+ drm_info_list_no_const *debugfs_files;
41624 struct drm_minor *minor;
41625 struct dentry *debugfs;
41626
41627diff --git a/drivers/gpu/drm/tegra/hdmi.c b/drivers/gpu/drm/tegra/hdmi.c
41628index 7eaaee74..cc2bc04 100644
41629--- a/drivers/gpu/drm/tegra/hdmi.c
41630+++ b/drivers/gpu/drm/tegra/hdmi.c
41631@@ -64,7 +64,7 @@ struct tegra_hdmi {
41632 bool stereo;
41633 bool dvi;
41634
41635- struct drm_info_list *debugfs_files;
41636+ drm_info_list_no_const *debugfs_files;
41637 struct drm_minor *minor;
41638 struct dentry *debugfs;
41639 };
41640diff --git a/drivers/gpu/drm/ttm/ttm_bo_manager.c b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41641index aa0bd054..aea6a01 100644
41642--- a/drivers/gpu/drm/ttm/ttm_bo_manager.c
41643+++ b/drivers/gpu/drm/ttm/ttm_bo_manager.c
41644@@ -148,10 +148,10 @@ static void ttm_bo_man_debug(struct ttm_mem_type_manager *man,
41645 }
41646
41647 const struct ttm_mem_type_manager_func ttm_bo_manager_func = {
41648- ttm_bo_man_init,
41649- ttm_bo_man_takedown,
41650- ttm_bo_man_get_node,
41651- ttm_bo_man_put_node,
41652- ttm_bo_man_debug
41653+ .init = ttm_bo_man_init,
41654+ .takedown = ttm_bo_man_takedown,
41655+ .get_node = ttm_bo_man_get_node,
41656+ .put_node = ttm_bo_man_put_node,
41657+ .debug = ttm_bo_man_debug
41658 };
41659 EXPORT_SYMBOL(ttm_bo_manager_func);
41660diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
41661index a1803fb..c53f6b0 100644
41662--- a/drivers/gpu/drm/ttm/ttm_memory.c
41663+++ b/drivers/gpu/drm/ttm/ttm_memory.c
41664@@ -264,7 +264,7 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob,
41665 zone->glob = glob;
41666 glob->zone_kernel = zone;
41667 ret = kobject_init_and_add(
41668- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41669+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41670 if (unlikely(ret != 0)) {
41671 kobject_put(&zone->kobj);
41672 return ret;
41673@@ -348,7 +348,7 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob,
41674 zone->glob = glob;
41675 glob->zone_dma32 = zone;
41676 ret = kobject_init_and_add(
41677- &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
41678+ &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s", zone->name);
41679 if (unlikely(ret != 0)) {
41680 kobject_put(&zone->kobj);
41681 return ret;
41682diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41683index 025c429..314062f 100644
41684--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
41685+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
41686@@ -54,7 +54,7 @@
41687
41688 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41689 #define SMALL_ALLOCATION 16
41690-#define FREE_ALL_PAGES (~0U)
41691+#define FREE_ALL_PAGES (~0UL)
41692 /* times are in msecs */
41693 #define PAGE_FREE_INTERVAL 1000
41694
41695@@ -299,15 +299,14 @@ static void ttm_pool_update_free_locked(struct ttm_page_pool *pool,
41696 * @free_all: If set to true will free all pages in pool
41697 * @use_static: Safe to use static buffer
41698 **/
41699-static int ttm_page_pool_free(struct ttm_page_pool *pool, unsigned nr_free,
41700+static unsigned long ttm_page_pool_free(struct ttm_page_pool *pool, unsigned long nr_free,
41701 bool use_static)
41702 {
41703 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
41704 unsigned long irq_flags;
41705 struct page *p;
41706 struct page **pages_to_free;
41707- unsigned freed_pages = 0,
41708- npages_to_free = nr_free;
41709+ unsigned long freed_pages = 0, npages_to_free = nr_free;
41710
41711 if (NUM_PAGES_TO_ALLOC < nr_free)
41712 npages_to_free = NUM_PAGES_TO_ALLOC;
41713@@ -371,7 +370,8 @@ restart:
41714 __list_del(&p->lru, &pool->list);
41715
41716 ttm_pool_update_free_locked(pool, freed_pages);
41717- nr_free -= freed_pages;
41718+ if (likely(nr_free != FREE_ALL_PAGES))
41719+ nr_free -= freed_pages;
41720 }
41721
41722 spin_unlock_irqrestore(&pool->lock, irq_flags);
41723@@ -399,7 +399,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41724 unsigned i;
41725 unsigned pool_offset;
41726 struct ttm_page_pool *pool;
41727- int shrink_pages = sc->nr_to_scan;
41728+ unsigned long shrink_pages = sc->nr_to_scan;
41729 unsigned long freed = 0;
41730
41731 if (!mutex_trylock(&lock))
41732@@ -407,7 +407,7 @@ ttm_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41733 pool_offset = ++start_pool % NUM_POOLS;
41734 /* select start pool in round robin fashion */
41735 for (i = 0; i < NUM_POOLS; ++i) {
41736- unsigned nr_free = shrink_pages;
41737+ unsigned long nr_free = shrink_pages;
41738 if (shrink_pages == 0)
41739 break;
41740 pool = &_manager->pools[(i + pool_offset)%NUM_POOLS];
41741@@ -673,7 +673,7 @@ out:
41742 }
41743
41744 /* Put all pages in pages list to correct pool to wait for reuse */
41745-static void ttm_put_pages(struct page **pages, unsigned npages, int flags,
41746+static void ttm_put_pages(struct page **pages, unsigned long npages, int flags,
41747 enum ttm_caching_state cstate)
41748 {
41749 unsigned long irq_flags;
41750@@ -728,7 +728,7 @@ static int ttm_get_pages(struct page **pages, unsigned npages, int flags,
41751 struct list_head plist;
41752 struct page *p = NULL;
41753 gfp_t gfp_flags = GFP_USER;
41754- unsigned count;
41755+ unsigned long count;
41756 int r;
41757
41758 /* set zero flag for page allocation if required */
41759diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41760index 01e1d27..aaa018a 100644
41761--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41762+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
41763@@ -56,7 +56,7 @@
41764
41765 #define NUM_PAGES_TO_ALLOC (PAGE_SIZE/sizeof(struct page *))
41766 #define SMALL_ALLOCATION 4
41767-#define FREE_ALL_PAGES (~0U)
41768+#define FREE_ALL_PAGES (~0UL)
41769 /* times are in msecs */
41770 #define IS_UNDEFINED (0)
41771 #define IS_WC (1<<1)
41772@@ -413,7 +413,7 @@ static void ttm_dma_page_put(struct dma_pool *pool, struct dma_page *d_page)
41773 * @nr_free: If set to true will free all pages in pool
41774 * @use_static: Safe to use static buffer
41775 **/
41776-static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
41777+static unsigned long ttm_dma_page_pool_free(struct dma_pool *pool, unsigned long nr_free,
41778 bool use_static)
41779 {
41780 static struct page *static_buf[NUM_PAGES_TO_ALLOC];
41781@@ -421,8 +421,7 @@ static unsigned ttm_dma_page_pool_free(struct dma_pool *pool, unsigned nr_free,
41782 struct dma_page *dma_p, *tmp;
41783 struct page **pages_to_free;
41784 struct list_head d_pages;
41785- unsigned freed_pages = 0,
41786- npages_to_free = nr_free;
41787+ unsigned long freed_pages = 0, npages_to_free = nr_free;
41788
41789 if (NUM_PAGES_TO_ALLOC < nr_free)
41790 npages_to_free = NUM_PAGES_TO_ALLOC;
41791@@ -499,7 +498,8 @@ restart:
41792 /* remove range of pages from the pool */
41793 if (freed_pages) {
41794 ttm_pool_update_free_locked(pool, freed_pages);
41795- nr_free -= freed_pages;
41796+ if (likely(nr_free != FREE_ALL_PAGES))
41797+ nr_free -= freed_pages;
41798 }
41799
41800 spin_unlock_irqrestore(&pool->lock, irq_flags);
41801@@ -936,7 +936,7 @@ void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev)
41802 struct dma_page *d_page, *next;
41803 enum pool_type type;
41804 bool is_cached = false;
41805- unsigned count = 0, i, npages = 0;
41806+ unsigned long count = 0, i, npages = 0;
41807 unsigned long irq_flags;
41808
41809 type = ttm_to_type(ttm->page_flags, ttm->caching_state);
41810@@ -1012,7 +1012,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41811 static unsigned start_pool;
41812 unsigned idx = 0;
41813 unsigned pool_offset;
41814- unsigned shrink_pages = sc->nr_to_scan;
41815+ unsigned long shrink_pages = sc->nr_to_scan;
41816 struct device_pools *p;
41817 unsigned long freed = 0;
41818
41819@@ -1025,7 +1025,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41820 goto out;
41821 pool_offset = ++start_pool % _manager->npools;
41822 list_for_each_entry(p, &_manager->pools, pools) {
41823- unsigned nr_free;
41824+ unsigned long nr_free;
41825
41826 if (!p->dev)
41827 continue;
41828@@ -1039,7 +1039,7 @@ ttm_dma_pool_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
41829 shrink_pages = ttm_dma_page_pool_free(p->pool, nr_free, true);
41830 freed += nr_free - shrink_pages;
41831
41832- pr_debug("%s: (%s:%d) Asked to shrink %d, have %d more to go\n",
41833+ pr_debug("%s: (%s:%d) Asked to shrink %lu, have %lu more to go\n",
41834 p->pool->dev_name, p->pool->name, current->pid,
41835 nr_free, shrink_pages);
41836 }
41837diff --git a/drivers/gpu/drm/udl/udl_fb.c b/drivers/gpu/drm/udl/udl_fb.c
41838index 5fc16ce..1bd84ec 100644
41839--- a/drivers/gpu/drm/udl/udl_fb.c
41840+++ b/drivers/gpu/drm/udl/udl_fb.c
41841@@ -367,7 +367,6 @@ static int udl_fb_release(struct fb_info *info, int user)
41842 fb_deferred_io_cleanup(info);
41843 kfree(info->fbdefio);
41844 info->fbdefio = NULL;
41845- info->fbops->fb_mmap = udl_fb_mmap;
41846 }
41847
41848 pr_warn("released /dev/fb%d user=%d count=%d\n",
41849diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
41850index ef8c500..01030c8 100644
41851--- a/drivers/gpu/drm/via/via_drv.h
41852+++ b/drivers/gpu/drm/via/via_drv.h
41853@@ -53,7 +53,7 @@ typedef struct drm_via_ring_buffer {
41854 typedef uint32_t maskarray_t[5];
41855
41856 typedef struct drm_via_irq {
41857- atomic_t irq_received;
41858+ atomic_unchecked_t irq_received;
41859 uint32_t pending_mask;
41860 uint32_t enable_mask;
41861 wait_queue_head_t irq_queue;
41862@@ -77,7 +77,7 @@ typedef struct drm_via_private {
41863 struct timeval last_vblank;
41864 int last_vblank_valid;
41865 unsigned usec_per_vblank;
41866- atomic_t vbl_received;
41867+ atomic_unchecked_t vbl_received;
41868 drm_via_state_t hc_state;
41869 char pci_buf[VIA_PCI_BUF_SIZE];
41870 const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
41871diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
41872index 1319433..a993b0c 100644
41873--- a/drivers/gpu/drm/via/via_irq.c
41874+++ b/drivers/gpu/drm/via/via_irq.c
41875@@ -101,7 +101,7 @@ u32 via_get_vblank_counter(struct drm_device *dev, int crtc)
41876 if (crtc != 0)
41877 return 0;
41878
41879- return atomic_read(&dev_priv->vbl_received);
41880+ return atomic_read_unchecked(&dev_priv->vbl_received);
41881 }
41882
41883 irqreturn_t via_driver_irq_handler(int irq, void *arg)
41884@@ -116,8 +116,8 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41885
41886 status = VIA_READ(VIA_REG_INTERRUPT);
41887 if (status & VIA_IRQ_VBLANK_PENDING) {
41888- atomic_inc(&dev_priv->vbl_received);
41889- if (!(atomic_read(&dev_priv->vbl_received) & 0x0F)) {
41890+ atomic_inc_unchecked(&dev_priv->vbl_received);
41891+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0x0F)) {
41892 do_gettimeofday(&cur_vblank);
41893 if (dev_priv->last_vblank_valid) {
41894 dev_priv->usec_per_vblank =
41895@@ -127,7 +127,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41896 dev_priv->last_vblank = cur_vblank;
41897 dev_priv->last_vblank_valid = 1;
41898 }
41899- if (!(atomic_read(&dev_priv->vbl_received) & 0xFF)) {
41900+ if (!(atomic_read_unchecked(&dev_priv->vbl_received) & 0xFF)) {
41901 DRM_DEBUG("US per vblank is: %u\n",
41902 dev_priv->usec_per_vblank);
41903 }
41904@@ -137,7 +137,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
41905
41906 for (i = 0; i < dev_priv->num_irqs; ++i) {
41907 if (status & cur_irq->pending_mask) {
41908- atomic_inc(&cur_irq->irq_received);
41909+ atomic_inc_unchecked(&cur_irq->irq_received);
41910 wake_up(&cur_irq->irq_queue);
41911 handled = 1;
41912 if (dev_priv->irq_map[drm_via_irq_dma0_td] == i)
41913@@ -242,11 +242,11 @@ via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence
41914 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41915 ((VIA_READ(masks[irq][2]) & masks[irq][3]) ==
41916 masks[irq][4]));
41917- cur_irq_sequence = atomic_read(&cur_irq->irq_received);
41918+ cur_irq_sequence = atomic_read_unchecked(&cur_irq->irq_received);
41919 } else {
41920 DRM_WAIT_ON(ret, cur_irq->irq_queue, 3 * HZ,
41921 (((cur_irq_sequence =
41922- atomic_read(&cur_irq->irq_received)) -
41923+ atomic_read_unchecked(&cur_irq->irq_received)) -
41924 *sequence) <= (1 << 23)));
41925 }
41926 *sequence = cur_irq_sequence;
41927@@ -284,7 +284,7 @@ void via_driver_irq_preinstall(struct drm_device *dev)
41928 }
41929
41930 for (i = 0; i < dev_priv->num_irqs; ++i) {
41931- atomic_set(&cur_irq->irq_received, 0);
41932+ atomic_set_unchecked(&cur_irq->irq_received, 0);
41933 cur_irq->enable_mask = dev_priv->irq_masks[i][0];
41934 cur_irq->pending_mask = dev_priv->irq_masks[i][1];
41935 init_waitqueue_head(&cur_irq->irq_queue);
41936@@ -366,7 +366,7 @@ int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
41937 switch (irqwait->request.type & ~VIA_IRQ_FLAGS_MASK) {
41938 case VIA_IRQ_RELATIVE:
41939 irqwait->request.sequence +=
41940- atomic_read(&cur_irq->irq_received);
41941+ atomic_read_unchecked(&cur_irq->irq_received);
41942 irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
41943 case VIA_IRQ_ABSOLUTE:
41944 break;
41945diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41946index d26a6da..5fa41ed 100644
41947--- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41948+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
41949@@ -447,7 +447,7 @@ struct vmw_private {
41950 * Fencing and IRQs.
41951 */
41952
41953- atomic_t marker_seq;
41954+ atomic_unchecked_t marker_seq;
41955 wait_queue_head_t fence_queue;
41956 wait_queue_head_t fifo_queue;
41957 spinlock_t waiter_lock;
41958diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41959index 39f2b03..d1b0a64 100644
41960--- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41961+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
41962@@ -152,7 +152,7 @@ int vmw_fifo_init(struct vmw_private *dev_priv, struct vmw_fifo_state *fifo)
41963 (unsigned int) min,
41964 (unsigned int) fifo->capabilities);
41965
41966- atomic_set(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41967+ atomic_set_unchecked(&dev_priv->marker_seq, dev_priv->last_read_seqno);
41968 iowrite32(dev_priv->last_read_seqno, fifo_mem + SVGA_FIFO_FENCE);
41969 vmw_marker_queue_init(&fifo->marker_queue);
41970 return vmw_fifo_send_fence(dev_priv, &dummy);
41971@@ -372,7 +372,7 @@ void *vmw_fifo_reserve(struct vmw_private *dev_priv, uint32_t bytes)
41972 if (reserveable)
41973 iowrite32(bytes, fifo_mem +
41974 SVGA_FIFO_RESERVED);
41975- return fifo_mem + (next_cmd >> 2);
41976+ return (__le32 __force_kernel *)fifo_mem + (next_cmd >> 2);
41977 } else {
41978 need_bounce = true;
41979 }
41980@@ -492,7 +492,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41981
41982 fm = vmw_fifo_reserve(dev_priv, bytes);
41983 if (unlikely(fm == NULL)) {
41984- *seqno = atomic_read(&dev_priv->marker_seq);
41985+ *seqno = atomic_read_unchecked(&dev_priv->marker_seq);
41986 ret = -ENOMEM;
41987 (void)vmw_fallback_wait(dev_priv, false, true, *seqno,
41988 false, 3*HZ);
41989@@ -500,7 +500,7 @@ int vmw_fifo_send_fence(struct vmw_private *dev_priv, uint32_t *seqno)
41990 }
41991
41992 do {
41993- *seqno = atomic_add_return(1, &dev_priv->marker_seq);
41994+ *seqno = atomic_add_return_unchecked(1, &dev_priv->marker_seq);
41995 } while (*seqno == 0);
41996
41997 if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
41998diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
41999index 170b61b..fec7348 100644
42000--- a/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42001+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c
42002@@ -164,9 +164,9 @@ static void vmw_gmrid_man_debug(struct ttm_mem_type_manager *man,
42003 }
42004
42005 const struct ttm_mem_type_manager_func vmw_gmrid_manager_func = {
42006- vmw_gmrid_man_init,
42007- vmw_gmrid_man_takedown,
42008- vmw_gmrid_man_get_node,
42009- vmw_gmrid_man_put_node,
42010- vmw_gmrid_man_debug
42011+ .init = vmw_gmrid_man_init,
42012+ .takedown = vmw_gmrid_man_takedown,
42013+ .get_node = vmw_gmrid_man_get_node,
42014+ .put_node = vmw_gmrid_man_put_node,
42015+ .debug = vmw_gmrid_man_debug
42016 };
42017diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42018index 69c8ce2..cacb0ab 100644
42019--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42020+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c
42021@@ -235,7 +235,7 @@ int vmw_present_ioctl(struct drm_device *dev, void *data,
42022 int ret;
42023
42024 num_clips = arg->num_clips;
42025- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42026+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42027
42028 if (unlikely(num_clips == 0))
42029 return 0;
42030@@ -318,7 +318,7 @@ int vmw_present_readback_ioctl(struct drm_device *dev, void *data,
42031 int ret;
42032
42033 num_clips = arg->num_clips;
42034- clips_ptr = (struct drm_vmw_rect *)(unsigned long)arg->clips_ptr;
42035+ clips_ptr = (struct drm_vmw_rect __user *)(unsigned long)arg->clips_ptr;
42036
42037 if (unlikely(num_clips == 0))
42038 return 0;
42039diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42040index 9fe9827..0aa2fc0 100644
42041--- a/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42042+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
42043@@ -102,7 +102,7 @@ bool vmw_seqno_passed(struct vmw_private *dev_priv,
42044 * emitted. Then the fence is stale and signaled.
42045 */
42046
42047- ret = ((atomic_read(&dev_priv->marker_seq) - seqno)
42048+ ret = ((atomic_read_unchecked(&dev_priv->marker_seq) - seqno)
42049 > VMW_FENCE_WRAP);
42050
42051 return ret;
42052@@ -133,7 +133,7 @@ int vmw_fallback_wait(struct vmw_private *dev_priv,
42053
42054 if (fifo_idle)
42055 down_read(&fifo_state->rwsem);
42056- signal_seq = atomic_read(&dev_priv->marker_seq);
42057+ signal_seq = atomic_read_unchecked(&dev_priv->marker_seq);
42058 ret = 0;
42059
42060 for (;;) {
42061diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42062index efd1ffd..0ae13ca 100644
42063--- a/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42064+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_marker.c
42065@@ -135,7 +135,7 @@ int vmw_wait_lag(struct vmw_private *dev_priv,
42066 while (!vmw_lag_lt(queue, us)) {
42067 spin_lock(&queue->lock);
42068 if (list_empty(&queue->head))
42069- seqno = atomic_read(&dev_priv->marker_seq);
42070+ seqno = atomic_read_unchecked(&dev_priv->marker_seq);
42071 else {
42072 marker = list_first_entry(&queue->head,
42073 struct vmw_marker, head);
42074diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
42075index 37ac7b5..d52a5c9 100644
42076--- a/drivers/gpu/vga/vga_switcheroo.c
42077+++ b/drivers/gpu/vga/vga_switcheroo.c
42078@@ -644,7 +644,7 @@ static int vga_switcheroo_runtime_resume(struct device *dev)
42079
42080 /* this version is for the case where the power switch is separate
42081 to the device being powered down. */
42082-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain)
42083+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain)
42084 {
42085 /* copy over all the bus versions */
42086 if (dev->bus && dev->bus->pm) {
42087@@ -695,7 +695,7 @@ static int vga_switcheroo_runtime_resume_hdmi_audio(struct device *dev)
42088 return ret;
42089 }
42090
42091-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain)
42092+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain)
42093 {
42094 /* copy over all the bus versions */
42095 if (dev->bus && dev->bus->pm) {
42096diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
42097index 56ce8c2..32ce524 100644
42098--- a/drivers/hid/hid-core.c
42099+++ b/drivers/hid/hid-core.c
42100@@ -2531,7 +2531,7 @@ EXPORT_SYMBOL_GPL(hid_ignore);
42101
42102 int hid_add_device(struct hid_device *hdev)
42103 {
42104- static atomic_t id = ATOMIC_INIT(0);
42105+ static atomic_unchecked_t id = ATOMIC_INIT(0);
42106 int ret;
42107
42108 if (WARN_ON(hdev->status & HID_STAT_ADDED))
42109@@ -2574,7 +2574,7 @@ int hid_add_device(struct hid_device *hdev)
42110 /* XXX hack, any other cleaner solution after the driver core
42111 * is converted to allow more than 20 bytes as the device name? */
42112 dev_set_name(&hdev->dev, "%04X:%04X:%04X.%04X", hdev->bus,
42113- hdev->vendor, hdev->product, atomic_inc_return(&id));
42114+ hdev->vendor, hdev->product, atomic_inc_return_unchecked(&id));
42115
42116 hid_debug_register(hdev, dev_name(&hdev->dev));
42117 ret = device_add(&hdev->dev);
42118diff --git a/drivers/hid/hid-wiimote-debug.c b/drivers/hid/hid-wiimote-debug.c
42119index c13fb5b..55a3802 100644
42120--- a/drivers/hid/hid-wiimote-debug.c
42121+++ b/drivers/hid/hid-wiimote-debug.c
42122@@ -66,7 +66,7 @@ static ssize_t wiidebug_eeprom_read(struct file *f, char __user *u, size_t s,
42123 else if (size == 0)
42124 return -EIO;
42125
42126- if (copy_to_user(u, buf, size))
42127+ if (size > sizeof(buf) || copy_to_user(u, buf, size))
42128 return -EFAULT;
42129
42130 *off += size;
42131diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c
42132index 00bc30e..d8e5097 100644
42133--- a/drivers/hv/channel.c
42134+++ b/drivers/hv/channel.c
42135@@ -370,7 +370,7 @@ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer,
42136 int ret = 0;
42137
42138 next_gpadl_handle =
42139- (atomic_inc_return(&vmbus_connection.next_gpadl_handle) - 1);
42140+ (atomic_inc_return_unchecked(&vmbus_connection.next_gpadl_handle) - 1);
42141
42142 ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
42143 if (ret)
42144diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
42145index 50e51a5..b0bfd78 100644
42146--- a/drivers/hv/hv.c
42147+++ b/drivers/hv/hv.c
42148@@ -118,7 +118,7 @@ static u64 do_hypercall(u64 control, void *input, void *output)
42149 u64 output_address = (output) ? virt_to_phys(output) : 0;
42150 u32 output_address_hi = output_address >> 32;
42151 u32 output_address_lo = output_address & 0xFFFFFFFF;
42152- void *hypercall_page = hv_context.hypercall_page;
42153+ void *hypercall_page = ktva_ktla(hv_context.hypercall_page);
42154
42155 __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
42156 "=a"(hv_status_lo) : "d" (control_hi),
42157@@ -164,7 +164,7 @@ int hv_init(void)
42158 /* See if the hypercall page is already set */
42159 rdmsrl(HV_X64_MSR_HYPERCALL, hypercall_msr.as_uint64);
42160
42161- virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_EXEC);
42162+ virtaddr = __vmalloc(PAGE_SIZE, GFP_KERNEL, PAGE_KERNEL_RX);
42163
42164 if (!virtaddr)
42165 goto cleanup;
42166diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c
42167index ff16938..e60879c 100644
42168--- a/drivers/hv/hv_balloon.c
42169+++ b/drivers/hv/hv_balloon.c
42170@@ -470,7 +470,7 @@ MODULE_PARM_DESC(hot_add, "If set attempt memory hot_add");
42171
42172 module_param(pressure_report_delay, uint, (S_IRUGO | S_IWUSR));
42173 MODULE_PARM_DESC(pressure_report_delay, "Delay in secs in reporting pressure");
42174-static atomic_t trans_id = ATOMIC_INIT(0);
42175+static atomic_unchecked_t trans_id = ATOMIC_INIT(0);
42176
42177 static int dm_ring_size = (5 * PAGE_SIZE);
42178
42179@@ -947,7 +947,7 @@ static void hot_add_req(struct work_struct *dummy)
42180 pr_info("Memory hot add failed\n");
42181
42182 dm->state = DM_INITIALIZED;
42183- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42184+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42185 vmbus_sendpacket(dm->dev->channel, &resp,
42186 sizeof(struct dm_hot_add_response),
42187 (unsigned long)NULL,
42188@@ -1028,7 +1028,7 @@ static void post_status(struct hv_dynmem_device *dm)
42189 memset(&status, 0, sizeof(struct dm_status));
42190 status.hdr.type = DM_STATUS_REPORT;
42191 status.hdr.size = sizeof(struct dm_status);
42192- status.hdr.trans_id = atomic_inc_return(&trans_id);
42193+ status.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42194
42195 /*
42196 * The host expects the guest to report free memory.
42197@@ -1048,7 +1048,7 @@ static void post_status(struct hv_dynmem_device *dm)
42198 * send the status. This can happen if we were interrupted
42199 * after we picked our transaction ID.
42200 */
42201- if (status.hdr.trans_id != atomic_read(&trans_id))
42202+ if (status.hdr.trans_id != atomic_read_unchecked(&trans_id))
42203 return;
42204
42205 /*
42206@@ -1188,7 +1188,7 @@ static void balloon_up(struct work_struct *dummy)
42207 */
42208
42209 do {
42210- bl_resp->hdr.trans_id = atomic_inc_return(&trans_id);
42211+ bl_resp->hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42212 ret = vmbus_sendpacket(dm_device.dev->channel,
42213 bl_resp,
42214 bl_resp->hdr.size,
42215@@ -1234,7 +1234,7 @@ static void balloon_down(struct hv_dynmem_device *dm,
42216
42217 memset(&resp, 0, sizeof(struct dm_unballoon_response));
42218 resp.hdr.type = DM_UNBALLOON_RESPONSE;
42219- resp.hdr.trans_id = atomic_inc_return(&trans_id);
42220+ resp.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42221 resp.hdr.size = sizeof(struct dm_unballoon_response);
42222
42223 vmbus_sendpacket(dm_device.dev->channel, &resp,
42224@@ -1295,7 +1295,7 @@ static void version_resp(struct hv_dynmem_device *dm,
42225 memset(&version_req, 0, sizeof(struct dm_version_request));
42226 version_req.hdr.type = DM_VERSION_REQUEST;
42227 version_req.hdr.size = sizeof(struct dm_version_request);
42228- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42229+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42230 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN7;
42231 version_req.is_last_attempt = 1;
42232
42233@@ -1468,7 +1468,7 @@ static int balloon_probe(struct hv_device *dev,
42234 memset(&version_req, 0, sizeof(struct dm_version_request));
42235 version_req.hdr.type = DM_VERSION_REQUEST;
42236 version_req.hdr.size = sizeof(struct dm_version_request);
42237- version_req.hdr.trans_id = atomic_inc_return(&trans_id);
42238+ version_req.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42239 version_req.version.version = DYNMEM_PROTOCOL_VERSION_WIN8;
42240 version_req.is_last_attempt = 0;
42241
42242@@ -1499,7 +1499,7 @@ static int balloon_probe(struct hv_device *dev,
42243 memset(&cap_msg, 0, sizeof(struct dm_capabilities));
42244 cap_msg.hdr.type = DM_CAPABILITIES_REPORT;
42245 cap_msg.hdr.size = sizeof(struct dm_capabilities);
42246- cap_msg.hdr.trans_id = atomic_inc_return(&trans_id);
42247+ cap_msg.hdr.trans_id = atomic_inc_return_unchecked(&trans_id);
42248
42249 cap_msg.caps.cap_bits.balloon = 1;
42250 cap_msg.caps.cap_bits.hot_add = 1;
42251diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h
42252index 44b1c94..6dccc2c 100644
42253--- a/drivers/hv/hyperv_vmbus.h
42254+++ b/drivers/hv/hyperv_vmbus.h
42255@@ -632,7 +632,7 @@ enum vmbus_connect_state {
42256 struct vmbus_connection {
42257 enum vmbus_connect_state conn_state;
42258
42259- atomic_t next_gpadl_handle;
42260+ atomic_unchecked_t next_gpadl_handle;
42261
42262 /*
42263 * Represents channel interrupts. Each bit position represents a
42264diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
42265index f518b8d7..4bc0b64 100644
42266--- a/drivers/hv/vmbus_drv.c
42267+++ b/drivers/hv/vmbus_drv.c
42268@@ -840,10 +840,10 @@ int vmbus_device_register(struct hv_device *child_device_obj)
42269 {
42270 int ret = 0;
42271
42272- static atomic_t device_num = ATOMIC_INIT(0);
42273+ static atomic_unchecked_t device_num = ATOMIC_INIT(0);
42274
42275 dev_set_name(&child_device_obj->device, "vmbus_0_%d",
42276- atomic_inc_return(&device_num));
42277+ atomic_inc_return_unchecked(&device_num));
42278
42279 child_device_obj->device.bus = &hv_bus;
42280 child_device_obj->device.parent = &hv_acpi_dev->dev;
42281diff --git a/drivers/hwmon/acpi_power_meter.c b/drivers/hwmon/acpi_power_meter.c
42282index 579bdf9..0dac21d5 100644
42283--- a/drivers/hwmon/acpi_power_meter.c
42284+++ b/drivers/hwmon/acpi_power_meter.c
42285@@ -116,7 +116,7 @@ struct sensor_template {
42286 struct device_attribute *devattr,
42287 const char *buf, size_t count);
42288 int index;
42289-};
42290+} __do_const;
42291
42292 /* Averaging interval */
42293 static int update_avg_interval(struct acpi_power_meter_resource *resource)
42294@@ -631,7 +631,7 @@ static int register_attrs(struct acpi_power_meter_resource *resource,
42295 struct sensor_template *attrs)
42296 {
42297 struct device *dev = &resource->acpi_dev->dev;
42298- struct sensor_device_attribute *sensors =
42299+ sensor_device_attribute_no_const *sensors =
42300 &resource->sensors[resource->num_sensors];
42301 int res = 0;
42302
42303@@ -973,7 +973,7 @@ static int __init enable_cap_knobs(const struct dmi_system_id *d)
42304 return 0;
42305 }
42306
42307-static struct dmi_system_id __initdata pm_dmi_table[] = {
42308+static const struct dmi_system_id __initconst pm_dmi_table[] = {
42309 {
42310 enable_cap_knobs, "IBM Active Energy Manager",
42311 {
42312diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
42313index 0af63da..05a183a 100644
42314--- a/drivers/hwmon/applesmc.c
42315+++ b/drivers/hwmon/applesmc.c
42316@@ -1105,7 +1105,7 @@ static int applesmc_create_nodes(struct applesmc_node_group *groups, int num)
42317 {
42318 struct applesmc_node_group *grp;
42319 struct applesmc_dev_attr *node;
42320- struct attribute *attr;
42321+ attribute_no_const *attr;
42322 int ret, i;
42323
42324 for (grp = groups; grp->format; grp++) {
42325diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c
42326index cccef87..06ce8ec 100644
42327--- a/drivers/hwmon/asus_atk0110.c
42328+++ b/drivers/hwmon/asus_atk0110.c
42329@@ -147,10 +147,10 @@ MODULE_DEVICE_TABLE(acpi, atk_ids);
42330 struct atk_sensor_data {
42331 struct list_head list;
42332 struct atk_data *data;
42333- struct device_attribute label_attr;
42334- struct device_attribute input_attr;
42335- struct device_attribute limit1_attr;
42336- struct device_attribute limit2_attr;
42337+ device_attribute_no_const label_attr;
42338+ device_attribute_no_const input_attr;
42339+ device_attribute_no_const limit1_attr;
42340+ device_attribute_no_const limit2_attr;
42341 char label_attr_name[ATTR_NAME_SIZE];
42342 char input_attr_name[ATTR_NAME_SIZE];
42343 char limit1_attr_name[ATTR_NAME_SIZE];
42344@@ -270,7 +270,7 @@ static ssize_t atk_name_show(struct device *dev,
42345 static struct device_attribute atk_name_attr =
42346 __ATTR(name, 0444, atk_name_show, NULL);
42347
42348-static void atk_init_attribute(struct device_attribute *attr, char *name,
42349+static void atk_init_attribute(device_attribute_no_const *attr, char *name,
42350 sysfs_show_func show)
42351 {
42352 sysfs_attr_init(&attr->attr);
42353diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
42354index 5b7fec8..05c957a 100644
42355--- a/drivers/hwmon/coretemp.c
42356+++ b/drivers/hwmon/coretemp.c
42357@@ -783,7 +783,7 @@ static int coretemp_cpu_callback(struct notifier_block *nfb,
42358 return NOTIFY_OK;
42359 }
42360
42361-static struct notifier_block coretemp_cpu_notifier __refdata = {
42362+static struct notifier_block coretemp_cpu_notifier = {
42363 .notifier_call = coretemp_cpu_callback,
42364 };
42365
42366diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c
42367index 7a8a6fb..015c1fd 100644
42368--- a/drivers/hwmon/ibmaem.c
42369+++ b/drivers/hwmon/ibmaem.c
42370@@ -924,7 +924,7 @@ static int aem_register_sensors(struct aem_data *data,
42371 struct aem_rw_sensor_template *rw)
42372 {
42373 struct device *dev = &data->pdev->dev;
42374- struct sensor_device_attribute *sensors = data->sensors;
42375+ sensor_device_attribute_no_const *sensors = data->sensors;
42376 int err;
42377
42378 /* Set up read-only sensors */
42379diff --git a/drivers/hwmon/iio_hwmon.c b/drivers/hwmon/iio_hwmon.c
42380index 17ae2eb..21b71dd 100644
42381--- a/drivers/hwmon/iio_hwmon.c
42382+++ b/drivers/hwmon/iio_hwmon.c
42383@@ -61,7 +61,7 @@ static int iio_hwmon_probe(struct platform_device *pdev)
42384 {
42385 struct device *dev = &pdev->dev;
42386 struct iio_hwmon_state *st;
42387- struct sensor_device_attribute *a;
42388+ sensor_device_attribute_no_const *a;
42389 int ret, i;
42390 int in_i = 1, temp_i = 1, curr_i = 1, humidity_i = 1;
42391 enum iio_chan_type type;
42392diff --git a/drivers/hwmon/nct6683.c b/drivers/hwmon/nct6683.c
42393index f3830db..9f4d6d5 100644
42394--- a/drivers/hwmon/nct6683.c
42395+++ b/drivers/hwmon/nct6683.c
42396@@ -397,11 +397,11 @@ static struct attribute_group *
42397 nct6683_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42398 int repeat)
42399 {
42400- struct sensor_device_attribute_2 *a2;
42401- struct sensor_device_attribute *a;
42402+ sensor_device_attribute_2_no_const *a2;
42403+ sensor_device_attribute_no_const *a;
42404 struct sensor_device_template **t;
42405 struct sensor_device_attr_u *su;
42406- struct attribute_group *group;
42407+ attribute_group_no_const *group;
42408 struct attribute **attrs;
42409 int i, j, count;
42410
42411diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
42412index 1be4117..88ae1e1 100644
42413--- a/drivers/hwmon/nct6775.c
42414+++ b/drivers/hwmon/nct6775.c
42415@@ -952,10 +952,10 @@ static struct attribute_group *
42416 nct6775_create_attr_group(struct device *dev, struct sensor_template_group *tg,
42417 int repeat)
42418 {
42419- struct attribute_group *group;
42420+ attribute_group_no_const *group;
42421 struct sensor_device_attr_u *su;
42422- struct sensor_device_attribute *a;
42423- struct sensor_device_attribute_2 *a2;
42424+ sensor_device_attribute_no_const *a;
42425+ sensor_device_attribute_2_no_const *a2;
42426 struct attribute **attrs;
42427 struct sensor_device_template **t;
42428 int i, count;
42429diff --git a/drivers/hwmon/pmbus/pmbus_core.c b/drivers/hwmon/pmbus/pmbus_core.c
42430index f2e47c7..45d7941 100644
42431--- a/drivers/hwmon/pmbus/pmbus_core.c
42432+++ b/drivers/hwmon/pmbus/pmbus_core.c
42433@@ -816,7 +816,7 @@ static int pmbus_add_attribute(struct pmbus_data *data, struct attribute *attr)
42434 return 0;
42435 }
42436
42437-static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42438+static void pmbus_dev_attr_init(device_attribute_no_const *dev_attr,
42439 const char *name,
42440 umode_t mode,
42441 ssize_t (*show)(struct device *dev,
42442@@ -833,7 +833,7 @@ static void pmbus_dev_attr_init(struct device_attribute *dev_attr,
42443 dev_attr->store = store;
42444 }
42445
42446-static void pmbus_attr_init(struct sensor_device_attribute *a,
42447+static void pmbus_attr_init(sensor_device_attribute_no_const *a,
42448 const char *name,
42449 umode_t mode,
42450 ssize_t (*show)(struct device *dev,
42451@@ -855,7 +855,7 @@ static int pmbus_add_boolean(struct pmbus_data *data,
42452 u16 reg, u8 mask)
42453 {
42454 struct pmbus_boolean *boolean;
42455- struct sensor_device_attribute *a;
42456+ sensor_device_attribute_no_const *a;
42457
42458 boolean = devm_kzalloc(data->dev, sizeof(*boolean), GFP_KERNEL);
42459 if (!boolean)
42460@@ -880,7 +880,7 @@ static struct pmbus_sensor *pmbus_add_sensor(struct pmbus_data *data,
42461 bool update, bool readonly)
42462 {
42463 struct pmbus_sensor *sensor;
42464- struct device_attribute *a;
42465+ device_attribute_no_const *a;
42466
42467 sensor = devm_kzalloc(data->dev, sizeof(*sensor), GFP_KERNEL);
42468 if (!sensor)
42469@@ -911,7 +911,7 @@ static int pmbus_add_label(struct pmbus_data *data,
42470 const char *lstring, int index)
42471 {
42472 struct pmbus_label *label;
42473- struct device_attribute *a;
42474+ device_attribute_no_const *a;
42475
42476 label = devm_kzalloc(data->dev, sizeof(*label), GFP_KERNEL);
42477 if (!label)
42478diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c
42479index d4f0935..7420593 100644
42480--- a/drivers/hwmon/sht15.c
42481+++ b/drivers/hwmon/sht15.c
42482@@ -169,7 +169,7 @@ struct sht15_data {
42483 int supply_uv;
42484 bool supply_uv_valid;
42485 struct work_struct update_supply_work;
42486- atomic_t interrupt_handled;
42487+ atomic_unchecked_t interrupt_handled;
42488 };
42489
42490 /**
42491@@ -542,13 +542,13 @@ static int sht15_measurement(struct sht15_data *data,
42492 ret = gpio_direction_input(data->pdata->gpio_data);
42493 if (ret)
42494 return ret;
42495- atomic_set(&data->interrupt_handled, 0);
42496+ atomic_set_unchecked(&data->interrupt_handled, 0);
42497
42498 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42499 if (gpio_get_value(data->pdata->gpio_data) == 0) {
42500 disable_irq_nosync(gpio_to_irq(data->pdata->gpio_data));
42501 /* Only relevant if the interrupt hasn't occurred. */
42502- if (!atomic_read(&data->interrupt_handled))
42503+ if (!atomic_read_unchecked(&data->interrupt_handled))
42504 schedule_work(&data->read_work);
42505 }
42506 ret = wait_event_timeout(data->wait_queue,
42507@@ -820,7 +820,7 @@ static irqreturn_t sht15_interrupt_fired(int irq, void *d)
42508
42509 /* First disable the interrupt */
42510 disable_irq_nosync(irq);
42511- atomic_inc(&data->interrupt_handled);
42512+ atomic_inc_unchecked(&data->interrupt_handled);
42513 /* Then schedule a reading work struct */
42514 if (data->state != SHT15_READING_NOTHING)
42515 schedule_work(&data->read_work);
42516@@ -842,11 +842,11 @@ static void sht15_bh_read_data(struct work_struct *work_s)
42517 * If not, then start the interrupt again - care here as could
42518 * have gone low in meantime so verify it hasn't!
42519 */
42520- atomic_set(&data->interrupt_handled, 0);
42521+ atomic_set_unchecked(&data->interrupt_handled, 0);
42522 enable_irq(gpio_to_irq(data->pdata->gpio_data));
42523 /* If still not occurred or another handler was scheduled */
42524 if (gpio_get_value(data->pdata->gpio_data)
42525- || atomic_read(&data->interrupt_handled))
42526+ || atomic_read_unchecked(&data->interrupt_handled))
42527 return;
42528 }
42529
42530diff --git a/drivers/hwmon/via-cputemp.c b/drivers/hwmon/via-cputemp.c
42531index ac91c07..8e69663 100644
42532--- a/drivers/hwmon/via-cputemp.c
42533+++ b/drivers/hwmon/via-cputemp.c
42534@@ -295,7 +295,7 @@ static int via_cputemp_cpu_callback(struct notifier_block *nfb,
42535 return NOTIFY_OK;
42536 }
42537
42538-static struct notifier_block via_cputemp_cpu_notifier __refdata = {
42539+static struct notifier_block via_cputemp_cpu_notifier = {
42540 .notifier_call = via_cputemp_cpu_callback,
42541 };
42542
42543diff --git a/drivers/i2c/busses/i2c-amd756-s4882.c b/drivers/i2c/busses/i2c-amd756-s4882.c
42544index 65e3240..e6c511d 100644
42545--- a/drivers/i2c/busses/i2c-amd756-s4882.c
42546+++ b/drivers/i2c/busses/i2c-amd756-s4882.c
42547@@ -39,7 +39,7 @@
42548 extern struct i2c_adapter amd756_smbus;
42549
42550 static struct i2c_adapter *s4882_adapter;
42551-static struct i2c_algorithm *s4882_algo;
42552+static i2c_algorithm_no_const *s4882_algo;
42553
42554 /* Wrapper access functions for multiplexed SMBus */
42555 static DEFINE_MUTEX(amd756_lock);
42556diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
42557index b19a310..d6eece0 100644
42558--- a/drivers/i2c/busses/i2c-diolan-u2c.c
42559+++ b/drivers/i2c/busses/i2c-diolan-u2c.c
42560@@ -98,7 +98,7 @@ MODULE_PARM_DESC(frequency, "I2C clock frequency in hertz");
42561 /* usb layer */
42562
42563 /* Send command to device, and get response. */
42564-static int diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42565+static int __intentional_overflow(-1) diolan_usb_transfer(struct i2c_diolan_u2c *dev)
42566 {
42567 int ret = 0;
42568 int actual;
42569diff --git a/drivers/i2c/busses/i2c-nforce2-s4985.c b/drivers/i2c/busses/i2c-nforce2-s4985.c
42570index 88eda09..cf40434 100644
42571--- a/drivers/i2c/busses/i2c-nforce2-s4985.c
42572+++ b/drivers/i2c/busses/i2c-nforce2-s4985.c
42573@@ -37,7 +37,7 @@
42574 extern struct i2c_adapter *nforce2_smbus;
42575
42576 static struct i2c_adapter *s4985_adapter;
42577-static struct i2c_algorithm *s4985_algo;
42578+static i2c_algorithm_no_const *s4985_algo;
42579
42580 /* Wrapper access functions for multiplexed SMBus */
42581 static DEFINE_MUTEX(nforce2_lock);
42582diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
42583index 71c7a39..71dd3e0 100644
42584--- a/drivers/i2c/i2c-dev.c
42585+++ b/drivers/i2c/i2c-dev.c
42586@@ -272,7 +272,7 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
42587 break;
42588 }
42589
42590- data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
42591+ data_ptrs[i] = (u8 __force_user *)rdwr_pa[i].buf;
42592 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
42593 if (IS_ERR(rdwr_pa[i].buf)) {
42594 res = PTR_ERR(rdwr_pa[i].buf);
42595diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c
42596index 0b510ba..4fbb5085 100644
42597--- a/drivers/ide/ide-cd.c
42598+++ b/drivers/ide/ide-cd.c
42599@@ -768,7 +768,7 @@ static void cdrom_do_block_pc(ide_drive_t *drive, struct request *rq)
42600 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
42601 if ((unsigned long)buf & alignment
42602 || blk_rq_bytes(rq) & q->dma_pad_mask
42603- || object_is_on_stack(buf))
42604+ || object_starts_on_stack(buf))
42605 drive->dma = 0;
42606 }
42607 }
42608diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
42609index 4df97f6..c751151 100644
42610--- a/drivers/iio/industrialio-core.c
42611+++ b/drivers/iio/industrialio-core.c
42612@@ -570,7 +570,7 @@ static ssize_t iio_write_channel_info(struct device *dev,
42613 }
42614
42615 static
42616-int __iio_device_attr_init(struct device_attribute *dev_attr,
42617+int __iio_device_attr_init(device_attribute_no_const *dev_attr,
42618 const char *postfix,
42619 struct iio_chan_spec const *chan,
42620 ssize_t (*readfunc)(struct device *dev,
42621diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
42622index e28a494..f7c2671 100644
42623--- a/drivers/infiniband/core/cm.c
42624+++ b/drivers/infiniband/core/cm.c
42625@@ -115,7 +115,7 @@ static char const counter_group_names[CM_COUNTER_GROUPS]
42626
42627 struct cm_counter_group {
42628 struct kobject obj;
42629- atomic_long_t counter[CM_ATTR_COUNT];
42630+ atomic_long_unchecked_t counter[CM_ATTR_COUNT];
42631 };
42632
42633 struct cm_counter_attribute {
42634@@ -1398,7 +1398,7 @@ static void cm_dup_req_handler(struct cm_work *work,
42635 struct ib_mad_send_buf *msg = NULL;
42636 int ret;
42637
42638- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42639+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42640 counter[CM_REQ_COUNTER]);
42641
42642 /* Quick state check to discard duplicate REQs. */
42643@@ -1785,7 +1785,7 @@ static void cm_dup_rep_handler(struct cm_work *work)
42644 if (!cm_id_priv)
42645 return;
42646
42647- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42648+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42649 counter[CM_REP_COUNTER]);
42650 ret = cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg);
42651 if (ret)
42652@@ -1952,7 +1952,7 @@ static int cm_rtu_handler(struct cm_work *work)
42653 if (cm_id_priv->id.state != IB_CM_REP_SENT &&
42654 cm_id_priv->id.state != IB_CM_MRA_REP_RCVD) {
42655 spin_unlock_irq(&cm_id_priv->lock);
42656- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42657+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42658 counter[CM_RTU_COUNTER]);
42659 goto out;
42660 }
42661@@ -2135,7 +2135,7 @@ static int cm_dreq_handler(struct cm_work *work)
42662 cm_id_priv = cm_acquire_id(dreq_msg->remote_comm_id,
42663 dreq_msg->local_comm_id);
42664 if (!cm_id_priv) {
42665- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42666+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42667 counter[CM_DREQ_COUNTER]);
42668 cm_issue_drep(work->port, work->mad_recv_wc);
42669 return -EINVAL;
42670@@ -2160,7 +2160,7 @@ static int cm_dreq_handler(struct cm_work *work)
42671 case IB_CM_MRA_REP_RCVD:
42672 break;
42673 case IB_CM_TIMEWAIT:
42674- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42675+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42676 counter[CM_DREQ_COUNTER]);
42677 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42678 goto unlock;
42679@@ -2174,7 +2174,7 @@ static int cm_dreq_handler(struct cm_work *work)
42680 cm_free_msg(msg);
42681 goto deref;
42682 case IB_CM_DREQ_RCVD:
42683- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42684+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42685 counter[CM_DREQ_COUNTER]);
42686 goto unlock;
42687 default:
42688@@ -2541,7 +2541,7 @@ static int cm_mra_handler(struct cm_work *work)
42689 ib_modify_mad(cm_id_priv->av.port->mad_agent,
42690 cm_id_priv->msg, timeout)) {
42691 if (cm_id_priv->id.lap_state == IB_CM_MRA_LAP_RCVD)
42692- atomic_long_inc(&work->port->
42693+ atomic_long_inc_unchecked(&work->port->
42694 counter_group[CM_RECV_DUPLICATES].
42695 counter[CM_MRA_COUNTER]);
42696 goto out;
42697@@ -2550,7 +2550,7 @@ static int cm_mra_handler(struct cm_work *work)
42698 break;
42699 case IB_CM_MRA_REQ_RCVD:
42700 case IB_CM_MRA_REP_RCVD:
42701- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42702+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42703 counter[CM_MRA_COUNTER]);
42704 /* fall through */
42705 default:
42706@@ -2712,7 +2712,7 @@ static int cm_lap_handler(struct cm_work *work)
42707 case IB_CM_LAP_IDLE:
42708 break;
42709 case IB_CM_MRA_LAP_SENT:
42710- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42711+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42712 counter[CM_LAP_COUNTER]);
42713 if (cm_alloc_response_msg(work->port, work->mad_recv_wc, &msg))
42714 goto unlock;
42715@@ -2728,7 +2728,7 @@ static int cm_lap_handler(struct cm_work *work)
42716 cm_free_msg(msg);
42717 goto deref;
42718 case IB_CM_LAP_RCVD:
42719- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42720+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42721 counter[CM_LAP_COUNTER]);
42722 goto unlock;
42723 default:
42724@@ -3012,7 +3012,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
42725 cur_cm_id_priv = cm_insert_remote_sidr(cm_id_priv);
42726 if (cur_cm_id_priv) {
42727 spin_unlock_irq(&cm.lock);
42728- atomic_long_inc(&work->port->counter_group[CM_RECV_DUPLICATES].
42729+ atomic_long_inc_unchecked(&work->port->counter_group[CM_RECV_DUPLICATES].
42730 counter[CM_SIDR_REQ_COUNTER]);
42731 goto out; /* Duplicate message. */
42732 }
42733@@ -3224,10 +3224,10 @@ static void cm_send_handler(struct ib_mad_agent *mad_agent,
42734 if (!msg->context[0] && (attr_index != CM_REJ_COUNTER))
42735 msg->retries = 1;
42736
42737- atomic_long_add(1 + msg->retries,
42738+ atomic_long_add_unchecked(1 + msg->retries,
42739 &port->counter_group[CM_XMIT].counter[attr_index]);
42740 if (msg->retries)
42741- atomic_long_add(msg->retries,
42742+ atomic_long_add_unchecked(msg->retries,
42743 &port->counter_group[CM_XMIT_RETRIES].
42744 counter[attr_index]);
42745
42746@@ -3437,7 +3437,7 @@ static void cm_recv_handler(struct ib_mad_agent *mad_agent,
42747 }
42748
42749 attr_id = be16_to_cpu(mad_recv_wc->recv_buf.mad->mad_hdr.attr_id);
42750- atomic_long_inc(&port->counter_group[CM_RECV].
42751+ atomic_long_inc_unchecked(&port->counter_group[CM_RECV].
42752 counter[attr_id - CM_ATTR_ID_OFFSET]);
42753
42754 work = kmalloc(sizeof *work + sizeof(struct ib_sa_path_rec) * paths,
42755@@ -3668,7 +3668,7 @@ static ssize_t cm_show_counter(struct kobject *obj, struct attribute *attr,
42756 cm_attr = container_of(attr, struct cm_counter_attribute, attr);
42757
42758 return sprintf(buf, "%ld\n",
42759- atomic_long_read(&group->counter[cm_attr->index]));
42760+ atomic_long_read_unchecked(&group->counter[cm_attr->index]));
42761 }
42762
42763 static const struct sysfs_ops cm_counter_ops = {
42764diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c
42765index 9f5ad7c..588cd84 100644
42766--- a/drivers/infiniband/core/fmr_pool.c
42767+++ b/drivers/infiniband/core/fmr_pool.c
42768@@ -98,8 +98,8 @@ struct ib_fmr_pool {
42769
42770 struct task_struct *thread;
42771
42772- atomic_t req_ser;
42773- atomic_t flush_ser;
42774+ atomic_unchecked_t req_ser;
42775+ atomic_unchecked_t flush_ser;
42776
42777 wait_queue_head_t force_wait;
42778 };
42779@@ -179,10 +179,10 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42780 struct ib_fmr_pool *pool = pool_ptr;
42781
42782 do {
42783- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) < 0) {
42784+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) < 0) {
42785 ib_fmr_batch_release(pool);
42786
42787- atomic_inc(&pool->flush_ser);
42788+ atomic_inc_unchecked(&pool->flush_ser);
42789 wake_up_interruptible(&pool->force_wait);
42790
42791 if (pool->flush_function)
42792@@ -190,7 +190,7 @@ static int ib_fmr_cleanup_thread(void *pool_ptr)
42793 }
42794
42795 set_current_state(TASK_INTERRUPTIBLE);
42796- if (atomic_read(&pool->flush_ser) - atomic_read(&pool->req_ser) >= 0 &&
42797+ if (atomic_read_unchecked(&pool->flush_ser) - atomic_read_unchecked(&pool->req_ser) >= 0 &&
42798 !kthread_should_stop())
42799 schedule();
42800 __set_current_state(TASK_RUNNING);
42801@@ -282,8 +282,8 @@ struct ib_fmr_pool *ib_create_fmr_pool(struct ib_pd *pd,
42802 pool->dirty_watermark = params->dirty_watermark;
42803 pool->dirty_len = 0;
42804 spin_lock_init(&pool->pool_lock);
42805- atomic_set(&pool->req_ser, 0);
42806- atomic_set(&pool->flush_ser, 0);
42807+ atomic_set_unchecked(&pool->req_ser, 0);
42808+ atomic_set_unchecked(&pool->flush_ser, 0);
42809 init_waitqueue_head(&pool->force_wait);
42810
42811 pool->thread = kthread_run(ib_fmr_cleanup_thread,
42812@@ -411,11 +411,11 @@ int ib_flush_fmr_pool(struct ib_fmr_pool *pool)
42813 }
42814 spin_unlock_irq(&pool->pool_lock);
42815
42816- serial = atomic_inc_return(&pool->req_ser);
42817+ serial = atomic_inc_return_unchecked(&pool->req_ser);
42818 wake_up_process(pool->thread);
42819
42820 if (wait_event_interruptible(pool->force_wait,
42821- atomic_read(&pool->flush_ser) - serial >= 0))
42822+ atomic_read_unchecked(&pool->flush_ser) - serial >= 0))
42823 return -EINTR;
42824
42825 return 0;
42826@@ -525,7 +525,7 @@ int ib_fmr_pool_unmap(struct ib_pool_fmr *fmr)
42827 } else {
42828 list_add_tail(&fmr->list, &pool->dirty_list);
42829 if (++pool->dirty_len >= pool->dirty_watermark) {
42830- atomic_inc(&pool->req_ser);
42831+ atomic_inc_unchecked(&pool->req_ser);
42832 wake_up_process(pool->thread);
42833 }
42834 }
42835diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c
42836index a9f0489..27a161b 100644
42837--- a/drivers/infiniband/core/uverbs_cmd.c
42838+++ b/drivers/infiniband/core/uverbs_cmd.c
42839@@ -951,6 +951,9 @@ ssize_t ib_uverbs_reg_mr(struct ib_uverbs_file *file,
42840 if (copy_from_user(&cmd, buf, sizeof cmd))
42841 return -EFAULT;
42842
42843+ if (!access_ok_noprefault(VERIFY_READ, cmd.start, cmd.length))
42844+ return -EFAULT;
42845+
42846 INIT_UDATA(&udata, buf + sizeof cmd,
42847 (unsigned long) cmd.response + sizeof resp,
42848 in_len - sizeof cmd, out_len - sizeof resp);
42849diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
42850index 6791fd1..78bdcdf 100644
42851--- a/drivers/infiniband/hw/cxgb4/mem.c
42852+++ b/drivers/infiniband/hw/cxgb4/mem.c
42853@@ -256,7 +256,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42854 int err;
42855 struct fw_ri_tpte tpt;
42856 u32 stag_idx;
42857- static atomic_t key;
42858+ static atomic_unchecked_t key;
42859
42860 if (c4iw_fatal_error(rdev))
42861 return -EIO;
42862@@ -277,7 +277,7 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
42863 if (rdev->stats.stag.cur > rdev->stats.stag.max)
42864 rdev->stats.stag.max = rdev->stats.stag.cur;
42865 mutex_unlock(&rdev->stats.lock);
42866- *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
42867+ *stag = (stag_idx << 8) | (atomic_inc_return_unchecked(&key) & 0xff);
42868 }
42869 PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
42870 __func__, stag_state, type, pdid, stag_idx);
42871diff --git a/drivers/infiniband/hw/ipath/ipath_rc.c b/drivers/infiniband/hw/ipath/ipath_rc.c
42872index 79b3dbc..96e5fcc 100644
42873--- a/drivers/infiniband/hw/ipath/ipath_rc.c
42874+++ b/drivers/infiniband/hw/ipath/ipath_rc.c
42875@@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42876 struct ib_atomic_eth *ateth;
42877 struct ipath_ack_entry *e;
42878 u64 vaddr;
42879- atomic64_t *maddr;
42880+ atomic64_unchecked_t *maddr;
42881 u64 sdata;
42882 u32 rkey;
42883 u8 next;
42884@@ -1903,11 +1903,11 @@ void ipath_rc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr,
42885 IB_ACCESS_REMOTE_ATOMIC)))
42886 goto nack_acc_unlck;
42887 /* Perform atomic OP and save result. */
42888- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42889+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42890 sdata = be64_to_cpu(ateth->swap_data);
42891 e = &qp->s_ack_queue[qp->r_head_ack_queue];
42892 e->atomic_data = (opcode == OP(FETCH_ADD)) ?
42893- (u64) atomic64_add_return(sdata, maddr) - sdata :
42894+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42895 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42896 be64_to_cpu(ateth->compare_data),
42897 sdata);
42898diff --git a/drivers/infiniband/hw/ipath/ipath_ruc.c b/drivers/infiniband/hw/ipath/ipath_ruc.c
42899index 1f95bba..9530f87 100644
42900--- a/drivers/infiniband/hw/ipath/ipath_ruc.c
42901+++ b/drivers/infiniband/hw/ipath/ipath_ruc.c
42902@@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ipath_qp *sqp)
42903 unsigned long flags;
42904 struct ib_wc wc;
42905 u64 sdata;
42906- atomic64_t *maddr;
42907+ atomic64_unchecked_t *maddr;
42908 enum ib_wc_status send_status;
42909
42910 /*
42911@@ -382,11 +382,11 @@ again:
42912 IB_ACCESS_REMOTE_ATOMIC)))
42913 goto acc_err;
42914 /* Perform atomic OP and save result. */
42915- maddr = (atomic64_t *) qp->r_sge.sge.vaddr;
42916+ maddr = (atomic64_unchecked_t *) qp->r_sge.sge.vaddr;
42917 sdata = wqe->wr.wr.atomic.compare_add;
42918 *(u64 *) sqp->s_sge.sge.vaddr =
42919 (wqe->wr.opcode == IB_WR_ATOMIC_FETCH_AND_ADD) ?
42920- (u64) atomic64_add_return(sdata, maddr) - sdata :
42921+ (u64) atomic64_add_return_unchecked(sdata, maddr) - sdata :
42922 (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
42923 sdata, wqe->wr.wr.atomic.swap);
42924 goto send_comp;
42925diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
42926index 5904026..f1c30e5 100644
42927--- a/drivers/infiniband/hw/mlx4/mad.c
42928+++ b/drivers/infiniband/hw/mlx4/mad.c
42929@@ -106,7 +106,7 @@ __be64 mlx4_ib_gen_node_guid(void)
42930
42931 __be64 mlx4_ib_get_new_demux_tid(struct mlx4_ib_demux_ctx *ctx)
42932 {
42933- return cpu_to_be64(atomic_inc_return(&ctx->tid)) |
42934+ return cpu_to_be64(atomic_inc_return_unchecked(&ctx->tid)) |
42935 cpu_to_be64(0xff00000000000000LL);
42936 }
42937
42938diff --git a/drivers/infiniband/hw/mlx4/mcg.c b/drivers/infiniband/hw/mlx4/mcg.c
42939index ed327e6..ca1739e0 100644
42940--- a/drivers/infiniband/hw/mlx4/mcg.c
42941+++ b/drivers/infiniband/hw/mlx4/mcg.c
42942@@ -1041,7 +1041,7 @@ int mlx4_ib_mcg_port_init(struct mlx4_ib_demux_ctx *ctx)
42943 {
42944 char name[20];
42945
42946- atomic_set(&ctx->tid, 0);
42947+ atomic_set_unchecked(&ctx->tid, 0);
42948 sprintf(name, "mlx4_ib_mcg%d", ctx->port);
42949 ctx->mcg_wq = create_singlethread_workqueue(name);
42950 if (!ctx->mcg_wq)
42951diff --git a/drivers/infiniband/hw/mlx4/mlx4_ib.h b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42952index f829fd9..1a8d436 100644
42953--- a/drivers/infiniband/hw/mlx4/mlx4_ib.h
42954+++ b/drivers/infiniband/hw/mlx4/mlx4_ib.h
42955@@ -439,7 +439,7 @@ struct mlx4_ib_demux_ctx {
42956 struct list_head mcg_mgid0_list;
42957 struct workqueue_struct *mcg_wq;
42958 struct mlx4_ib_demux_pv_ctx **tun;
42959- atomic_t tid;
42960+ atomic_unchecked_t tid;
42961 int flushing; /* flushing the work queue */
42962 };
42963
42964diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
42965index 9d3e5c1..6f166df 100644
42966--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
42967+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
42968@@ -772,7 +772,7 @@ static void mthca_setup_cmd_doorbells(struct mthca_dev *dev, u64 base)
42969 mthca_dbg(dev, "Mapped doorbell page for posting FW commands\n");
42970 }
42971
42972-int mthca_QUERY_FW(struct mthca_dev *dev)
42973+int __intentional_overflow(-1) mthca_QUERY_FW(struct mthca_dev *dev)
42974 {
42975 struct mthca_mailbox *mailbox;
42976 u32 *outbox;
42977@@ -1612,7 +1612,7 @@ int mthca_HW2SW_MPT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42978 CMD_TIME_CLASS_B);
42979 }
42980
42981-int mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42982+int __intentional_overflow(-1) mthca_WRITE_MTT(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42983 int num_mtt)
42984 {
42985 return mthca_cmd(dev, mailbox->dma, num_mtt, 0, CMD_WRITE_MTT,
42986@@ -1634,7 +1634,7 @@ int mthca_MAP_EQ(struct mthca_dev *dev, u64 event_mask, int unmap,
42987 0, CMD_MAP_EQ, CMD_TIME_CLASS_B);
42988 }
42989
42990-int mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42991+int __intentional_overflow(-1) mthca_SW2HW_EQ(struct mthca_dev *dev, struct mthca_mailbox *mailbox,
42992 int eq_num)
42993 {
42994 return mthca_cmd(dev, mailbox->dma, eq_num, 0, CMD_SW2HW_EQ,
42995@@ -1857,7 +1857,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn)
42996 CMD_TIME_CLASS_B);
42997 }
42998
42999-int mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43000+int __intentional_overflow(-1) mthca_MAD_IFC(struct mthca_dev *dev, int ignore_mkey, int ignore_bkey,
43001 int port, struct ib_wc *in_wc, struct ib_grh *in_grh,
43002 void *in_mad, void *response_mad)
43003 {
43004diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
43005index ded76c1..0cf0a08 100644
43006--- a/drivers/infiniband/hw/mthca/mthca_main.c
43007+++ b/drivers/infiniband/hw/mthca/mthca_main.c
43008@@ -692,7 +692,7 @@ err_close:
43009 return err;
43010 }
43011
43012-static int mthca_setup_hca(struct mthca_dev *dev)
43013+static int __intentional_overflow(-1) mthca_setup_hca(struct mthca_dev *dev)
43014 {
43015 int err;
43016
43017diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
43018index ed9a989..6aa5dc2 100644
43019--- a/drivers/infiniband/hw/mthca/mthca_mr.c
43020+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
43021@@ -81,7 +81,7 @@ struct mthca_mpt_entry {
43022 * through the bitmaps)
43023 */
43024
43025-static u32 mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43026+static u32 __intentional_overflow(-1) mthca_buddy_alloc(struct mthca_buddy *buddy, int order)
43027 {
43028 int o;
43029 int m;
43030@@ -426,7 +426,7 @@ static inline u32 adjust_key(struct mthca_dev *dev, u32 key)
43031 return key;
43032 }
43033
43034-int mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43035+int __intentional_overflow(-1) mthca_mr_alloc(struct mthca_dev *dev, u32 pd, int buffer_size_shift,
43036 u64 iova, u64 total_size, u32 access, struct mthca_mr *mr)
43037 {
43038 struct mthca_mailbox *mailbox;
43039@@ -516,7 +516,7 @@ int mthca_mr_alloc_notrans(struct mthca_dev *dev, u32 pd,
43040 return mthca_mr_alloc(dev, pd, 12, 0, ~0ULL, access, mr);
43041 }
43042
43043-int mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43044+int __intentional_overflow(-1) mthca_mr_alloc_phys(struct mthca_dev *dev, u32 pd,
43045 u64 *buffer_list, int buffer_size_shift,
43046 int list_len, u64 iova, u64 total_size,
43047 u32 access, struct mthca_mr *mr)
43048diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c
43049index 415f8e1..e34214e 100644
43050--- a/drivers/infiniband/hw/mthca/mthca_provider.c
43051+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
43052@@ -764,7 +764,7 @@ unlock:
43053 return 0;
43054 }
43055
43056-static int mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43057+static int __intentional_overflow(-1) mthca_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata)
43058 {
43059 struct mthca_dev *dev = to_mdev(ibcq->device);
43060 struct mthca_cq *cq = to_mcq(ibcq);
43061diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
43062index 3b2a6dc..bce26ff 100644
43063--- a/drivers/infiniband/hw/nes/nes.c
43064+++ b/drivers/infiniband/hw/nes/nes.c
43065@@ -97,7 +97,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limit max read request size to 256 Bytes");
43066 LIST_HEAD(nes_adapter_list);
43067 static LIST_HEAD(nes_dev_list);
43068
43069-atomic_t qps_destroyed;
43070+atomic_unchecked_t qps_destroyed;
43071
43072 static unsigned int ee_flsh_adapter;
43073 static unsigned int sysfs_nonidx_addr;
43074@@ -278,7 +278,7 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
43075 struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
43076 struct nes_adapter *nesadapter = nesdev->nesadapter;
43077
43078- atomic_inc(&qps_destroyed);
43079+ atomic_inc_unchecked(&qps_destroyed);
43080
43081 /* Free the control structures */
43082
43083diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
43084index bd9d132..70d84f4 100644
43085--- a/drivers/infiniband/hw/nes/nes.h
43086+++ b/drivers/infiniband/hw/nes/nes.h
43087@@ -180,17 +180,17 @@ extern unsigned int nes_debug_level;
43088 extern unsigned int wqm_quanta;
43089 extern struct list_head nes_adapter_list;
43090
43091-extern atomic_t cm_connects;
43092-extern atomic_t cm_accepts;
43093-extern atomic_t cm_disconnects;
43094-extern atomic_t cm_closes;
43095-extern atomic_t cm_connecteds;
43096-extern atomic_t cm_connect_reqs;
43097-extern atomic_t cm_rejects;
43098-extern atomic_t mod_qp_timouts;
43099-extern atomic_t qps_created;
43100-extern atomic_t qps_destroyed;
43101-extern atomic_t sw_qps_destroyed;
43102+extern atomic_unchecked_t cm_connects;
43103+extern atomic_unchecked_t cm_accepts;
43104+extern atomic_unchecked_t cm_disconnects;
43105+extern atomic_unchecked_t cm_closes;
43106+extern atomic_unchecked_t cm_connecteds;
43107+extern atomic_unchecked_t cm_connect_reqs;
43108+extern atomic_unchecked_t cm_rejects;
43109+extern atomic_unchecked_t mod_qp_timouts;
43110+extern atomic_unchecked_t qps_created;
43111+extern atomic_unchecked_t qps_destroyed;
43112+extern atomic_unchecked_t sw_qps_destroyed;
43113 extern u32 mh_detected;
43114 extern u32 mh_pauses_sent;
43115 extern u32 cm_packets_sent;
43116@@ -199,16 +199,16 @@ extern u32 cm_packets_created;
43117 extern u32 cm_packets_received;
43118 extern u32 cm_packets_dropped;
43119 extern u32 cm_packets_retrans;
43120-extern atomic_t cm_listens_created;
43121-extern atomic_t cm_listens_destroyed;
43122+extern atomic_unchecked_t cm_listens_created;
43123+extern atomic_unchecked_t cm_listens_destroyed;
43124 extern u32 cm_backlog_drops;
43125-extern atomic_t cm_loopbacks;
43126-extern atomic_t cm_nodes_created;
43127-extern atomic_t cm_nodes_destroyed;
43128-extern atomic_t cm_accel_dropped_pkts;
43129-extern atomic_t cm_resets_recvd;
43130-extern atomic_t pau_qps_created;
43131-extern atomic_t pau_qps_destroyed;
43132+extern atomic_unchecked_t cm_loopbacks;
43133+extern atomic_unchecked_t cm_nodes_created;
43134+extern atomic_unchecked_t cm_nodes_destroyed;
43135+extern atomic_unchecked_t cm_accel_dropped_pkts;
43136+extern atomic_unchecked_t cm_resets_recvd;
43137+extern atomic_unchecked_t pau_qps_created;
43138+extern atomic_unchecked_t pau_qps_destroyed;
43139
43140 extern u32 int_mod_timer_init;
43141 extern u32 int_mod_cq_depth_256;
43142diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
43143index 6f09a72..cf4399d 100644
43144--- a/drivers/infiniband/hw/nes/nes_cm.c
43145+++ b/drivers/infiniband/hw/nes/nes_cm.c
43146@@ -69,14 +69,14 @@ u32 cm_packets_dropped;
43147 u32 cm_packets_retrans;
43148 u32 cm_packets_created;
43149 u32 cm_packets_received;
43150-atomic_t cm_listens_created;
43151-atomic_t cm_listens_destroyed;
43152+atomic_unchecked_t cm_listens_created;
43153+atomic_unchecked_t cm_listens_destroyed;
43154 u32 cm_backlog_drops;
43155-atomic_t cm_loopbacks;
43156-atomic_t cm_nodes_created;
43157-atomic_t cm_nodes_destroyed;
43158-atomic_t cm_accel_dropped_pkts;
43159-atomic_t cm_resets_recvd;
43160+atomic_unchecked_t cm_loopbacks;
43161+atomic_unchecked_t cm_nodes_created;
43162+atomic_unchecked_t cm_nodes_destroyed;
43163+atomic_unchecked_t cm_accel_dropped_pkts;
43164+atomic_unchecked_t cm_resets_recvd;
43165
43166 static inline int mini_cm_accelerated(struct nes_cm_core *, struct nes_cm_node *);
43167 static struct nes_cm_listener *mini_cm_listen(struct nes_cm_core *, struct nes_vnic *, struct nes_cm_info *);
43168@@ -135,28 +135,28 @@ static void record_ird_ord(struct nes_cm_node *, u16, u16);
43169 /* instance of function pointers for client API */
43170 /* set address of this instance to cm_core->cm_ops at cm_core alloc */
43171 static struct nes_cm_ops nes_cm_api = {
43172- mini_cm_accelerated,
43173- mini_cm_listen,
43174- mini_cm_del_listen,
43175- mini_cm_connect,
43176- mini_cm_close,
43177- mini_cm_accept,
43178- mini_cm_reject,
43179- mini_cm_recv_pkt,
43180- mini_cm_dealloc_core,
43181- mini_cm_get,
43182- mini_cm_set
43183+ .accelerated = mini_cm_accelerated,
43184+ .listen = mini_cm_listen,
43185+ .stop_listener = mini_cm_del_listen,
43186+ .connect = mini_cm_connect,
43187+ .close = mini_cm_close,
43188+ .accept = mini_cm_accept,
43189+ .reject = mini_cm_reject,
43190+ .recv_pkt = mini_cm_recv_pkt,
43191+ .destroy_cm_core = mini_cm_dealloc_core,
43192+ .get = mini_cm_get,
43193+ .set = mini_cm_set
43194 };
43195
43196 static struct nes_cm_core *g_cm_core;
43197
43198-atomic_t cm_connects;
43199-atomic_t cm_accepts;
43200-atomic_t cm_disconnects;
43201-atomic_t cm_closes;
43202-atomic_t cm_connecteds;
43203-atomic_t cm_connect_reqs;
43204-atomic_t cm_rejects;
43205+atomic_unchecked_t cm_connects;
43206+atomic_unchecked_t cm_accepts;
43207+atomic_unchecked_t cm_disconnects;
43208+atomic_unchecked_t cm_closes;
43209+atomic_unchecked_t cm_connecteds;
43210+atomic_unchecked_t cm_connect_reqs;
43211+atomic_unchecked_t cm_rejects;
43212
43213 int nes_add_ref_cm_node(struct nes_cm_node *cm_node)
43214 {
43215@@ -1436,7 +1436,7 @@ static int mini_cm_dec_refcnt_listen(struct nes_cm_core *cm_core,
43216 kfree(listener);
43217 listener = NULL;
43218 ret = 0;
43219- atomic_inc(&cm_listens_destroyed);
43220+ atomic_inc_unchecked(&cm_listens_destroyed);
43221 } else {
43222 spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
43223 }
43224@@ -1637,7 +1637,7 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
43225 cm_node->rem_mac);
43226
43227 add_hte_node(cm_core, cm_node);
43228- atomic_inc(&cm_nodes_created);
43229+ atomic_inc_unchecked(&cm_nodes_created);
43230
43231 return cm_node;
43232 }
43233@@ -1698,7 +1698,7 @@ static int rem_ref_cm_node(struct nes_cm_core *cm_core,
43234 }
43235
43236 atomic_dec(&cm_core->node_cnt);
43237- atomic_inc(&cm_nodes_destroyed);
43238+ atomic_inc_unchecked(&cm_nodes_destroyed);
43239 nesqp = cm_node->nesqp;
43240 if (nesqp) {
43241 nesqp->cm_node = NULL;
43242@@ -1762,7 +1762,7 @@ static int process_options(struct nes_cm_node *cm_node, u8 *optionsloc,
43243
43244 static void drop_packet(struct sk_buff *skb)
43245 {
43246- atomic_inc(&cm_accel_dropped_pkts);
43247+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43248 dev_kfree_skb_any(skb);
43249 }
43250
43251@@ -1825,7 +1825,7 @@ static void handle_rst_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
43252 {
43253
43254 int reset = 0; /* whether to send reset in case of err.. */
43255- atomic_inc(&cm_resets_recvd);
43256+ atomic_inc_unchecked(&cm_resets_recvd);
43257 nes_debug(NES_DBG_CM, "Received Reset, cm_node = %p, state = %u."
43258 " refcnt=%d\n", cm_node, cm_node->state,
43259 atomic_read(&cm_node->ref_count));
43260@@ -2492,7 +2492,7 @@ static struct nes_cm_node *mini_cm_connect(struct nes_cm_core *cm_core,
43261 rem_ref_cm_node(cm_node->cm_core, cm_node);
43262 return NULL;
43263 }
43264- atomic_inc(&cm_loopbacks);
43265+ atomic_inc_unchecked(&cm_loopbacks);
43266 loopbackremotenode->loopbackpartner = cm_node;
43267 loopbackremotenode->tcp_cntxt.rcv_wscale =
43268 NES_CM_DEFAULT_RCV_WND_SCALE;
43269@@ -2773,7 +2773,7 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
43270 nes_queue_mgt_skbs(skb, nesvnic, cm_node->nesqp);
43271 else {
43272 rem_ref_cm_node(cm_core, cm_node);
43273- atomic_inc(&cm_accel_dropped_pkts);
43274+ atomic_inc_unchecked(&cm_accel_dropped_pkts);
43275 dev_kfree_skb_any(skb);
43276 }
43277 break;
43278@@ -3081,7 +3081,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43279
43280 if ((cm_id) && (cm_id->event_handler)) {
43281 if (issue_disconn) {
43282- atomic_inc(&cm_disconnects);
43283+ atomic_inc_unchecked(&cm_disconnects);
43284 cm_event.event = IW_CM_EVENT_DISCONNECT;
43285 cm_event.status = disconn_status;
43286 cm_event.local_addr = cm_id->local_addr;
43287@@ -3103,7 +3103,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
43288 }
43289
43290 if (issue_close) {
43291- atomic_inc(&cm_closes);
43292+ atomic_inc_unchecked(&cm_closes);
43293 nes_disconnect(nesqp, 1);
43294
43295 cm_id->provider_data = nesqp;
43296@@ -3241,7 +3241,7 @@ int nes_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43297
43298 nes_debug(NES_DBG_CM, "QP%u, cm_node=%p, jiffies = %lu listener = %p\n",
43299 nesqp->hwqp.qp_id, cm_node, jiffies, cm_node->listener);
43300- atomic_inc(&cm_accepts);
43301+ atomic_inc_unchecked(&cm_accepts);
43302
43303 nes_debug(NES_DBG_CM, "netdev refcnt = %u.\n",
43304 netdev_refcnt_read(nesvnic->netdev));
43305@@ -3439,7 +3439,7 @@ int nes_reject(struct iw_cm_id *cm_id, const void *pdata, u8 pdata_len)
43306 struct nes_cm_core *cm_core;
43307 u8 *start_buff;
43308
43309- atomic_inc(&cm_rejects);
43310+ atomic_inc_unchecked(&cm_rejects);
43311 cm_node = (struct nes_cm_node *)cm_id->provider_data;
43312 loopback = cm_node->loopbackpartner;
43313 cm_core = cm_node->cm_core;
43314@@ -3504,7 +3504,7 @@ int nes_connect(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param)
43315 ntohs(raddr->sin_port), ntohl(laddr->sin_addr.s_addr),
43316 ntohs(laddr->sin_port));
43317
43318- atomic_inc(&cm_connects);
43319+ atomic_inc_unchecked(&cm_connects);
43320 nesqp->active_conn = 1;
43321
43322 /* cache the cm_id in the qp */
43323@@ -3649,7 +3649,7 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
43324 g_cm_core->api->stop_listener(g_cm_core, (void *)cm_node);
43325 return err;
43326 }
43327- atomic_inc(&cm_listens_created);
43328+ atomic_inc_unchecked(&cm_listens_created);
43329 }
43330
43331 cm_id->add_ref(cm_id);
43332@@ -3756,7 +3756,7 @@ static void cm_event_connected(struct nes_cm_event *event)
43333
43334 if (nesqp->destroyed)
43335 return;
43336- atomic_inc(&cm_connecteds);
43337+ atomic_inc_unchecked(&cm_connecteds);
43338 nes_debug(NES_DBG_CM, "QP%u attempting to connect to 0x%08X:0x%04X on"
43339 " local port 0x%04X. jiffies = %lu.\n",
43340 nesqp->hwqp.qp_id, ntohl(raddr->sin_addr.s_addr),
43341@@ -3941,7 +3941,7 @@ static void cm_event_reset(struct nes_cm_event *event)
43342
43343 cm_id->add_ref(cm_id);
43344 ret = cm_id->event_handler(cm_id, &cm_event);
43345- atomic_inc(&cm_closes);
43346+ atomic_inc_unchecked(&cm_closes);
43347 cm_event.event = IW_CM_EVENT_CLOSE;
43348 cm_event.status = 0;
43349 cm_event.provider_data = cm_id->provider_data;
43350@@ -3981,7 +3981,7 @@ static void cm_event_mpa_req(struct nes_cm_event *event)
43351 return;
43352 cm_id = cm_node->cm_id;
43353
43354- atomic_inc(&cm_connect_reqs);
43355+ atomic_inc_unchecked(&cm_connect_reqs);
43356 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43357 cm_node, cm_id, jiffies);
43358
43359@@ -4030,7 +4030,7 @@ static void cm_event_mpa_reject(struct nes_cm_event *event)
43360 return;
43361 cm_id = cm_node->cm_id;
43362
43363- atomic_inc(&cm_connect_reqs);
43364+ atomic_inc_unchecked(&cm_connect_reqs);
43365 nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
43366 cm_node, cm_id, jiffies);
43367
43368diff --git a/drivers/infiniband/hw/nes/nes_mgt.c b/drivers/infiniband/hw/nes/nes_mgt.c
43369index 4166452..fc952c3 100644
43370--- a/drivers/infiniband/hw/nes/nes_mgt.c
43371+++ b/drivers/infiniband/hw/nes/nes_mgt.c
43372@@ -40,8 +40,8 @@
43373 #include "nes.h"
43374 #include "nes_mgt.h"
43375
43376-atomic_t pau_qps_created;
43377-atomic_t pau_qps_destroyed;
43378+atomic_unchecked_t pau_qps_created;
43379+atomic_unchecked_t pau_qps_destroyed;
43380
43381 static void nes_replenish_mgt_rq(struct nes_vnic_mgt *mgtvnic)
43382 {
43383@@ -621,7 +621,7 @@ void nes_destroy_pau_qp(struct nes_device *nesdev, struct nes_qp *nesqp)
43384 {
43385 struct sk_buff *skb;
43386 unsigned long flags;
43387- atomic_inc(&pau_qps_destroyed);
43388+ atomic_inc_unchecked(&pau_qps_destroyed);
43389
43390 /* Free packets that have not yet been forwarded */
43391 /* Lock is acquired by skb_dequeue when removing the skb */
43392@@ -810,7 +810,7 @@ static void nes_mgt_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *
43393 cq->cq_vbase[head].cqe_words[NES_NIC_CQE_HASH_RCVNXT]);
43394 skb_queue_head_init(&nesqp->pau_list);
43395 spin_lock_init(&nesqp->pau_lock);
43396- atomic_inc(&pau_qps_created);
43397+ atomic_inc_unchecked(&pau_qps_created);
43398 nes_change_quad_hash(nesdev, mgtvnic->nesvnic, nesqp);
43399 }
43400
43401diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
43402index 70acda9..a96de9d 100644
43403--- a/drivers/infiniband/hw/nes/nes_nic.c
43404+++ b/drivers/infiniband/hw/nes/nes_nic.c
43405@@ -1274,39 +1274,39 @@ static void nes_netdev_get_ethtool_stats(struct net_device *netdev,
43406 target_stat_values[++index] = mh_detected;
43407 target_stat_values[++index] = mh_pauses_sent;
43408 target_stat_values[++index] = nesvnic->endnode_ipv4_tcp_retransmits;
43409- target_stat_values[++index] = atomic_read(&cm_connects);
43410- target_stat_values[++index] = atomic_read(&cm_accepts);
43411- target_stat_values[++index] = atomic_read(&cm_disconnects);
43412- target_stat_values[++index] = atomic_read(&cm_connecteds);
43413- target_stat_values[++index] = atomic_read(&cm_connect_reqs);
43414- target_stat_values[++index] = atomic_read(&cm_rejects);
43415- target_stat_values[++index] = atomic_read(&mod_qp_timouts);
43416- target_stat_values[++index] = atomic_read(&qps_created);
43417- target_stat_values[++index] = atomic_read(&sw_qps_destroyed);
43418- target_stat_values[++index] = atomic_read(&qps_destroyed);
43419- target_stat_values[++index] = atomic_read(&cm_closes);
43420+ target_stat_values[++index] = atomic_read_unchecked(&cm_connects);
43421+ target_stat_values[++index] = atomic_read_unchecked(&cm_accepts);
43422+ target_stat_values[++index] = atomic_read_unchecked(&cm_disconnects);
43423+ target_stat_values[++index] = atomic_read_unchecked(&cm_connecteds);
43424+ target_stat_values[++index] = atomic_read_unchecked(&cm_connect_reqs);
43425+ target_stat_values[++index] = atomic_read_unchecked(&cm_rejects);
43426+ target_stat_values[++index] = atomic_read_unchecked(&mod_qp_timouts);
43427+ target_stat_values[++index] = atomic_read_unchecked(&qps_created);
43428+ target_stat_values[++index] = atomic_read_unchecked(&sw_qps_destroyed);
43429+ target_stat_values[++index] = atomic_read_unchecked(&qps_destroyed);
43430+ target_stat_values[++index] = atomic_read_unchecked(&cm_closes);
43431 target_stat_values[++index] = cm_packets_sent;
43432 target_stat_values[++index] = cm_packets_bounced;
43433 target_stat_values[++index] = cm_packets_created;
43434 target_stat_values[++index] = cm_packets_received;
43435 target_stat_values[++index] = cm_packets_dropped;
43436 target_stat_values[++index] = cm_packets_retrans;
43437- target_stat_values[++index] = atomic_read(&cm_listens_created);
43438- target_stat_values[++index] = atomic_read(&cm_listens_destroyed);
43439+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_created);
43440+ target_stat_values[++index] = atomic_read_unchecked(&cm_listens_destroyed);
43441 target_stat_values[++index] = cm_backlog_drops;
43442- target_stat_values[++index] = atomic_read(&cm_loopbacks);
43443- target_stat_values[++index] = atomic_read(&cm_nodes_created);
43444- target_stat_values[++index] = atomic_read(&cm_nodes_destroyed);
43445- target_stat_values[++index] = atomic_read(&cm_accel_dropped_pkts);
43446- target_stat_values[++index] = atomic_read(&cm_resets_recvd);
43447+ target_stat_values[++index] = atomic_read_unchecked(&cm_loopbacks);
43448+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_created);
43449+ target_stat_values[++index] = atomic_read_unchecked(&cm_nodes_destroyed);
43450+ target_stat_values[++index] = atomic_read_unchecked(&cm_accel_dropped_pkts);
43451+ target_stat_values[++index] = atomic_read_unchecked(&cm_resets_recvd);
43452 target_stat_values[++index] = nesadapter->free_4kpbl;
43453 target_stat_values[++index] = nesadapter->free_256pbl;
43454 target_stat_values[++index] = int_mod_timer_init;
43455 target_stat_values[++index] = nesvnic->lro_mgr.stats.aggregated;
43456 target_stat_values[++index] = nesvnic->lro_mgr.stats.flushed;
43457 target_stat_values[++index] = nesvnic->lro_mgr.stats.no_desc;
43458- target_stat_values[++index] = atomic_read(&pau_qps_created);
43459- target_stat_values[++index] = atomic_read(&pau_qps_destroyed);
43460+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_created);
43461+ target_stat_values[++index] = atomic_read_unchecked(&pau_qps_destroyed);
43462 }
43463
43464 /**
43465diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
43466index c0d0296..3185f57 100644
43467--- a/drivers/infiniband/hw/nes/nes_verbs.c
43468+++ b/drivers/infiniband/hw/nes/nes_verbs.c
43469@@ -46,9 +46,9 @@
43470
43471 #include <rdma/ib_umem.h>
43472
43473-atomic_t mod_qp_timouts;
43474-atomic_t qps_created;
43475-atomic_t sw_qps_destroyed;
43476+atomic_unchecked_t mod_qp_timouts;
43477+atomic_unchecked_t qps_created;
43478+atomic_unchecked_t sw_qps_destroyed;
43479
43480 static void nes_unregister_ofa_device(struct nes_ib_device *nesibdev);
43481
43482@@ -1134,7 +1134,7 @@ static struct ib_qp *nes_create_qp(struct ib_pd *ibpd,
43483 if (init_attr->create_flags)
43484 return ERR_PTR(-EINVAL);
43485
43486- atomic_inc(&qps_created);
43487+ atomic_inc_unchecked(&qps_created);
43488 switch (init_attr->qp_type) {
43489 case IB_QPT_RC:
43490 if (nes_drv_opt & NES_DRV_OPT_NO_INLINE_DATA) {
43491@@ -1468,7 +1468,7 @@ static int nes_destroy_qp(struct ib_qp *ibqp)
43492 struct iw_cm_event cm_event;
43493 int ret = 0;
43494
43495- atomic_inc(&sw_qps_destroyed);
43496+ atomic_inc_unchecked(&sw_qps_destroyed);
43497 nesqp->destroyed = 1;
43498
43499 /* Blow away the connection if it exists. */
43500diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
43501index ffd48bf..83cdb56 100644
43502--- a/drivers/infiniband/hw/qib/qib.h
43503+++ b/drivers/infiniband/hw/qib/qib.h
43504@@ -52,6 +52,7 @@
43505 #include <linux/kref.h>
43506 #include <linux/sched.h>
43507 #include <linux/kthread.h>
43508+#include <linux/slab.h>
43509
43510 #include "qib_common.h"
43511 #include "qib_verbs.h"
43512diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43513index cdc7df4..a2fdfdb 100644
43514--- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43515+++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
43516@@ -156,7 +156,7 @@ static size_t ipoib_get_size(const struct net_device *dev)
43517 nla_total_size(2); /* IFLA_IPOIB_UMCAST */
43518 }
43519
43520-static struct rtnl_link_ops ipoib_link_ops __read_mostly = {
43521+static struct rtnl_link_ops ipoib_link_ops = {
43522 .kind = "ipoib",
43523 .maxtype = IFLA_IPOIB_MAX,
43524 .policy = ipoib_policy,
43525diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
43526index e853a21..56fc5a8 100644
43527--- a/drivers/input/gameport/gameport.c
43528+++ b/drivers/input/gameport/gameport.c
43529@@ -527,14 +527,14 @@ EXPORT_SYMBOL(gameport_set_phys);
43530 */
43531 static void gameport_init_port(struct gameport *gameport)
43532 {
43533- static atomic_t gameport_no = ATOMIC_INIT(-1);
43534+ static atomic_unchecked_t gameport_no = ATOMIC_INIT(-1);
43535
43536 __module_get(THIS_MODULE);
43537
43538 mutex_init(&gameport->drv_mutex);
43539 device_initialize(&gameport->dev);
43540 dev_set_name(&gameport->dev, "gameport%lu",
43541- (unsigned long)atomic_inc_return(&gameport_no));
43542+ (unsigned long)atomic_inc_return_unchecked(&gameport_no));
43543 gameport->dev.bus = &gameport_bus;
43544 gameport->dev.release = gameport_release_port;
43545 if (gameport->parent)
43546diff --git a/drivers/input/input.c b/drivers/input/input.c
43547index cc357f1..ee42fbc 100644
43548--- a/drivers/input/input.c
43549+++ b/drivers/input/input.c
43550@@ -1781,7 +1781,7 @@ EXPORT_SYMBOL_GPL(input_class);
43551 */
43552 struct input_dev *input_allocate_device(void)
43553 {
43554- static atomic_t input_no = ATOMIC_INIT(-1);
43555+ static atomic_unchecked_t input_no = ATOMIC_INIT(-1);
43556 struct input_dev *dev;
43557
43558 dev = kzalloc(sizeof(struct input_dev), GFP_KERNEL);
43559@@ -1796,7 +1796,7 @@ struct input_dev *input_allocate_device(void)
43560 INIT_LIST_HEAD(&dev->node);
43561
43562 dev_set_name(&dev->dev, "input%lu",
43563- (unsigned long)atomic_inc_return(&input_no));
43564+ (unsigned long)atomic_inc_return_unchecked(&input_no));
43565
43566 __module_get(THIS_MODULE);
43567 }
43568diff --git a/drivers/input/joystick/sidewinder.c b/drivers/input/joystick/sidewinder.c
43569index 4a95b22..874c182 100644
43570--- a/drivers/input/joystick/sidewinder.c
43571+++ b/drivers/input/joystick/sidewinder.c
43572@@ -30,6 +30,7 @@
43573 #include <linux/kernel.h>
43574 #include <linux/module.h>
43575 #include <linux/slab.h>
43576+#include <linux/sched.h>
43577 #include <linux/input.h>
43578 #include <linux/gameport.h>
43579 #include <linux/jiffies.h>
43580diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
43581index 3aa2f3f..53c00ea 100644
43582--- a/drivers/input/joystick/xpad.c
43583+++ b/drivers/input/joystick/xpad.c
43584@@ -886,7 +886,7 @@ static void xpad_led_set(struct led_classdev *led_cdev,
43585
43586 static int xpad_led_probe(struct usb_xpad *xpad)
43587 {
43588- static atomic_t led_seq = ATOMIC_INIT(-1);
43589+ static atomic_unchecked_t led_seq = ATOMIC_INIT(-1);
43590 unsigned long led_no;
43591 struct xpad_led *led;
43592 struct led_classdev *led_cdev;
43593@@ -899,7 +899,7 @@ static int xpad_led_probe(struct usb_xpad *xpad)
43594 if (!led)
43595 return -ENOMEM;
43596
43597- led_no = atomic_inc_return(&led_seq);
43598+ led_no = atomic_inc_return_unchecked(&led_seq);
43599
43600 snprintf(led->name, sizeof(led->name), "xpad%lu", led_no);
43601 led->xpad = xpad;
43602diff --git a/drivers/input/misc/ims-pcu.c b/drivers/input/misc/ims-pcu.c
43603index ac1fa5f..5f7502c 100644
43604--- a/drivers/input/misc/ims-pcu.c
43605+++ b/drivers/input/misc/ims-pcu.c
43606@@ -1851,7 +1851,7 @@ static int ims_pcu_identify_type(struct ims_pcu *pcu, u8 *device_id)
43607
43608 static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43609 {
43610- static atomic_t device_no = ATOMIC_INIT(-1);
43611+ static atomic_unchecked_t device_no = ATOMIC_INIT(-1);
43612
43613 const struct ims_pcu_device_info *info;
43614 int error;
43615@@ -1882,7 +1882,7 @@ static int ims_pcu_init_application_mode(struct ims_pcu *pcu)
43616 }
43617
43618 /* Device appears to be operable, complete initialization */
43619- pcu->device_no = atomic_inc_return(&device_no);
43620+ pcu->device_no = atomic_inc_return_unchecked(&device_no);
43621
43622 /*
43623 * PCU-B devices, both GEN_1 and GEN_2 do not have OFN sensor
43624diff --git a/drivers/input/mouse/psmouse.h b/drivers/input/mouse/psmouse.h
43625index d02e1bd..d719719 100644
43626--- a/drivers/input/mouse/psmouse.h
43627+++ b/drivers/input/mouse/psmouse.h
43628@@ -124,7 +124,7 @@ struct psmouse_attribute {
43629 ssize_t (*set)(struct psmouse *psmouse, void *data,
43630 const char *buf, size_t count);
43631 bool protect;
43632-};
43633+} __do_const;
43634 #define to_psmouse_attr(a) container_of((a), struct psmouse_attribute, dattr)
43635
43636 ssize_t psmouse_attr_show_helper(struct device *dev, struct device_attribute *attr,
43637diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c
43638index b604564..3f14ae4 100644
43639--- a/drivers/input/mousedev.c
43640+++ b/drivers/input/mousedev.c
43641@@ -744,7 +744,7 @@ static ssize_t mousedev_read(struct file *file, char __user *buffer,
43642
43643 spin_unlock_irq(&client->packet_lock);
43644
43645- if (copy_to_user(buffer, data, count))
43646+ if (count > sizeof(data) || copy_to_user(buffer, data, count))
43647 return -EFAULT;
43648
43649 return count;
43650diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
43651index a05a517..323a2fd 100644
43652--- a/drivers/input/serio/serio.c
43653+++ b/drivers/input/serio/serio.c
43654@@ -514,7 +514,7 @@ static void serio_release_port(struct device *dev)
43655 */
43656 static void serio_init_port(struct serio *serio)
43657 {
43658- static atomic_t serio_no = ATOMIC_INIT(-1);
43659+ static atomic_unchecked_t serio_no = ATOMIC_INIT(-1);
43660
43661 __module_get(THIS_MODULE);
43662
43663@@ -525,7 +525,7 @@ static void serio_init_port(struct serio *serio)
43664 mutex_init(&serio->drv_mutex);
43665 device_initialize(&serio->dev);
43666 dev_set_name(&serio->dev, "serio%lu",
43667- (unsigned long)atomic_inc_return(&serio_no));
43668+ (unsigned long)atomic_inc_return_unchecked(&serio_no));
43669 serio->dev.bus = &serio_bus;
43670 serio->dev.release = serio_release_port;
43671 serio->dev.groups = serio_device_attr_groups;
43672diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
43673index 71ef5d6..93380a9 100644
43674--- a/drivers/input/serio/serio_raw.c
43675+++ b/drivers/input/serio/serio_raw.c
43676@@ -292,7 +292,7 @@ static irqreturn_t serio_raw_interrupt(struct serio *serio, unsigned char data,
43677
43678 static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43679 {
43680- static atomic_t serio_raw_no = ATOMIC_INIT(-1);
43681+ static atomic_unchecked_t serio_raw_no = ATOMIC_INIT(-1);
43682 struct serio_raw *serio_raw;
43683 int err;
43684
43685@@ -303,7 +303,7 @@ static int serio_raw_connect(struct serio *serio, struct serio_driver *drv)
43686 }
43687
43688 snprintf(serio_raw->name, sizeof(serio_raw->name),
43689- "serio_raw%ld", (long)atomic_inc_return(&serio_raw_no));
43690+ "serio_raw%ld", (long)atomic_inc_return_unchecked(&serio_raw_no));
43691 kref_init(&serio_raw->kref);
43692 INIT_LIST_HEAD(&serio_raw->client_list);
43693 init_waitqueue_head(&serio_raw->wait);
43694diff --git a/drivers/input/touchscreen/htcpen.c b/drivers/input/touchscreen/htcpen.c
43695index 92e2243..8fd9092 100644
43696--- a/drivers/input/touchscreen/htcpen.c
43697+++ b/drivers/input/touchscreen/htcpen.c
43698@@ -219,7 +219,7 @@ static struct isa_driver htcpen_isa_driver = {
43699 }
43700 };
43701
43702-static struct dmi_system_id htcshift_dmi_table[] __initdata = {
43703+static const struct dmi_system_id htcshift_dmi_table[] __initconst = {
43704 {
43705 .ident = "Shift",
43706 .matches = {
43707diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
43708index 48882c1..93e0987 100644
43709--- a/drivers/iommu/amd_iommu.c
43710+++ b/drivers/iommu/amd_iommu.c
43711@@ -823,11 +823,21 @@ static void copy_cmd_to_buffer(struct amd_iommu *iommu,
43712
43713 static void build_completion_wait(struct iommu_cmd *cmd, u64 address)
43714 {
43715+ phys_addr_t physaddr;
43716 WARN_ON(address & 0x7ULL);
43717
43718 memset(cmd, 0, sizeof(*cmd));
43719- cmd->data[0] = lower_32_bits(__pa(address)) | CMD_COMPL_WAIT_STORE_MASK;
43720- cmd->data[1] = upper_32_bits(__pa(address));
43721+
43722+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
43723+ if (object_starts_on_stack((void *)address)) {
43724+ void *adjbuf = (void *)address - current->stack + current->lowmem_stack;
43725+ physaddr = __pa((u64)adjbuf);
43726+ } else
43727+#endif
43728+ physaddr = __pa(address);
43729+
43730+ cmd->data[0] = lower_32_bits(physaddr) | CMD_COMPL_WAIT_STORE_MASK;
43731+ cmd->data[1] = upper_32_bits(physaddr);
43732 cmd->data[2] = 1;
43733 CMD_SET_TYPE(cmd, CMD_COMPL_WAIT);
43734 }
43735diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
43736index a3adde6..988ee96 100644
43737--- a/drivers/iommu/arm-smmu.c
43738+++ b/drivers/iommu/arm-smmu.c
43739@@ -338,7 +338,7 @@ enum arm_smmu_domain_stage {
43740
43741 struct arm_smmu_domain {
43742 struct arm_smmu_device *smmu;
43743- struct io_pgtable_ops *pgtbl_ops;
43744+ struct io_pgtable *pgtbl;
43745 spinlock_t pgtbl_lock;
43746 struct arm_smmu_cfg cfg;
43747 enum arm_smmu_domain_stage stage;
43748@@ -833,7 +833,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
43749 {
43750 int irq, start, ret = 0;
43751 unsigned long ias, oas;
43752- struct io_pgtable_ops *pgtbl_ops;
43753+ struct io_pgtable *pgtbl;
43754 struct io_pgtable_cfg pgtbl_cfg;
43755 enum io_pgtable_fmt fmt;
43756 struct arm_smmu_domain *smmu_domain = domain->priv;
43757@@ -918,14 +918,16 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
43758 };
43759
43760 smmu_domain->smmu = smmu;
43761- pgtbl_ops = alloc_io_pgtable_ops(fmt, &pgtbl_cfg, smmu_domain);
43762- if (!pgtbl_ops) {
43763+ pgtbl = alloc_io_pgtable(fmt, &pgtbl_cfg, smmu_domain);
43764+ if (!pgtbl) {
43765 ret = -ENOMEM;
43766 goto out_clear_smmu;
43767 }
43768
43769 /* Update our support page sizes to reflect the page table format */
43770- arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
43771+ pax_open_kernel();
43772+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap = pgtbl_cfg.pgsize_bitmap;
43773+ pax_close_kernel();
43774
43775 /* Initialise the context bank with our page table cfg */
43776 arm_smmu_init_context_bank(smmu_domain, &pgtbl_cfg);
43777@@ -946,7 +948,7 @@ static int arm_smmu_init_domain_context(struct iommu_domain *domain,
43778 mutex_unlock(&smmu_domain->init_mutex);
43779
43780 /* Publish page table ops for map/unmap */
43781- smmu_domain->pgtbl_ops = pgtbl_ops;
43782+ smmu_domain->pgtbl = pgtbl;
43783 return 0;
43784
43785 out_clear_smmu:
43786@@ -979,8 +981,7 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain)
43787 free_irq(irq, domain);
43788 }
43789
43790- if (smmu_domain->pgtbl_ops)
43791- free_io_pgtable_ops(smmu_domain->pgtbl_ops);
43792+ free_io_pgtable(smmu_domain->pgtbl);
43793
43794 __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx);
43795 }
43796@@ -1204,13 +1205,13 @@ static int arm_smmu_map(struct iommu_domain *domain, unsigned long iova,
43797 int ret;
43798 unsigned long flags;
43799 struct arm_smmu_domain *smmu_domain = domain->priv;
43800- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
43801+ struct io_pgtable *iop = smmu_domain->pgtbl;
43802
43803- if (!ops)
43804+ if (!iop)
43805 return -ENODEV;
43806
43807 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
43808- ret = ops->map(ops, iova, paddr, size, prot);
43809+ ret = iop->ops->map(iop, iova, paddr, size, prot);
43810 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
43811 return ret;
43812 }
43813@@ -1221,13 +1222,13 @@ static size_t arm_smmu_unmap(struct iommu_domain *domain, unsigned long iova,
43814 size_t ret;
43815 unsigned long flags;
43816 struct arm_smmu_domain *smmu_domain = domain->priv;
43817- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
43818+ struct io_pgtable *iop = smmu_domain->pgtbl;
43819
43820- if (!ops)
43821+ if (!iop)
43822 return 0;
43823
43824 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
43825- ret = ops->unmap(ops, iova, size);
43826+ ret = iop->ops->unmap(iop, iova, size);
43827 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
43828 return ret;
43829 }
43830@@ -1238,7 +1239,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
43831 struct arm_smmu_domain *smmu_domain = domain->priv;
43832 struct arm_smmu_device *smmu = smmu_domain->smmu;
43833 struct arm_smmu_cfg *cfg = &smmu_domain->cfg;
43834- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
43835+ struct io_pgtable *iop = smmu_domain->pgtbl;
43836 struct device *dev = smmu->dev;
43837 void __iomem *cb_base;
43838 u32 tmp;
43839@@ -1261,7 +1262,7 @@ static phys_addr_t arm_smmu_iova_to_phys_hard(struct iommu_domain *domain,
43840 dev_err(dev,
43841 "iova to phys timed out on 0x%pad. Falling back to software table walk.\n",
43842 &iova);
43843- return ops->iova_to_phys(ops, iova);
43844+ return iop->ops->iova_to_phys(iop, iova);
43845 }
43846
43847 phys = readl_relaxed(cb_base + ARM_SMMU_CB_PAR_LO);
43848@@ -1282,9 +1283,9 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
43849 phys_addr_t ret;
43850 unsigned long flags;
43851 struct arm_smmu_domain *smmu_domain = domain->priv;
43852- struct io_pgtable_ops *ops= smmu_domain->pgtbl_ops;
43853+ struct io_pgtable *iop = smmu_domain->pgtbl;
43854
43855- if (!ops)
43856+ if (!iop)
43857 return 0;
43858
43859 spin_lock_irqsave(&smmu_domain->pgtbl_lock, flags);
43860@@ -1292,7 +1293,7 @@ static phys_addr_t arm_smmu_iova_to_phys(struct iommu_domain *domain,
43861 smmu_domain->stage == ARM_SMMU_DOMAIN_S1) {
43862 ret = arm_smmu_iova_to_phys_hard(domain, iova);
43863 } else {
43864- ret = ops->iova_to_phys(ops, iova);
43865+ ret = iop->ops->iova_to_phys(iop, iova);
43866 }
43867
43868 spin_unlock_irqrestore(&smmu_domain->pgtbl_lock, flags);
43869@@ -1651,7 +1652,9 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu)
43870 size |= SZ_64K | SZ_512M;
43871 }
43872
43873- arm_smmu_ops.pgsize_bitmap &= size;
43874+ pax_open_kernel();
43875+ *(unsigned long *)&arm_smmu_ops.pgsize_bitmap &= size;
43876+ pax_close_kernel();
43877 dev_notice(smmu->dev, "\tSupported page sizes: 0x%08lx\n", size);
43878
43879 if (smmu->features & ARM_SMMU_FEAT_TRANS_S1)
43880diff --git a/drivers/iommu/io-pgtable-arm.c b/drivers/iommu/io-pgtable-arm.c
43881index b610a8d..08eb879 100644
43882--- a/drivers/iommu/io-pgtable-arm.c
43883+++ b/drivers/iommu/io-pgtable-arm.c
43884@@ -36,12 +36,6 @@
43885 #define io_pgtable_to_data(x) \
43886 container_of((x), struct arm_lpae_io_pgtable, iop)
43887
43888-#define io_pgtable_ops_to_pgtable(x) \
43889- container_of((x), struct io_pgtable, ops)
43890-
43891-#define io_pgtable_ops_to_data(x) \
43892- io_pgtable_to_data(io_pgtable_ops_to_pgtable(x))
43893-
43894 /*
43895 * For consistency with the architecture, we always consider
43896 * ARM_LPAE_MAX_LEVELS levels, with the walk starting at level n >=0
43897@@ -302,10 +296,10 @@ static arm_lpae_iopte arm_lpae_prot_to_pte(struct arm_lpae_io_pgtable *data,
43898 return pte;
43899 }
43900
43901-static int arm_lpae_map(struct io_pgtable_ops *ops, unsigned long iova,
43902+static int arm_lpae_map(struct io_pgtable *iop, unsigned long iova,
43903 phys_addr_t paddr, size_t size, int iommu_prot)
43904 {
43905- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
43906+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
43907 arm_lpae_iopte *ptep = data->pgd;
43908 int lvl = ARM_LPAE_START_LVL(data);
43909 arm_lpae_iopte prot;
43910@@ -445,12 +439,11 @@ static int __arm_lpae_unmap(struct arm_lpae_io_pgtable *data,
43911 return __arm_lpae_unmap(data, iova, size, lvl + 1, ptep);
43912 }
43913
43914-static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
43915+static int arm_lpae_unmap(struct io_pgtable *iop, unsigned long iova,
43916 size_t size)
43917 {
43918 size_t unmapped;
43919- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
43920- struct io_pgtable *iop = &data->iop;
43921+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
43922 arm_lpae_iopte *ptep = data->pgd;
43923 int lvl = ARM_LPAE_START_LVL(data);
43924
43925@@ -461,10 +454,10 @@ static int arm_lpae_unmap(struct io_pgtable_ops *ops, unsigned long iova,
43926 return unmapped;
43927 }
43928
43929-static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable_ops *ops,
43930+static phys_addr_t arm_lpae_iova_to_phys(struct io_pgtable *iop,
43931 unsigned long iova)
43932 {
43933- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
43934+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
43935 arm_lpae_iopte pte, *ptep = data->pgd;
43936 int lvl = ARM_LPAE_START_LVL(data);
43937
43938@@ -531,6 +524,12 @@ static void arm_lpae_restrict_pgsizes(struct io_pgtable_cfg *cfg)
43939 }
43940 }
43941
43942+static struct io_pgtable_ops arm_lpae_io_pgtable_ops = {
43943+ .map = arm_lpae_map,
43944+ .unmap = arm_lpae_unmap,
43945+ .iova_to_phys = arm_lpae_iova_to_phys,
43946+};
43947+
43948 static struct arm_lpae_io_pgtable *
43949 arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
43950 {
43951@@ -562,11 +561,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
43952 pgd_bits = va_bits - (data->bits_per_level * (data->levels - 1));
43953 data->pgd_size = 1UL << (pgd_bits + ilog2(sizeof(arm_lpae_iopte)));
43954
43955- data->iop.ops = (struct io_pgtable_ops) {
43956- .map = arm_lpae_map,
43957- .unmap = arm_lpae_unmap,
43958- .iova_to_phys = arm_lpae_iova_to_phys,
43959- };
43960+ data->iop.ops = &arm_lpae_io_pgtable_ops;
43961
43962 return data;
43963 }
43964@@ -825,9 +820,9 @@ static struct iommu_gather_ops dummy_tlb_ops __initdata = {
43965 .flush_pgtable = dummy_flush_pgtable,
43966 };
43967
43968-static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
43969+static void __init arm_lpae_dump_ops(struct io_pgtable *iop)
43970 {
43971- struct arm_lpae_io_pgtable *data = io_pgtable_ops_to_data(ops);
43972+ struct arm_lpae_io_pgtable *data = io_pgtable_to_data(iop);
43973 struct io_pgtable_cfg *cfg = &data->iop.cfg;
43974
43975 pr_err("cfg: pgsize_bitmap 0x%lx, ias %u-bit\n",
43976@@ -837,9 +832,9 @@ static void __init arm_lpae_dump_ops(struct io_pgtable_ops *ops)
43977 data->bits_per_level, data->pgd);
43978 }
43979
43980-#define __FAIL(ops, i) ({ \
43981+#define __FAIL(iop, i) ({ \
43982 WARN(1, "selftest: test failed for fmt idx %d\n", (i)); \
43983- arm_lpae_dump_ops(ops); \
43984+ arm_lpae_dump_ops(iop); \
43985 selftest_running = false; \
43986 -EFAULT; \
43987 })
43988@@ -854,30 +849,32 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
43989 int i, j;
43990 unsigned long iova;
43991 size_t size;
43992- struct io_pgtable_ops *ops;
43993+ struct io_pgtable *iop;
43994+ const struct io_pgtable_ops *ops;
43995
43996 selftest_running = true;
43997
43998 for (i = 0; i < ARRAY_SIZE(fmts); ++i) {
43999 cfg_cookie = cfg;
44000- ops = alloc_io_pgtable_ops(fmts[i], cfg, cfg);
44001- if (!ops) {
44002+ iop = alloc_io_pgtable(fmts[i], cfg, cfg);
44003+ if (!iop) {
44004 pr_err("selftest: failed to allocate io pgtable ops\n");
44005 return -ENOMEM;
44006 }
44007+ ops = iop->ops;
44008
44009 /*
44010 * Initial sanity checks.
44011 * Empty page tables shouldn't provide any translations.
44012 */
44013- if (ops->iova_to_phys(ops, 42))
44014- return __FAIL(ops, i);
44015+ if (ops->iova_to_phys(iop, 42))
44016+ return __FAIL(iop, i);
44017
44018- if (ops->iova_to_phys(ops, SZ_1G + 42))
44019- return __FAIL(ops, i);
44020+ if (ops->iova_to_phys(iop, SZ_1G + 42))
44021+ return __FAIL(iop, i);
44022
44023- if (ops->iova_to_phys(ops, SZ_2G + 42))
44024- return __FAIL(ops, i);
44025+ if (ops->iova_to_phys(iop, SZ_2G + 42))
44026+ return __FAIL(iop, i);
44027
44028 /*
44029 * Distinct mappings of different granule sizes.
44030@@ -887,19 +884,19 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44031 while (j != BITS_PER_LONG) {
44032 size = 1UL << j;
44033
44034- if (ops->map(ops, iova, iova, size, IOMMU_READ |
44035+ if (ops->map(iop, iova, iova, size, IOMMU_READ |
44036 IOMMU_WRITE |
44037 IOMMU_NOEXEC |
44038 IOMMU_CACHE))
44039- return __FAIL(ops, i);
44040+ return __FAIL(iop, i);
44041
44042 /* Overlapping mappings */
44043- if (!ops->map(ops, iova, iova + size, size,
44044+ if (!ops->map(iop, iova, iova + size, size,
44045 IOMMU_READ | IOMMU_NOEXEC))
44046- return __FAIL(ops, i);
44047+ return __FAIL(iop, i);
44048
44049- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44050- return __FAIL(ops, i);
44051+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44052+ return __FAIL(iop, i);
44053
44054 iova += SZ_1G;
44055 j++;
44056@@ -908,15 +905,15 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44057
44058 /* Partial unmap */
44059 size = 1UL << __ffs(cfg->pgsize_bitmap);
44060- if (ops->unmap(ops, SZ_1G + size, size) != size)
44061- return __FAIL(ops, i);
44062+ if (ops->unmap(iop, SZ_1G + size, size) != size)
44063+ return __FAIL(iop, i);
44064
44065 /* Remap of partial unmap */
44066- if (ops->map(ops, SZ_1G + size, size, size, IOMMU_READ))
44067- return __FAIL(ops, i);
44068+ if (ops->map(iop, SZ_1G + size, size, size, IOMMU_READ))
44069+ return __FAIL(iop, i);
44070
44071- if (ops->iova_to_phys(ops, SZ_1G + size + 42) != (size + 42))
44072- return __FAIL(ops, i);
44073+ if (ops->iova_to_phys(iop, SZ_1G + size + 42) != (size + 42))
44074+ return __FAIL(iop, i);
44075
44076 /* Full unmap */
44077 iova = 0;
44078@@ -924,25 +921,25 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
44079 while (j != BITS_PER_LONG) {
44080 size = 1UL << j;
44081
44082- if (ops->unmap(ops, iova, size) != size)
44083- return __FAIL(ops, i);
44084+ if (ops->unmap(iop, iova, size) != size)
44085+ return __FAIL(iop, i);
44086
44087- if (ops->iova_to_phys(ops, iova + 42))
44088- return __FAIL(ops, i);
44089+ if (ops->iova_to_phys(iop, iova + 42))
44090+ return __FAIL(iop, i);
44091
44092 /* Remap full block */
44093- if (ops->map(ops, iova, iova, size, IOMMU_WRITE))
44094- return __FAIL(ops, i);
44095+ if (ops->map(iop, iova, iova, size, IOMMU_WRITE))
44096+ return __FAIL(iop, i);
44097
44098- if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
44099- return __FAIL(ops, i);
44100+ if (ops->iova_to_phys(iop, iova + 42) != (iova + 42))
44101+ return __FAIL(iop, i);
44102
44103 iova += SZ_1G;
44104 j++;
44105 j = find_next_bit(&cfg->pgsize_bitmap, BITS_PER_LONG, j);
44106 }
44107
44108- free_io_pgtable_ops(ops);
44109+ free_io_pgtable(iop);
44110 }
44111
44112 selftest_running = false;
44113diff --git a/drivers/iommu/io-pgtable.c b/drivers/iommu/io-pgtable.c
44114index 6436fe2..088c965 100644
44115--- a/drivers/iommu/io-pgtable.c
44116+++ b/drivers/iommu/io-pgtable.c
44117@@ -40,7 +40,7 @@ io_pgtable_init_table[IO_PGTABLE_NUM_FMTS] =
44118 #endif
44119 };
44120
44121-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44122+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44123 struct io_pgtable_cfg *cfg,
44124 void *cookie)
44125 {
44126@@ -62,21 +62,18 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44127 iop->cookie = cookie;
44128 iop->cfg = *cfg;
44129
44130- return &iop->ops;
44131+ return iop;
44132 }
44133
44134 /*
44135 * It is the IOMMU driver's responsibility to ensure that the page table
44136 * is no longer accessible to the walker by this point.
44137 */
44138-void free_io_pgtable_ops(struct io_pgtable_ops *ops)
44139+void free_io_pgtable(struct io_pgtable *iop)
44140 {
44141- struct io_pgtable *iop;
44142-
44143- if (!ops)
44144+ if (!iop)
44145 return;
44146
44147- iop = container_of(ops, struct io_pgtable, ops);
44148 iop->cfg.tlb->tlb_flush_all(iop->cookie);
44149 io_pgtable_init_table[iop->fmt]->free(iop);
44150 }
44151diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h
44152index 10e32f6..0b276c8 100644
44153--- a/drivers/iommu/io-pgtable.h
44154+++ b/drivers/iommu/io-pgtable.h
44155@@ -75,17 +75,18 @@ struct io_pgtable_cfg {
44156 * These functions map directly onto the iommu_ops member functions with
44157 * the same names.
44158 */
44159+struct io_pgtable;
44160 struct io_pgtable_ops {
44161- int (*map)(struct io_pgtable_ops *ops, unsigned long iova,
44162+ int (*map)(struct io_pgtable *iop, unsigned long iova,
44163 phys_addr_t paddr, size_t size, int prot);
44164- int (*unmap)(struct io_pgtable_ops *ops, unsigned long iova,
44165+ int (*unmap)(struct io_pgtable *iop, unsigned long iova,
44166 size_t size);
44167- phys_addr_t (*iova_to_phys)(struct io_pgtable_ops *ops,
44168+ phys_addr_t (*iova_to_phys)(struct io_pgtable *iop,
44169 unsigned long iova);
44170 };
44171
44172 /**
44173- * alloc_io_pgtable_ops() - Allocate a page table allocator for use by an IOMMU.
44174+ * alloc_io_pgtable() - Allocate a page table allocator for use by an IOMMU.
44175 *
44176 * @fmt: The page table format.
44177 * @cfg: The page table configuration. This will be modified to represent
44178@@ -94,9 +95,9 @@ struct io_pgtable_ops {
44179 * @cookie: An opaque token provided by the IOMMU driver and passed back to
44180 * the callback routines in cfg->tlb.
44181 */
44182-struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44183- struct io_pgtable_cfg *cfg,
44184- void *cookie);
44185+struct io_pgtable *alloc_io_pgtable(enum io_pgtable_fmt fmt,
44186+ struct io_pgtable_cfg *cfg,
44187+ void *cookie);
44188
44189 /**
44190 * free_io_pgtable_ops() - Free an io_pgtable_ops structure. The caller
44191@@ -105,7 +106,7 @@ struct io_pgtable_ops *alloc_io_pgtable_ops(enum io_pgtable_fmt fmt,
44192 *
44193 * @ops: The ops returned from alloc_io_pgtable_ops.
44194 */
44195-void free_io_pgtable_ops(struct io_pgtable_ops *ops);
44196+void free_io_pgtable(struct io_pgtable *iop);
44197
44198
44199 /*
44200@@ -125,7 +126,7 @@ struct io_pgtable {
44201 enum io_pgtable_fmt fmt;
44202 void *cookie;
44203 struct io_pgtable_cfg cfg;
44204- struct io_pgtable_ops ops;
44205+ const struct io_pgtable_ops *ops;
44206 };
44207
44208 /**
44209diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
44210index 72e683d..c9db262 100644
44211--- a/drivers/iommu/iommu.c
44212+++ b/drivers/iommu/iommu.c
44213@@ -802,7 +802,7 @@ static int iommu_bus_notifier(struct notifier_block *nb,
44214 static int iommu_bus_init(struct bus_type *bus, const struct iommu_ops *ops)
44215 {
44216 int err;
44217- struct notifier_block *nb;
44218+ notifier_block_no_const *nb;
44219 struct iommu_callback_data cb = {
44220 .ops = ops,
44221 };
44222diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c
44223index bc39bdf..e2de272 100644
44224--- a/drivers/iommu/ipmmu-vmsa.c
44225+++ b/drivers/iommu/ipmmu-vmsa.c
44226@@ -41,7 +41,7 @@ struct ipmmu_vmsa_domain {
44227 struct iommu_domain *io_domain;
44228
44229 struct io_pgtable_cfg cfg;
44230- struct io_pgtable_ops *iop;
44231+ struct io_pgtable *iop;
44232
44233 unsigned int context_id;
44234 spinlock_t lock; /* Protects mappings */
44235@@ -323,8 +323,7 @@ static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain)
44236 domain->cfg.oas = 40;
44237 domain->cfg.tlb = &ipmmu_gather_ops;
44238
44239- domain->iop = alloc_io_pgtable_ops(ARM_32_LPAE_S1, &domain->cfg,
44240- domain);
44241+ domain->iop = alloc_io_pgtable(ARM_32_LPAE_S1, &domain->cfg, domain);
44242 if (!domain->iop)
44243 return -EINVAL;
44244
44245@@ -482,7 +481,7 @@ static void ipmmu_domain_destroy(struct iommu_domain *io_domain)
44246 * been detached.
44247 */
44248 ipmmu_domain_destroy_context(domain);
44249- free_io_pgtable_ops(domain->iop);
44250+ free_io_pgtable(domain->iop);
44251 kfree(domain);
44252 }
44253
44254@@ -551,7 +550,7 @@ static int ipmmu_map(struct iommu_domain *io_domain, unsigned long iova,
44255 if (!domain)
44256 return -ENODEV;
44257
44258- return domain->iop->map(domain->iop, iova, paddr, size, prot);
44259+ return domain->iop->ops->map(domain->iop, iova, paddr, size, prot);
44260 }
44261
44262 static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44263@@ -559,7 +558,7 @@ static size_t ipmmu_unmap(struct iommu_domain *io_domain, unsigned long iova,
44264 {
44265 struct ipmmu_vmsa_domain *domain = io_domain->priv;
44266
44267- return domain->iop->unmap(domain->iop, iova, size);
44268+ return domain->iop->ops->unmap(domain->iop, iova, size);
44269 }
44270
44271 static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44272@@ -569,7 +568,7 @@ static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain,
44273
44274 /* TODO: Is locking needed ? */
44275
44276- return domain->iop->iova_to_phys(domain->iop, iova);
44277+ return domain->iop->ops->iova_to_phys(domain->iop, iova);
44278 }
44279
44280 static int ipmmu_find_utlbs(struct ipmmu_vmsa_device *mmu, struct device *dev,
44281diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
44282index 390079e..1da9d6c 100644
44283--- a/drivers/iommu/irq_remapping.c
44284+++ b/drivers/iommu/irq_remapping.c
44285@@ -329,7 +329,7 @@ int setup_hpet_msi_remapped(unsigned int irq, unsigned int id)
44286 void panic_if_irq_remap(const char *msg)
44287 {
44288 if (irq_remapping_enabled)
44289- panic(msg);
44290+ panic("%s", msg);
44291 }
44292
44293 static void ir_ack_apic_edge(struct irq_data *data)
44294@@ -350,10 +350,12 @@ static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
44295
44296 void irq_remap_modify_chip_defaults(struct irq_chip *chip)
44297 {
44298- chip->irq_print_chip = ir_print_prefix;
44299- chip->irq_ack = ir_ack_apic_edge;
44300- chip->irq_eoi = ir_ack_apic_level;
44301- chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44302+ pax_open_kernel();
44303+ *(void **)&chip->irq_print_chip = ir_print_prefix;
44304+ *(void **)&chip->irq_ack = ir_ack_apic_edge;
44305+ *(void **)&chip->irq_eoi = ir_ack_apic_level;
44306+ *(void **)&chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
44307+ pax_close_kernel();
44308 }
44309
44310 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
44311diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
44312index 471e1cd..b53b870 100644
44313--- a/drivers/irqchip/irq-gic.c
44314+++ b/drivers/irqchip/irq-gic.c
44315@@ -84,7 +84,7 @@ static u8 gic_cpu_map[NR_GIC_CPU_IF] __read_mostly;
44316 * Supported arch specific GIC irq extension.
44317 * Default make them NULL.
44318 */
44319-struct irq_chip gic_arch_extn = {
44320+irq_chip_no_const gic_arch_extn = {
44321 .irq_eoi = NULL,
44322 .irq_mask = NULL,
44323 .irq_unmask = NULL,
44324@@ -318,7 +318,7 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc)
44325 chained_irq_exit(chip, desc);
44326 }
44327
44328-static struct irq_chip gic_chip = {
44329+static irq_chip_no_const gic_chip __read_only = {
44330 .name = "GIC",
44331 .irq_mask = gic_mask_irq,
44332 .irq_unmask = gic_unmask_irq,
44333diff --git a/drivers/irqchip/irq-renesas-intc-irqpin.c b/drivers/irqchip/irq-renesas-intc-irqpin.c
44334index 9a0767b..5e5f86f 100644
44335--- a/drivers/irqchip/irq-renesas-intc-irqpin.c
44336+++ b/drivers/irqchip/irq-renesas-intc-irqpin.c
44337@@ -373,7 +373,7 @@ static int intc_irqpin_probe(struct platform_device *pdev)
44338 struct intc_irqpin_iomem *i;
44339 struct resource *io[INTC_IRQPIN_REG_NR];
44340 struct resource *irq;
44341- struct irq_chip *irq_chip;
44342+ irq_chip_no_const *irq_chip;
44343 void (*enable_fn)(struct irq_data *d);
44344 void (*disable_fn)(struct irq_data *d);
44345 const char *name = dev_name(dev);
44346diff --git a/drivers/irqchip/irq-renesas-irqc.c b/drivers/irqchip/irq-renesas-irqc.c
44347index 384e6ed..7a771b2 100644
44348--- a/drivers/irqchip/irq-renesas-irqc.c
44349+++ b/drivers/irqchip/irq-renesas-irqc.c
44350@@ -151,7 +151,7 @@ static int irqc_probe(struct platform_device *pdev)
44351 struct irqc_priv *p;
44352 struct resource *io;
44353 struct resource *irq;
44354- struct irq_chip *irq_chip;
44355+ irq_chip_no_const *irq_chip;
44356 const char *name = dev_name(&pdev->dev);
44357 int ret;
44358 int k;
44359diff --git a/drivers/isdn/capi/capi.c b/drivers/isdn/capi/capi.c
44360index 6a2df32..dc962f1 100644
44361--- a/drivers/isdn/capi/capi.c
44362+++ b/drivers/isdn/capi/capi.c
44363@@ -81,8 +81,8 @@ struct capiminor {
44364
44365 struct capi20_appl *ap;
44366 u32 ncci;
44367- atomic_t datahandle;
44368- atomic_t msgid;
44369+ atomic_unchecked_t datahandle;
44370+ atomic_unchecked_t msgid;
44371
44372 struct tty_port port;
44373 int ttyinstop;
44374@@ -391,7 +391,7 @@ gen_data_b3_resp_for(struct capiminor *mp, struct sk_buff *skb)
44375 capimsg_setu16(s, 2, mp->ap->applid);
44376 capimsg_setu8 (s, 4, CAPI_DATA_B3);
44377 capimsg_setu8 (s, 5, CAPI_RESP);
44378- capimsg_setu16(s, 6, atomic_inc_return(&mp->msgid));
44379+ capimsg_setu16(s, 6, atomic_inc_return_unchecked(&mp->msgid));
44380 capimsg_setu32(s, 8, mp->ncci);
44381 capimsg_setu16(s, 12, datahandle);
44382 }
44383@@ -512,14 +512,14 @@ static void handle_minor_send(struct capiminor *mp)
44384 mp->outbytes -= len;
44385 spin_unlock_bh(&mp->outlock);
44386
44387- datahandle = atomic_inc_return(&mp->datahandle);
44388+ datahandle = atomic_inc_return_unchecked(&mp->datahandle);
44389 skb_push(skb, CAPI_DATA_B3_REQ_LEN);
44390 memset(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44391 capimsg_setu16(skb->data, 0, CAPI_DATA_B3_REQ_LEN);
44392 capimsg_setu16(skb->data, 2, mp->ap->applid);
44393 capimsg_setu8 (skb->data, 4, CAPI_DATA_B3);
44394 capimsg_setu8 (skb->data, 5, CAPI_REQ);
44395- capimsg_setu16(skb->data, 6, atomic_inc_return(&mp->msgid));
44396+ capimsg_setu16(skb->data, 6, atomic_inc_return_unchecked(&mp->msgid));
44397 capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
44398 capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
44399 capimsg_setu16(skb->data, 16, len); /* Data length */
44400diff --git a/drivers/isdn/gigaset/bas-gigaset.c b/drivers/isdn/gigaset/bas-gigaset.c
44401index aecec6d..11e13c5 100644
44402--- a/drivers/isdn/gigaset/bas-gigaset.c
44403+++ b/drivers/isdn/gigaset/bas-gigaset.c
44404@@ -2565,22 +2565,22 @@ static int gigaset_post_reset(struct usb_interface *intf)
44405
44406
44407 static const struct gigaset_ops gigops = {
44408- gigaset_write_cmd,
44409- gigaset_write_room,
44410- gigaset_chars_in_buffer,
44411- gigaset_brkchars,
44412- gigaset_init_bchannel,
44413- gigaset_close_bchannel,
44414- gigaset_initbcshw,
44415- gigaset_freebcshw,
44416- gigaset_reinitbcshw,
44417- gigaset_initcshw,
44418- gigaset_freecshw,
44419- gigaset_set_modem_ctrl,
44420- gigaset_baud_rate,
44421- gigaset_set_line_ctrl,
44422- gigaset_isoc_send_skb,
44423- gigaset_isoc_input,
44424+ .write_cmd = gigaset_write_cmd,
44425+ .write_room = gigaset_write_room,
44426+ .chars_in_buffer = gigaset_chars_in_buffer,
44427+ .brkchars = gigaset_brkchars,
44428+ .init_bchannel = gigaset_init_bchannel,
44429+ .close_bchannel = gigaset_close_bchannel,
44430+ .initbcshw = gigaset_initbcshw,
44431+ .freebcshw = gigaset_freebcshw,
44432+ .reinitbcshw = gigaset_reinitbcshw,
44433+ .initcshw = gigaset_initcshw,
44434+ .freecshw = gigaset_freecshw,
44435+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44436+ .baud_rate = gigaset_baud_rate,
44437+ .set_line_ctrl = gigaset_set_line_ctrl,
44438+ .send_skb = gigaset_isoc_send_skb,
44439+ .handle_input = gigaset_isoc_input,
44440 };
44441
44442 /* bas_gigaset_init
44443diff --git a/drivers/isdn/gigaset/interface.c b/drivers/isdn/gigaset/interface.c
44444index 600c79b..3752bab 100644
44445--- a/drivers/isdn/gigaset/interface.c
44446+++ b/drivers/isdn/gigaset/interface.c
44447@@ -130,9 +130,9 @@ static int if_open(struct tty_struct *tty, struct file *filp)
44448 }
44449 tty->driver_data = cs;
44450
44451- ++cs->port.count;
44452+ atomic_inc(&cs->port.count);
44453
44454- if (cs->port.count == 1) {
44455+ if (atomic_read(&cs->port.count) == 1) {
44456 tty_port_tty_set(&cs->port, tty);
44457 cs->port.low_latency = 1;
44458 }
44459@@ -156,9 +156,9 @@ static void if_close(struct tty_struct *tty, struct file *filp)
44460
44461 if (!cs->connected)
44462 gig_dbg(DEBUG_IF, "not connected"); /* nothing to do */
44463- else if (!cs->port.count)
44464+ else if (!atomic_read(&cs->port.count))
44465 dev_warn(cs->dev, "%s: device not opened\n", __func__);
44466- else if (!--cs->port.count)
44467+ else if (!atomic_dec_return(&cs->port.count))
44468 tty_port_tty_set(&cs->port, NULL);
44469
44470 mutex_unlock(&cs->mutex);
44471diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
44472index 8c91fd5..14f13ce 100644
44473--- a/drivers/isdn/gigaset/ser-gigaset.c
44474+++ b/drivers/isdn/gigaset/ser-gigaset.c
44475@@ -453,22 +453,22 @@ static int gigaset_set_line_ctrl(struct cardstate *cs, unsigned cflag)
44476 }
44477
44478 static const struct gigaset_ops ops = {
44479- gigaset_write_cmd,
44480- gigaset_write_room,
44481- gigaset_chars_in_buffer,
44482- gigaset_brkchars,
44483- gigaset_init_bchannel,
44484- gigaset_close_bchannel,
44485- gigaset_initbcshw,
44486- gigaset_freebcshw,
44487- gigaset_reinitbcshw,
44488- gigaset_initcshw,
44489- gigaset_freecshw,
44490- gigaset_set_modem_ctrl,
44491- gigaset_baud_rate,
44492- gigaset_set_line_ctrl,
44493- gigaset_m10x_send_skb, /* asyncdata.c */
44494- gigaset_m10x_input, /* asyncdata.c */
44495+ .write_cmd = gigaset_write_cmd,
44496+ .write_room = gigaset_write_room,
44497+ .chars_in_buffer = gigaset_chars_in_buffer,
44498+ .brkchars = gigaset_brkchars,
44499+ .init_bchannel = gigaset_init_bchannel,
44500+ .close_bchannel = gigaset_close_bchannel,
44501+ .initbcshw = gigaset_initbcshw,
44502+ .freebcshw = gigaset_freebcshw,
44503+ .reinitbcshw = gigaset_reinitbcshw,
44504+ .initcshw = gigaset_initcshw,
44505+ .freecshw = gigaset_freecshw,
44506+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44507+ .baud_rate = gigaset_baud_rate,
44508+ .set_line_ctrl = gigaset_set_line_ctrl,
44509+ .send_skb = gigaset_m10x_send_skb, /* asyncdata.c */
44510+ .handle_input = gigaset_m10x_input, /* asyncdata.c */
44511 };
44512
44513
44514diff --git a/drivers/isdn/gigaset/usb-gigaset.c b/drivers/isdn/gigaset/usb-gigaset.c
44515index 5f306e2..5342f88 100644
44516--- a/drivers/isdn/gigaset/usb-gigaset.c
44517+++ b/drivers/isdn/gigaset/usb-gigaset.c
44518@@ -543,7 +543,7 @@ static int gigaset_brkchars(struct cardstate *cs, const unsigned char buf[6])
44519 gigaset_dbg_buffer(DEBUG_USBREQ, "brkchars", 6, buf);
44520 memcpy(cs->hw.usb->bchars, buf, 6);
44521 return usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x19, 0x41,
44522- 0, 0, &buf, 6, 2000);
44523+ 0, 0, buf, 6, 2000);
44524 }
44525
44526 static void gigaset_freebcshw(struct bc_state *bcs)
44527@@ -862,22 +862,22 @@ static int gigaset_pre_reset(struct usb_interface *intf)
44528 }
44529
44530 static const struct gigaset_ops ops = {
44531- gigaset_write_cmd,
44532- gigaset_write_room,
44533- gigaset_chars_in_buffer,
44534- gigaset_brkchars,
44535- gigaset_init_bchannel,
44536- gigaset_close_bchannel,
44537- gigaset_initbcshw,
44538- gigaset_freebcshw,
44539- gigaset_reinitbcshw,
44540- gigaset_initcshw,
44541- gigaset_freecshw,
44542- gigaset_set_modem_ctrl,
44543- gigaset_baud_rate,
44544- gigaset_set_line_ctrl,
44545- gigaset_m10x_send_skb,
44546- gigaset_m10x_input,
44547+ .write_cmd = gigaset_write_cmd,
44548+ .write_room = gigaset_write_room,
44549+ .chars_in_buffer = gigaset_chars_in_buffer,
44550+ .brkchars = gigaset_brkchars,
44551+ .init_bchannel = gigaset_init_bchannel,
44552+ .close_bchannel = gigaset_close_bchannel,
44553+ .initbcshw = gigaset_initbcshw,
44554+ .freebcshw = gigaset_freebcshw,
44555+ .reinitbcshw = gigaset_reinitbcshw,
44556+ .initcshw = gigaset_initcshw,
44557+ .freecshw = gigaset_freecshw,
44558+ .set_modem_ctrl = gigaset_set_modem_ctrl,
44559+ .baud_rate = gigaset_baud_rate,
44560+ .set_line_ctrl = gigaset_set_line_ctrl,
44561+ .send_skb = gigaset_m10x_send_skb,
44562+ .handle_input = gigaset_m10x_input,
44563 };
44564
44565 /*
44566diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c
44567index 4d9b195..455075c 100644
44568--- a/drivers/isdn/hardware/avm/b1.c
44569+++ b/drivers/isdn/hardware/avm/b1.c
44570@@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capiloaddatapart *t4file)
44571 }
44572 if (left) {
44573 if (t4file->user) {
44574- if (copy_from_user(buf, dp, left))
44575+ if (left > sizeof buf || copy_from_user(buf, dp, left))
44576 return -EFAULT;
44577 } else {
44578 memcpy(buf, dp, left);
44579@@ -224,7 +224,7 @@ int b1_load_config(avmcard *card, capiloaddatapart *config)
44580 }
44581 if (left) {
44582 if (config->user) {
44583- if (copy_from_user(buf, dp, left))
44584+ if (left > sizeof buf || copy_from_user(buf, dp, left))
44585 return -EFAULT;
44586 } else {
44587 memcpy(buf, dp, left);
44588diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c
44589index 9b856e1..fa03c92 100644
44590--- a/drivers/isdn/i4l/isdn_common.c
44591+++ b/drivers/isdn/i4l/isdn_common.c
44592@@ -1654,6 +1654,8 @@ isdn_ioctl(struct file *file, uint cmd, ulong arg)
44593 } else
44594 return -EINVAL;
44595 case IIOCDBGVAR:
44596+ if (!capable(CAP_SYS_RAWIO))
44597+ return -EPERM;
44598 if (arg) {
44599 if (copy_to_user(argp, &dev, sizeof(ulong)))
44600 return -EFAULT;
44601diff --git a/drivers/isdn/i4l/isdn_concap.c b/drivers/isdn/i4l/isdn_concap.c
44602index 91d5730..336523e 100644
44603--- a/drivers/isdn/i4l/isdn_concap.c
44604+++ b/drivers/isdn/i4l/isdn_concap.c
44605@@ -80,9 +80,9 @@ static int isdn_concap_dl_disconn_req(struct concap_proto *concap)
44606 }
44607
44608 struct concap_device_ops isdn_concap_reliable_dl_dops = {
44609- &isdn_concap_dl_data_req,
44610- &isdn_concap_dl_connect_req,
44611- &isdn_concap_dl_disconn_req
44612+ .data_req = &isdn_concap_dl_data_req,
44613+ .connect_req = &isdn_concap_dl_connect_req,
44614+ .disconn_req = &isdn_concap_dl_disconn_req
44615 };
44616
44617 /* The following should better go into a dedicated source file such that
44618diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c
44619index bc91261..2ef7e36 100644
44620--- a/drivers/isdn/i4l/isdn_tty.c
44621+++ b/drivers/isdn/i4l/isdn_tty.c
44622@@ -1503,9 +1503,9 @@ isdn_tty_open(struct tty_struct *tty, struct file *filp)
44623
44624 #ifdef ISDN_DEBUG_MODEM_OPEN
44625 printk(KERN_DEBUG "isdn_tty_open %s, count = %d\n", tty->name,
44626- port->count);
44627+ atomic_read(&port->count));
44628 #endif
44629- port->count++;
44630+ atomic_inc(&port->count);
44631 port->tty = tty;
44632 /*
44633 * Start up serial port
44634@@ -1549,7 +1549,7 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44635 #endif
44636 return;
44637 }
44638- if ((tty->count == 1) && (port->count != 1)) {
44639+ if ((tty->count == 1) && (atomic_read(&port->count) != 1)) {
44640 /*
44641 * Uh, oh. tty->count is 1, which means that the tty
44642 * structure will be freed. Info->count should always
44643@@ -1558,15 +1558,15 @@ isdn_tty_close(struct tty_struct *tty, struct file *filp)
44644 * serial port won't be shutdown.
44645 */
44646 printk(KERN_ERR "isdn_tty_close: bad port count; tty->count is 1, "
44647- "info->count is %d\n", port->count);
44648- port->count = 1;
44649+ "info->count is %d\n", atomic_read(&port->count));
44650+ atomic_set(&port->count, 1);
44651 }
44652- if (--port->count < 0) {
44653+ if (atomic_dec_return(&port->count) < 0) {
44654 printk(KERN_ERR "isdn_tty_close: bad port count for ttyi%d: %d\n",
44655- info->line, port->count);
44656- port->count = 0;
44657+ info->line, atomic_read(&port->count));
44658+ atomic_set(&port->count, 0);
44659 }
44660- if (port->count) {
44661+ if (atomic_read(&port->count)) {
44662 #ifdef ISDN_DEBUG_MODEM_OPEN
44663 printk(KERN_DEBUG "isdn_tty_close after info->count != 0\n");
44664 #endif
44665@@ -1620,7 +1620,7 @@ isdn_tty_hangup(struct tty_struct *tty)
44666 if (isdn_tty_paranoia_check(info, tty->name, "isdn_tty_hangup"))
44667 return;
44668 isdn_tty_shutdown(info);
44669- port->count = 0;
44670+ atomic_set(&port->count, 0);
44671 port->flags &= ~ASYNC_NORMAL_ACTIVE;
44672 port->tty = NULL;
44673 wake_up_interruptible(&port->open_wait);
44674@@ -1965,7 +1965,7 @@ isdn_tty_find_icall(int di, int ch, setup_parm *setup)
44675 for (i = 0; i < ISDN_MAX_CHANNELS; i++) {
44676 modem_info *info = &dev->mdm.info[i];
44677
44678- if (info->port.count == 0)
44679+ if (atomic_read(&info->port.count) == 0)
44680 continue;
44681 if ((info->emu.mdmreg[REG_SI1] & si2bit[si1]) && /* SI1 is matching */
44682 (info->emu.mdmreg[REG_SI2] == si2)) { /* SI2 is matching */
44683diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c
44684index e2d4e58..40cd045 100644
44685--- a/drivers/isdn/i4l/isdn_x25iface.c
44686+++ b/drivers/isdn/i4l/isdn_x25iface.c
44687@@ -53,14 +53,14 @@ static int isdn_x25iface_disconn_ind(struct concap_proto *);
44688
44689
44690 static struct concap_proto_ops ix25_pops = {
44691- &isdn_x25iface_proto_new,
44692- &isdn_x25iface_proto_del,
44693- &isdn_x25iface_proto_restart,
44694- &isdn_x25iface_proto_close,
44695- &isdn_x25iface_xmit,
44696- &isdn_x25iface_receive,
44697- &isdn_x25iface_connect_ind,
44698- &isdn_x25iface_disconn_ind
44699+ .proto_new = &isdn_x25iface_proto_new,
44700+ .proto_del = &isdn_x25iface_proto_del,
44701+ .restart = &isdn_x25iface_proto_restart,
44702+ .close = &isdn_x25iface_proto_close,
44703+ .encap_and_xmit = &isdn_x25iface_xmit,
44704+ .data_ind = &isdn_x25iface_receive,
44705+ .connect_ind = &isdn_x25iface_connect_ind,
44706+ .disconn_ind = &isdn_x25iface_disconn_ind
44707 };
44708
44709 /* error message helper function */
44710diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c
44711index 358a574..b4987ea 100644
44712--- a/drivers/isdn/icn/icn.c
44713+++ b/drivers/isdn/icn/icn.c
44714@@ -1045,7 +1045,7 @@ icn_writecmd(const u_char *buf, int len, int user, icn_card *card)
44715 if (count > len)
44716 count = len;
44717 if (user) {
44718- if (copy_from_user(msg, buf, count))
44719+ if (count > sizeof msg || copy_from_user(msg, buf, count))
44720 return -EFAULT;
44721 } else
44722 memcpy(msg, buf, count);
44723diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c
44724index 87f7dff..7300125 100644
44725--- a/drivers/isdn/mISDN/dsp_cmx.c
44726+++ b/drivers/isdn/mISDN/dsp_cmx.c
44727@@ -1625,7 +1625,7 @@ unsigned long dsp_spl_jiffies; /* calculate the next time to fire */
44728 static u16 dsp_count; /* last sample count */
44729 static int dsp_count_valid; /* if we have last sample count */
44730
44731-void
44732+void __intentional_overflow(-1)
44733 dsp_cmx_send(void *arg)
44734 {
44735 struct dsp_conf *conf;
44736diff --git a/drivers/leds/leds-clevo-mail.c b/drivers/leds/leds-clevo-mail.c
44737index 0f9ed1e..2715d6f 100644
44738--- a/drivers/leds/leds-clevo-mail.c
44739+++ b/drivers/leds/leds-clevo-mail.c
44740@@ -40,7 +40,7 @@ static int __init clevo_mail_led_dmi_callback(const struct dmi_system_id *id)
44741 * detected as working, but in reality it is not) as low as
44742 * possible.
44743 */
44744-static struct dmi_system_id clevo_mail_led_dmi_table[] __initdata = {
44745+static struct dmi_system_id clevo_mail_led_dmi_table[] __initconst = {
44746 {
44747 .callback = clevo_mail_led_dmi_callback,
44748 .ident = "Clevo D410J",
44749diff --git a/drivers/leds/leds-ss4200.c b/drivers/leds/leds-ss4200.c
44750index 046cb70..6b20d39 100644
44751--- a/drivers/leds/leds-ss4200.c
44752+++ b/drivers/leds/leds-ss4200.c
44753@@ -91,7 +91,7 @@ MODULE_PARM_DESC(nodetect, "Skip DMI-based hardware detection");
44754 * detected as working, but in reality it is not) as low as
44755 * possible.
44756 */
44757-static struct dmi_system_id nas_led_whitelist[] __initdata = {
44758+static struct dmi_system_id nas_led_whitelist[] __initconst = {
44759 {
44760 .callback = ss4200_led_dmi_callback,
44761 .ident = "Intel SS4200-E",
44762diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c
44763index 7dc93aa..8272379 100644
44764--- a/drivers/lguest/core.c
44765+++ b/drivers/lguest/core.c
44766@@ -96,9 +96,17 @@ static __init int map_switcher(void)
44767 * The end address needs +1 because __get_vm_area allocates an
44768 * extra guard page, so we need space for that.
44769 */
44770+
44771+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
44772+ switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44773+ VM_ALLOC | VM_KERNEXEC, switcher_addr, switcher_addr
44774+ + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44775+#else
44776 switcher_vma = __get_vm_area(TOTAL_SWITCHER_PAGES * PAGE_SIZE,
44777 VM_ALLOC, switcher_addr, switcher_addr
44778 + (TOTAL_SWITCHER_PAGES+1) * PAGE_SIZE);
44779+#endif
44780+
44781 if (!switcher_vma) {
44782 err = -ENOMEM;
44783 printk("lguest: could not map switcher pages high\n");
44784@@ -121,7 +129,7 @@ static __init int map_switcher(void)
44785 * Now the Switcher is mapped at the right address, we can't fail!
44786 * Copy in the compiled-in Switcher code (from x86/switcher_32.S).
44787 */
44788- memcpy(switcher_vma->addr, start_switcher_text,
44789+ memcpy(switcher_vma->addr, ktla_ktva(start_switcher_text),
44790 end_switcher_text - start_switcher_text);
44791
44792 printk(KERN_INFO "lguest: mapped switcher at %p\n",
44793diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c
44794index e3abebc9..6a35328 100644
44795--- a/drivers/lguest/page_tables.c
44796+++ b/drivers/lguest/page_tables.c
44797@@ -585,7 +585,7 @@ void pin_page(struct lg_cpu *cpu, unsigned long vaddr)
44798 /*:*/
44799
44800 #ifdef CONFIG_X86_PAE
44801-static void release_pmd(pmd_t *spmd)
44802+static void __intentional_overflow(-1) release_pmd(pmd_t *spmd)
44803 {
44804 /* If the entry's not present, there's nothing to release. */
44805 if (pmd_flags(*spmd) & _PAGE_PRESENT) {
44806diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
44807index 30f2aef..391c748 100644
44808--- a/drivers/lguest/x86/core.c
44809+++ b/drivers/lguest/x86/core.c
44810@@ -60,7 +60,7 @@ static struct {
44811 /* Offset from where switcher.S was compiled to where we've copied it */
44812 static unsigned long switcher_offset(void)
44813 {
44814- return switcher_addr - (unsigned long)start_switcher_text;
44815+ return switcher_addr - (unsigned long)ktla_ktva(start_switcher_text);
44816 }
44817
44818 /* This cpu's struct lguest_pages (after the Switcher text page) */
44819@@ -100,7 +100,13 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
44820 * These copies are pretty cheap, so we do them unconditionally: */
44821 /* Save the current Host top-level page directory.
44822 */
44823+
44824+#ifdef CONFIG_PAX_PER_CPU_PGD
44825+ pages->state.host_cr3 = read_cr3();
44826+#else
44827 pages->state.host_cr3 = __pa(current->mm->pgd);
44828+#endif
44829+
44830 /*
44831 * Set up the Guest's page tables to see this CPU's pages (and no
44832 * other CPU's pages).
44833@@ -494,7 +500,7 @@ void __init lguest_arch_host_init(void)
44834 * compiled-in switcher code and the high-mapped copy we just made.
44835 */
44836 for (i = 0; i < IDT_ENTRIES; i++)
44837- default_idt_entries[i] += switcher_offset();
44838+ default_idt_entries[i] = ktla_ktva(default_idt_entries[i]) + switcher_offset();
44839
44840 /*
44841 * Set up the Switcher's per-cpu areas.
44842@@ -577,7 +583,7 @@ void __init lguest_arch_host_init(void)
44843 * it will be undisturbed when we switch. To change %cs and jump we
44844 * need this structure to feed to Intel's "lcall" instruction.
44845 */
44846- lguest_entry.offset = (long)switch_to_guest + switcher_offset();
44847+ lguest_entry.offset = (long)ktla_ktva(switch_to_guest) + switcher_offset();
44848 lguest_entry.segment = LGUEST_CS;
44849
44850 /*
44851diff --git a/drivers/lguest/x86/switcher_32.S b/drivers/lguest/x86/switcher_32.S
44852index 40634b0..4f5855e 100644
44853--- a/drivers/lguest/x86/switcher_32.S
44854+++ b/drivers/lguest/x86/switcher_32.S
44855@@ -87,6 +87,7 @@
44856 #include <asm/page.h>
44857 #include <asm/segment.h>
44858 #include <asm/lguest.h>
44859+#include <asm/processor-flags.h>
44860
44861 // We mark the start of the code to copy
44862 // It's placed in .text tho it's never run here
44863@@ -149,6 +150,13 @@ ENTRY(switch_to_guest)
44864 // Changes type when we load it: damn Intel!
44865 // For after we switch over our page tables
44866 // That entry will be read-only: we'd crash.
44867+
44868+#ifdef CONFIG_PAX_KERNEXEC
44869+ mov %cr0, %edx
44870+ xor $X86_CR0_WP, %edx
44871+ mov %edx, %cr0
44872+#endif
44873+
44874 movl $(GDT_ENTRY_TSS*8), %edx
44875 ltr %dx
44876
44877@@ -157,9 +165,15 @@ ENTRY(switch_to_guest)
44878 // Let's clear it again for our return.
44879 // The GDT descriptor of the Host
44880 // Points to the table after two "size" bytes
44881- movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %edx
44882+ movl (LGUEST_PAGES_host_gdt_desc+2)(%eax), %eax
44883 // Clear "used" from type field (byte 5, bit 2)
44884- andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%edx)
44885+ andb $0xFD, (GDT_ENTRY_TSS*8 + 5)(%eax)
44886+
44887+#ifdef CONFIG_PAX_KERNEXEC
44888+ mov %cr0, %eax
44889+ xor $X86_CR0_WP, %eax
44890+ mov %eax, %cr0
44891+#endif
44892
44893 // Once our page table's switched, the Guest is live!
44894 // The Host fades as we run this final step.
44895@@ -295,13 +309,12 @@ deliver_to_host:
44896 // I consulted gcc, and it gave
44897 // These instructions, which I gladly credit:
44898 leal (%edx,%ebx,8), %eax
44899- movzwl (%eax),%edx
44900- movl 4(%eax), %eax
44901- xorw %ax, %ax
44902- orl %eax, %edx
44903+ movl 4(%eax), %edx
44904+ movw (%eax), %dx
44905 // Now the address of the handler's in %edx
44906 // We call it now: its "iret" drops us home.
44907- jmp *%edx
44908+ ljmp $__KERNEL_CS, $1f
44909+1: jmp *%edx
44910
44911 // Every interrupt can come to us here
44912 // But we must truly tell each apart.
44913diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
44914index a08e3ee..df8ade2 100644
44915--- a/drivers/md/bcache/closure.h
44916+++ b/drivers/md/bcache/closure.h
44917@@ -238,7 +238,7 @@ static inline void closure_set_stopped(struct closure *cl)
44918 static inline void set_closure_fn(struct closure *cl, closure_fn *fn,
44919 struct workqueue_struct *wq)
44920 {
44921- BUG_ON(object_is_on_stack(cl));
44922+ BUG_ON(object_starts_on_stack(cl));
44923 closure_set_ip(cl);
44924 cl->fn = fn;
44925 cl->wq = wq;
44926diff --git a/drivers/md/bitmap.c b/drivers/md/bitmap.c
44927index 3a57679..c58cdaf 100644
44928--- a/drivers/md/bitmap.c
44929+++ b/drivers/md/bitmap.c
44930@@ -1786,7 +1786,7 @@ void bitmap_status(struct seq_file *seq, struct bitmap *bitmap)
44931 chunk_kb ? "KB" : "B");
44932 if (bitmap->storage.file) {
44933 seq_printf(seq, ", file: ");
44934- seq_path(seq, &bitmap->storage.file->f_path, " \t\n");
44935+ seq_path(seq, &bitmap->storage.file->f_path, " \t\n\\");
44936 }
44937
44938 seq_printf(seq, "\n");
44939diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c
44940index c8a18e4..0ab43e5 100644
44941--- a/drivers/md/dm-ioctl.c
44942+++ b/drivers/md/dm-ioctl.c
44943@@ -1772,7 +1772,7 @@ static int validate_params(uint cmd, struct dm_ioctl *param)
44944 cmd == DM_LIST_VERSIONS_CMD)
44945 return 0;
44946
44947- if ((cmd == DM_DEV_CREATE_CMD)) {
44948+ if (cmd == DM_DEV_CREATE_CMD) {
44949 if (!*param->name) {
44950 DMWARN("name not supplied when creating device");
44951 return -EINVAL;
44952diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
44953index 089d627..ef7352e 100644
44954--- a/drivers/md/dm-raid1.c
44955+++ b/drivers/md/dm-raid1.c
44956@@ -40,7 +40,7 @@ enum dm_raid1_error {
44957
44958 struct mirror {
44959 struct mirror_set *ms;
44960- atomic_t error_count;
44961+ atomic_unchecked_t error_count;
44962 unsigned long error_type;
44963 struct dm_dev *dev;
44964 sector_t offset;
44965@@ -186,7 +186,7 @@ static struct mirror *get_valid_mirror(struct mirror_set *ms)
44966 struct mirror *m;
44967
44968 for (m = ms->mirror; m < ms->mirror + ms->nr_mirrors; m++)
44969- if (!atomic_read(&m->error_count))
44970+ if (!atomic_read_unchecked(&m->error_count))
44971 return m;
44972
44973 return NULL;
44974@@ -218,7 +218,7 @@ static void fail_mirror(struct mirror *m, enum dm_raid1_error error_type)
44975 * simple way to tell if a device has encountered
44976 * errors.
44977 */
44978- atomic_inc(&m->error_count);
44979+ atomic_inc_unchecked(&m->error_count);
44980
44981 if (test_and_set_bit(error_type, &m->error_type))
44982 return;
44983@@ -409,7 +409,7 @@ static struct mirror *choose_mirror(struct mirror_set *ms, sector_t sector)
44984 struct mirror *m = get_default_mirror(ms);
44985
44986 do {
44987- if (likely(!atomic_read(&m->error_count)))
44988+ if (likely(!atomic_read_unchecked(&m->error_count)))
44989 return m;
44990
44991 if (m-- == ms->mirror)
44992@@ -423,7 +423,7 @@ static int default_ok(struct mirror *m)
44993 {
44994 struct mirror *default_mirror = get_default_mirror(m->ms);
44995
44996- return !atomic_read(&default_mirror->error_count);
44997+ return !atomic_read_unchecked(&default_mirror->error_count);
44998 }
44999
45000 static int mirror_available(struct mirror_set *ms, struct bio *bio)
45001@@ -560,7 +560,7 @@ static void do_reads(struct mirror_set *ms, struct bio_list *reads)
45002 */
45003 if (likely(region_in_sync(ms, region, 1)))
45004 m = choose_mirror(ms, bio->bi_iter.bi_sector);
45005- else if (m && atomic_read(&m->error_count))
45006+ else if (m && atomic_read_unchecked(&m->error_count))
45007 m = NULL;
45008
45009 if (likely(m))
45010@@ -936,7 +936,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
45011 }
45012
45013 ms->mirror[mirror].ms = ms;
45014- atomic_set(&(ms->mirror[mirror].error_count), 0);
45015+ atomic_set_unchecked(&(ms->mirror[mirror].error_count), 0);
45016 ms->mirror[mirror].error_type = 0;
45017 ms->mirror[mirror].offset = offset;
45018
45019@@ -1351,7 +1351,7 @@ static void mirror_resume(struct dm_target *ti)
45020 */
45021 static char device_status_char(struct mirror *m)
45022 {
45023- if (!atomic_read(&(m->error_count)))
45024+ if (!atomic_read_unchecked(&(m->error_count)))
45025 return 'A';
45026
45027 return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
45028diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c
45029index f478a4c..4b8e5ef 100644
45030--- a/drivers/md/dm-stats.c
45031+++ b/drivers/md/dm-stats.c
45032@@ -382,7 +382,7 @@ do_sync_free:
45033 synchronize_rcu_expedited();
45034 dm_stat_free(&s->rcu_head);
45035 } else {
45036- ACCESS_ONCE(dm_stat_need_rcu_barrier) = 1;
45037+ ACCESS_ONCE_RW(dm_stat_need_rcu_barrier) = 1;
45038 call_rcu(&s->rcu_head, dm_stat_free);
45039 }
45040 return 0;
45041@@ -554,8 +554,8 @@ void dm_stats_account_io(struct dm_stats *stats, unsigned long bi_rw,
45042 ((bi_rw & (REQ_WRITE | REQ_DISCARD)) ==
45043 (ACCESS_ONCE(last->last_rw) & (REQ_WRITE | REQ_DISCARD)))
45044 ));
45045- ACCESS_ONCE(last->last_sector) = end_sector;
45046- ACCESS_ONCE(last->last_rw) = bi_rw;
45047+ ACCESS_ONCE_RW(last->last_sector) = end_sector;
45048+ ACCESS_ONCE_RW(last->last_rw) = bi_rw;
45049 }
45050
45051 rcu_read_lock();
45052diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
45053index f8b37d4..5c5cafd 100644
45054--- a/drivers/md/dm-stripe.c
45055+++ b/drivers/md/dm-stripe.c
45056@@ -21,7 +21,7 @@ struct stripe {
45057 struct dm_dev *dev;
45058 sector_t physical_start;
45059
45060- atomic_t error_count;
45061+ atomic_unchecked_t error_count;
45062 };
45063
45064 struct stripe_c {
45065@@ -188,7 +188,7 @@ static int stripe_ctr(struct dm_target *ti, unsigned int argc, char **argv)
45066 kfree(sc);
45067 return r;
45068 }
45069- atomic_set(&(sc->stripe[i].error_count), 0);
45070+ atomic_set_unchecked(&(sc->stripe[i].error_count), 0);
45071 }
45072
45073 ti->private = sc;
45074@@ -332,7 +332,7 @@ static void stripe_status(struct dm_target *ti, status_type_t type,
45075 DMEMIT("%d ", sc->stripes);
45076 for (i = 0; i < sc->stripes; i++) {
45077 DMEMIT("%s ", sc->stripe[i].dev->name);
45078- buffer[i] = atomic_read(&(sc->stripe[i].error_count)) ?
45079+ buffer[i] = atomic_read_unchecked(&(sc->stripe[i].error_count)) ?
45080 'D' : 'A';
45081 }
45082 buffer[i] = '\0';
45083@@ -377,8 +377,8 @@ static int stripe_end_io(struct dm_target *ti, struct bio *bio, int error)
45084 */
45085 for (i = 0; i < sc->stripes; i++)
45086 if (!strcmp(sc->stripe[i].dev->name, major_minor)) {
45087- atomic_inc(&(sc->stripe[i].error_count));
45088- if (atomic_read(&(sc->stripe[i].error_count)) <
45089+ atomic_inc_unchecked(&(sc->stripe[i].error_count));
45090+ if (atomic_read_unchecked(&(sc->stripe[i].error_count)) <
45091 DM_IO_ERROR_THRESHOLD)
45092 schedule_work(&sc->trigger_event);
45093 }
45094diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
45095index 6554d91..b0221c2 100644
45096--- a/drivers/md/dm-table.c
45097+++ b/drivers/md/dm-table.c
45098@@ -303,7 +303,7 @@ static int device_area_is_invalid(struct dm_target *ti, struct dm_dev *dev,
45099 if (!dev_size)
45100 return 0;
45101
45102- if ((start >= dev_size) || (start + len > dev_size)) {
45103+ if ((start >= dev_size) || (len > dev_size - start)) {
45104 DMWARN("%s: %s too small for target: "
45105 "start=%llu, len=%llu, dev_size=%llu",
45106 dm_device_name(ti->table->md), bdevname(bdev, b),
45107diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c
45108index 79f6941..b33b4e0 100644
45109--- a/drivers/md/dm-thin-metadata.c
45110+++ b/drivers/md/dm-thin-metadata.c
45111@@ -404,7 +404,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45112 {
45113 pmd->info.tm = pmd->tm;
45114 pmd->info.levels = 2;
45115- pmd->info.value_type.context = pmd->data_sm;
45116+ pmd->info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45117 pmd->info.value_type.size = sizeof(__le64);
45118 pmd->info.value_type.inc = data_block_inc;
45119 pmd->info.value_type.dec = data_block_dec;
45120@@ -423,7 +423,7 @@ static void __setup_btree_details(struct dm_pool_metadata *pmd)
45121
45122 pmd->bl_info.tm = pmd->tm;
45123 pmd->bl_info.levels = 1;
45124- pmd->bl_info.value_type.context = pmd->data_sm;
45125+ pmd->bl_info.value_type.context = (dm_space_map_no_const *)pmd->data_sm;
45126 pmd->bl_info.value_type.size = sizeof(__le64);
45127 pmd->bl_info.value_type.inc = data_block_inc;
45128 pmd->bl_info.value_type.dec = data_block_dec;
45129diff --git a/drivers/md/dm.c b/drivers/md/dm.c
45130index 8001fe9..abdd0d0 100644
45131--- a/drivers/md/dm.c
45132+++ b/drivers/md/dm.c
45133@@ -188,9 +188,9 @@ struct mapped_device {
45134 /*
45135 * Event handling.
45136 */
45137- atomic_t event_nr;
45138+ atomic_unchecked_t event_nr;
45139 wait_queue_head_t eventq;
45140- atomic_t uevent_seq;
45141+ atomic_unchecked_t uevent_seq;
45142 struct list_head uevent_list;
45143 spinlock_t uevent_lock; /* Protect access to uevent_list */
45144
45145@@ -2163,8 +2163,8 @@ static struct mapped_device *alloc_dev(int minor)
45146 spin_lock_init(&md->deferred_lock);
45147 atomic_set(&md->holders, 1);
45148 atomic_set(&md->open_count, 0);
45149- atomic_set(&md->event_nr, 0);
45150- atomic_set(&md->uevent_seq, 0);
45151+ atomic_set_unchecked(&md->event_nr, 0);
45152+ atomic_set_unchecked(&md->uevent_seq, 0);
45153 INIT_LIST_HEAD(&md->uevent_list);
45154 INIT_LIST_HEAD(&md->table_devices);
45155 spin_lock_init(&md->uevent_lock);
45156@@ -2329,7 +2329,7 @@ static void event_callback(void *context)
45157
45158 dm_send_uevents(&uevents, &disk_to_dev(md->disk)->kobj);
45159
45160- atomic_inc(&md->event_nr);
45161+ atomic_inc_unchecked(&md->event_nr);
45162 wake_up(&md->eventq);
45163 }
45164
45165@@ -3175,18 +3175,18 @@ int dm_kobject_uevent(struct mapped_device *md, enum kobject_action action,
45166
45167 uint32_t dm_next_uevent_seq(struct mapped_device *md)
45168 {
45169- return atomic_add_return(1, &md->uevent_seq);
45170+ return atomic_add_return_unchecked(1, &md->uevent_seq);
45171 }
45172
45173 uint32_t dm_get_event_nr(struct mapped_device *md)
45174 {
45175- return atomic_read(&md->event_nr);
45176+ return atomic_read_unchecked(&md->event_nr);
45177 }
45178
45179 int dm_wait_event(struct mapped_device *md, int event_nr)
45180 {
45181 return wait_event_interruptible(md->eventq,
45182- (event_nr != atomic_read(&md->event_nr)));
45183+ (event_nr != atomic_read_unchecked(&md->event_nr)));
45184 }
45185
45186 void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
45187diff --git a/drivers/md/md.c b/drivers/md/md.c
45188index e617878..d423ee3 100644
45189--- a/drivers/md/md.c
45190+++ b/drivers/md/md.c
45191@@ -191,10 +191,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
45192 * start build, activate spare
45193 */
45194 static DECLARE_WAIT_QUEUE_HEAD(md_event_waiters);
45195-static atomic_t md_event_count;
45196+static atomic_unchecked_t md_event_count;
45197 void md_new_event(struct mddev *mddev)
45198 {
45199- atomic_inc(&md_event_count);
45200+ atomic_inc_unchecked(&md_event_count);
45201 wake_up(&md_event_waiters);
45202 }
45203 EXPORT_SYMBOL_GPL(md_new_event);
45204@@ -204,7 +204,7 @@ EXPORT_SYMBOL_GPL(md_new_event);
45205 */
45206 static void md_new_event_inintr(struct mddev *mddev)
45207 {
45208- atomic_inc(&md_event_count);
45209+ atomic_inc_unchecked(&md_event_count);
45210 wake_up(&md_event_waiters);
45211 }
45212
45213@@ -1442,7 +1442,7 @@ static int super_1_load(struct md_rdev *rdev, struct md_rdev *refdev, int minor_
45214 if ((le32_to_cpu(sb->feature_map) & MD_FEATURE_RESHAPE_ACTIVE) &&
45215 (le32_to_cpu(sb->feature_map) & MD_FEATURE_NEW_OFFSET))
45216 rdev->new_data_offset += (s32)le32_to_cpu(sb->new_offset);
45217- atomic_set(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45218+ atomic_set_unchecked(&rdev->corrected_errors, le32_to_cpu(sb->cnt_corrected_read));
45219
45220 rdev->sb_size = le32_to_cpu(sb->max_dev) * 2 + 256;
45221 bmask = queue_logical_block_size(rdev->bdev->bd_disk->queue)-1;
45222@@ -1693,7 +1693,7 @@ static void super_1_sync(struct mddev *mddev, struct md_rdev *rdev)
45223 else
45224 sb->resync_offset = cpu_to_le64(0);
45225
45226- sb->cnt_corrected_read = cpu_to_le32(atomic_read(&rdev->corrected_errors));
45227+ sb->cnt_corrected_read = cpu_to_le32(atomic_read_unchecked(&rdev->corrected_errors));
45228
45229 sb->raid_disks = cpu_to_le32(mddev->raid_disks);
45230 sb->size = cpu_to_le64(mddev->dev_sectors);
45231@@ -2564,7 +2564,7 @@ __ATTR_PREALLOC(state, S_IRUGO|S_IWUSR, state_show, state_store);
45232 static ssize_t
45233 errors_show(struct md_rdev *rdev, char *page)
45234 {
45235- return sprintf(page, "%d\n", atomic_read(&rdev->corrected_errors));
45236+ return sprintf(page, "%d\n", atomic_read_unchecked(&rdev->corrected_errors));
45237 }
45238
45239 static ssize_t
45240@@ -2573,7 +2573,7 @@ errors_store(struct md_rdev *rdev, const char *buf, size_t len)
45241 char *e;
45242 unsigned long n = simple_strtoul(buf, &e, 10);
45243 if (*buf && (*e == 0 || *e == '\n')) {
45244- atomic_set(&rdev->corrected_errors, n);
45245+ atomic_set_unchecked(&rdev->corrected_errors, n);
45246 return len;
45247 }
45248 return -EINVAL;
45249@@ -3009,8 +3009,8 @@ int md_rdev_init(struct md_rdev *rdev)
45250 rdev->sb_loaded = 0;
45251 rdev->bb_page = NULL;
45252 atomic_set(&rdev->nr_pending, 0);
45253- atomic_set(&rdev->read_errors, 0);
45254- atomic_set(&rdev->corrected_errors, 0);
45255+ atomic_set_unchecked(&rdev->read_errors, 0);
45256+ atomic_set_unchecked(&rdev->corrected_errors, 0);
45257
45258 INIT_LIST_HEAD(&rdev->same_set);
45259 init_waitqueue_head(&rdev->blocked_wait);
45260@@ -7083,7 +7083,7 @@ static int md_seq_show(struct seq_file *seq, void *v)
45261
45262 spin_unlock(&pers_lock);
45263 seq_printf(seq, "\n");
45264- seq->poll_event = atomic_read(&md_event_count);
45265+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45266 return 0;
45267 }
45268 if (v == (void*)2) {
45269@@ -7186,7 +7186,7 @@ static int md_seq_open(struct inode *inode, struct file *file)
45270 return error;
45271
45272 seq = file->private_data;
45273- seq->poll_event = atomic_read(&md_event_count);
45274+ seq->poll_event = atomic_read_unchecked(&md_event_count);
45275 return error;
45276 }
45277
45278@@ -7203,7 +7203,7 @@ static unsigned int mdstat_poll(struct file *filp, poll_table *wait)
45279 /* always allow read */
45280 mask = POLLIN | POLLRDNORM;
45281
45282- if (seq->poll_event != atomic_read(&md_event_count))
45283+ if (seq->poll_event != atomic_read_unchecked(&md_event_count))
45284 mask |= POLLERR | POLLPRI;
45285 return mask;
45286 }
45287@@ -7250,7 +7250,7 @@ static int is_mddev_idle(struct mddev *mddev, int init)
45288 struct gendisk *disk = rdev->bdev->bd_contains->bd_disk;
45289 curr_events = (int)part_stat_read(&disk->part0, sectors[0]) +
45290 (int)part_stat_read(&disk->part0, sectors[1]) -
45291- atomic_read(&disk->sync_io);
45292+ atomic_read_unchecked(&disk->sync_io);
45293 /* sync IO will cause sync_io to increase before the disk_stats
45294 * as sync_io is counted when a request starts, and
45295 * disk_stats is counted when it completes.
45296diff --git a/drivers/md/md.h b/drivers/md/md.h
45297index 318ca8f..31e4478 100644
45298--- a/drivers/md/md.h
45299+++ b/drivers/md/md.h
45300@@ -94,13 +94,13 @@ struct md_rdev {
45301 * only maintained for arrays that
45302 * support hot removal
45303 */
45304- atomic_t read_errors; /* number of consecutive read errors that
45305+ atomic_unchecked_t read_errors; /* number of consecutive read errors that
45306 * we have tried to ignore.
45307 */
45308 struct timespec last_read_error; /* monotonic time since our
45309 * last read error
45310 */
45311- atomic_t corrected_errors; /* number of corrected read errors,
45312+ atomic_unchecked_t corrected_errors; /* number of corrected read errors,
45313 * for reporting to userspace and storing
45314 * in superblock.
45315 */
45316@@ -476,7 +476,7 @@ extern void mddev_unlock(struct mddev *mddev);
45317
45318 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors)
45319 {
45320- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45321+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io);
45322 }
45323
45324 struct md_personality
45325diff --git a/drivers/md/persistent-data/dm-space-map-metadata.c b/drivers/md/persistent-data/dm-space-map-metadata.c
45326index e8a9042..35bd145 100644
45327--- a/drivers/md/persistent-data/dm-space-map-metadata.c
45328+++ b/drivers/md/persistent-data/dm-space-map-metadata.c
45329@@ -683,7 +683,7 @@ static int sm_metadata_extend(struct dm_space_map *sm, dm_block_t extra_blocks)
45330 * Flick into a mode where all blocks get allocated in the new area.
45331 */
45332 smm->begin = old_len;
45333- memcpy(sm, &bootstrap_ops, sizeof(*sm));
45334+ memcpy((void *)sm, &bootstrap_ops, sizeof(*sm));
45335
45336 /*
45337 * Extend.
45338@@ -714,7 +714,7 @@ out:
45339 /*
45340 * Switch back to normal behaviour.
45341 */
45342- memcpy(sm, &ops, sizeof(*sm));
45343+ memcpy((void *)sm, &ops, sizeof(*sm));
45344 return r;
45345 }
45346
45347diff --git a/drivers/md/persistent-data/dm-space-map.h b/drivers/md/persistent-data/dm-space-map.h
45348index 3e6d115..ffecdeb 100644
45349--- a/drivers/md/persistent-data/dm-space-map.h
45350+++ b/drivers/md/persistent-data/dm-space-map.h
45351@@ -71,6 +71,7 @@ struct dm_space_map {
45352 dm_sm_threshold_fn fn,
45353 void *context);
45354 };
45355+typedef struct dm_space_map __no_const dm_space_map_no_const;
45356
45357 /*----------------------------------------------------------------*/
45358
45359diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
45360index d34e238..34f8d98 100644
45361--- a/drivers/md/raid1.c
45362+++ b/drivers/md/raid1.c
45363@@ -1922,7 +1922,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio)
45364 if (r1_sync_page_io(rdev, sect, s,
45365 bio->bi_io_vec[idx].bv_page,
45366 READ) != 0)
45367- atomic_add(s, &rdev->corrected_errors);
45368+ atomic_add_unchecked(s, &rdev->corrected_errors);
45369 }
45370 sectors -= s;
45371 sect += s;
45372@@ -2155,7 +2155,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk,
45373 !test_bit(Faulty, &rdev->flags)) {
45374 if (r1_sync_page_io(rdev, sect, s,
45375 conf->tmppage, READ)) {
45376- atomic_add(s, &rdev->corrected_errors);
45377+ atomic_add_unchecked(s, &rdev->corrected_errors);
45378 printk(KERN_INFO
45379 "md/raid1:%s: read error corrected "
45380 "(%d sectors at %llu on %s)\n",
45381diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
45382index a7196c4..439f012 100644
45383--- a/drivers/md/raid10.c
45384+++ b/drivers/md/raid10.c
45385@@ -1934,7 +1934,7 @@ static void end_sync_read(struct bio *bio, int error)
45386 /* The write handler will notice the lack of
45387 * R10BIO_Uptodate and record any errors etc
45388 */
45389- atomic_add(r10_bio->sectors,
45390+ atomic_add_unchecked(r10_bio->sectors,
45391 &conf->mirrors[d].rdev->corrected_errors);
45392
45393 /* for reconstruct, we always reschedule after a read.
45394@@ -2291,7 +2291,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45395 {
45396 struct timespec cur_time_mon;
45397 unsigned long hours_since_last;
45398- unsigned int read_errors = atomic_read(&rdev->read_errors);
45399+ unsigned int read_errors = atomic_read_unchecked(&rdev->read_errors);
45400
45401 ktime_get_ts(&cur_time_mon);
45402
45403@@ -2313,9 +2313,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev)
45404 * overflowing the shift of read_errors by hours_since_last.
45405 */
45406 if (hours_since_last >= 8 * sizeof(read_errors))
45407- atomic_set(&rdev->read_errors, 0);
45408+ atomic_set_unchecked(&rdev->read_errors, 0);
45409 else
45410- atomic_set(&rdev->read_errors, read_errors >> hours_since_last);
45411+ atomic_set_unchecked(&rdev->read_errors, read_errors >> hours_since_last);
45412 }
45413
45414 static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector,
45415@@ -2369,8 +2369,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45416 return;
45417
45418 check_decay_read_errors(mddev, rdev);
45419- atomic_inc(&rdev->read_errors);
45420- if (atomic_read(&rdev->read_errors) > max_read_errors) {
45421+ atomic_inc_unchecked(&rdev->read_errors);
45422+ if (atomic_read_unchecked(&rdev->read_errors) > max_read_errors) {
45423 char b[BDEVNAME_SIZE];
45424 bdevname(rdev->bdev, b);
45425
45426@@ -2378,7 +2378,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45427 "md/raid10:%s: %s: Raid device exceeded "
45428 "read_error threshold [cur %d:max %d]\n",
45429 mdname(mddev), b,
45430- atomic_read(&rdev->read_errors), max_read_errors);
45431+ atomic_read_unchecked(&rdev->read_errors), max_read_errors);
45432 printk(KERN_NOTICE
45433 "md/raid10:%s: %s: Failing raid device\n",
45434 mdname(mddev), b);
45435@@ -2533,7 +2533,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10
45436 sect +
45437 choose_data_offset(r10_bio, rdev)),
45438 bdevname(rdev->bdev, b));
45439- atomic_add(s, &rdev->corrected_errors);
45440+ atomic_add_unchecked(s, &rdev->corrected_errors);
45441 }
45442
45443 rdev_dec_pending(rdev, mddev);
45444diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
45445index cd2f96b..3876e63 100644
45446--- a/drivers/md/raid5.c
45447+++ b/drivers/md/raid5.c
45448@@ -947,23 +947,23 @@ async_copy_data(int frombio, struct bio *bio, struct page **page,
45449 struct bio_vec bvl;
45450 struct bvec_iter iter;
45451 struct page *bio_page;
45452- int page_offset;
45453+ s64 page_offset;
45454 struct async_submit_ctl submit;
45455 enum async_tx_flags flags = 0;
45456
45457 if (bio->bi_iter.bi_sector >= sector)
45458- page_offset = (signed)(bio->bi_iter.bi_sector - sector) * 512;
45459+ page_offset = (s64)(bio->bi_iter.bi_sector - sector) * 512;
45460 else
45461- page_offset = (signed)(sector - bio->bi_iter.bi_sector) * -512;
45462+ page_offset = (s64)(sector - bio->bi_iter.bi_sector) * -512;
45463
45464 if (frombio)
45465 flags |= ASYNC_TX_FENCE;
45466 init_async_submit(&submit, flags, tx, NULL, NULL, NULL);
45467
45468 bio_for_each_segment(bvl, bio, iter) {
45469- int len = bvl.bv_len;
45470- int clen;
45471- int b_offset = 0;
45472+ s64 len = bvl.bv_len;
45473+ s64 clen;
45474+ s64 b_offset = 0;
45475
45476 if (page_offset < 0) {
45477 b_offset = -page_offset;
45478@@ -1727,6 +1727,10 @@ static int grow_one_stripe(struct r5conf *conf, int hash)
45479 return 1;
45480 }
45481
45482+#ifdef CONFIG_GRKERNSEC_HIDESYM
45483+static atomic_unchecked_t raid5_cache_id = ATOMIC_INIT(0);
45484+#endif
45485+
45486 static int grow_stripes(struct r5conf *conf, int num)
45487 {
45488 struct kmem_cache *sc;
45489@@ -1738,7 +1742,11 @@ static int grow_stripes(struct r5conf *conf, int num)
45490 "raid%d-%s", conf->level, mdname(conf->mddev));
45491 else
45492 sprintf(conf->cache_name[0],
45493+#ifdef CONFIG_GRKERNSEC_HIDESYM
45494+ "raid%d-%08lx", conf->level, atomic_inc_return_unchecked(&raid5_cache_id));
45495+#else
45496 "raid%d-%p", conf->level, conf->mddev);
45497+#endif
45498 sprintf(conf->cache_name[1], "%s-alt", conf->cache_name[0]);
45499
45500 conf->active_name = 0;
45501@@ -2014,21 +2022,21 @@ static void raid5_end_read_request(struct bio * bi, int error)
45502 mdname(conf->mddev), STRIPE_SECTORS,
45503 (unsigned long long)s,
45504 bdevname(rdev->bdev, b));
45505- atomic_add(STRIPE_SECTORS, &rdev->corrected_errors);
45506+ atomic_add_unchecked(STRIPE_SECTORS, &rdev->corrected_errors);
45507 clear_bit(R5_ReadError, &sh->dev[i].flags);
45508 clear_bit(R5_ReWrite, &sh->dev[i].flags);
45509 } else if (test_bit(R5_ReadNoMerge, &sh->dev[i].flags))
45510 clear_bit(R5_ReadNoMerge, &sh->dev[i].flags);
45511
45512- if (atomic_read(&rdev->read_errors))
45513- atomic_set(&rdev->read_errors, 0);
45514+ if (atomic_read_unchecked(&rdev->read_errors))
45515+ atomic_set_unchecked(&rdev->read_errors, 0);
45516 } else {
45517 const char *bdn = bdevname(rdev->bdev, b);
45518 int retry = 0;
45519 int set_bad = 0;
45520
45521 clear_bit(R5_UPTODATE, &sh->dev[i].flags);
45522- atomic_inc(&rdev->read_errors);
45523+ atomic_inc_unchecked(&rdev->read_errors);
45524 if (test_bit(R5_ReadRepl, &sh->dev[i].flags))
45525 printk_ratelimited(
45526 KERN_WARNING
45527@@ -2056,7 +2064,7 @@ static void raid5_end_read_request(struct bio * bi, int error)
45528 mdname(conf->mddev),
45529 (unsigned long long)s,
45530 bdn);
45531- } else if (atomic_read(&rdev->read_errors)
45532+ } else if (atomic_read_unchecked(&rdev->read_errors)
45533 > conf->max_nr_stripes)
45534 printk(KERN_WARNING
45535 "md/raid:%s: Too many read errors, failing device %s.\n",
45536diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c
45537index 983db75..ef9248c 100644
45538--- a/drivers/media/dvb-core/dvbdev.c
45539+++ b/drivers/media/dvb-core/dvbdev.c
45540@@ -185,7 +185,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev,
45541 const struct dvb_device *template, void *priv, int type)
45542 {
45543 struct dvb_device *dvbdev;
45544- struct file_operations *dvbdevfops;
45545+ file_operations_no_const *dvbdevfops;
45546 struct device *clsdev;
45547 int minor;
45548 int id;
45549diff --git a/drivers/media/dvb-frontends/af9033.h b/drivers/media/dvb-frontends/af9033.h
45550index 6ad22b6..6e90e2a 100644
45551--- a/drivers/media/dvb-frontends/af9033.h
45552+++ b/drivers/media/dvb-frontends/af9033.h
45553@@ -96,6 +96,6 @@ struct af9033_ops {
45554 int (*pid_filter_ctrl)(struct dvb_frontend *fe, int onoff);
45555 int (*pid_filter)(struct dvb_frontend *fe, int index, u16 pid,
45556 int onoff);
45557-};
45558+} __no_const;
45559
45560 #endif /* AF9033_H */
45561diff --git a/drivers/media/dvb-frontends/dib3000.h b/drivers/media/dvb-frontends/dib3000.h
45562index 9b6c3bb..baeb5c7 100644
45563--- a/drivers/media/dvb-frontends/dib3000.h
45564+++ b/drivers/media/dvb-frontends/dib3000.h
45565@@ -39,7 +39,7 @@ struct dib_fe_xfer_ops
45566 int (*fifo_ctrl)(struct dvb_frontend *fe, int onoff);
45567 int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
45568 int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
45569-};
45570+} __no_const;
45571
45572 #if IS_ENABLED(CONFIG_DVB_DIB3000MB)
45573 extern struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
45574diff --git a/drivers/media/dvb-frontends/dib7000p.h b/drivers/media/dvb-frontends/dib7000p.h
45575index 1fea0e9..321ce8f 100644
45576--- a/drivers/media/dvb-frontends/dib7000p.h
45577+++ b/drivers/media/dvb-frontends/dib7000p.h
45578@@ -64,7 +64,7 @@ struct dib7000p_ops {
45579 int (*get_adc_power)(struct dvb_frontend *fe);
45580 int (*slave_reset)(struct dvb_frontend *fe);
45581 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib7000p_config *cfg);
45582-};
45583+} __no_const;
45584
45585 #if IS_ENABLED(CONFIG_DVB_DIB7000P)
45586 void *dib7000p_attach(struct dib7000p_ops *ops);
45587diff --git a/drivers/media/dvb-frontends/dib8000.h b/drivers/media/dvb-frontends/dib8000.h
45588index 84cc103..5780c54 100644
45589--- a/drivers/media/dvb-frontends/dib8000.h
45590+++ b/drivers/media/dvb-frontends/dib8000.h
45591@@ -61,7 +61,7 @@ struct dib8000_ops {
45592 int (*pid_filter_ctrl)(struct dvb_frontend *fe, u8 onoff);
45593 int (*pid_filter)(struct dvb_frontend *fe, u8 id, u16 pid, u8 onoff);
45594 struct dvb_frontend *(*init)(struct i2c_adapter *i2c_adap, u8 i2c_addr, struct dib8000_config *cfg);
45595-};
45596+} __no_const;
45597
45598 #if IS_ENABLED(CONFIG_DVB_DIB8000)
45599 void *dib8000_attach(struct dib8000_ops *ops);
45600diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
45601index 860c98fc..497fa25 100644
45602--- a/drivers/media/pci/cx88/cx88-video.c
45603+++ b/drivers/media/pci/cx88/cx88-video.c
45604@@ -50,9 +50,9 @@ MODULE_VERSION(CX88_VERSION);
45605
45606 /* ------------------------------------------------------------------ */
45607
45608-static unsigned int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45609-static unsigned int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45610-static unsigned int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45611+static int video_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45612+static int vbi_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45613+static int radio_nr[] = {[0 ... (CX88_MAXBOARDS - 1)] = UNSET };
45614
45615 module_param_array(video_nr, int, NULL, 0444);
45616 module_param_array(vbi_nr, int, NULL, 0444);
45617diff --git a/drivers/media/pci/ivtv/ivtv-driver.c b/drivers/media/pci/ivtv/ivtv-driver.c
45618index 802642d..5534900 100644
45619--- a/drivers/media/pci/ivtv/ivtv-driver.c
45620+++ b/drivers/media/pci/ivtv/ivtv-driver.c
45621@@ -83,7 +83,7 @@ static struct pci_device_id ivtv_pci_tbl[] = {
45622 MODULE_DEVICE_TABLE(pci,ivtv_pci_tbl);
45623
45624 /* ivtv instance counter */
45625-static atomic_t ivtv_instance = ATOMIC_INIT(0);
45626+static atomic_unchecked_t ivtv_instance = ATOMIC_INIT(0);
45627
45628 /* Parameter declarations */
45629 static int cardtype[IVTV_MAX_CARDS];
45630diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c
45631index 570d119..ed25830 100644
45632--- a/drivers/media/pci/solo6x10/solo6x10-core.c
45633+++ b/drivers/media/pci/solo6x10/solo6x10-core.c
45634@@ -424,7 +424,7 @@ static void solo_device_release(struct device *dev)
45635
45636 static int solo_sysfs_init(struct solo_dev *solo_dev)
45637 {
45638- struct bin_attribute *sdram_attr = &solo_dev->sdram_attr;
45639+ bin_attribute_no_const *sdram_attr = &solo_dev->sdram_attr;
45640 struct device *dev = &solo_dev->dev;
45641 const char *driver;
45642 int i;
45643diff --git a/drivers/media/pci/solo6x10/solo6x10-g723.c b/drivers/media/pci/solo6x10/solo6x10-g723.c
45644index 7ddc767..1c24361 100644
45645--- a/drivers/media/pci/solo6x10/solo6x10-g723.c
45646+++ b/drivers/media/pci/solo6x10/solo6x10-g723.c
45647@@ -351,7 +351,7 @@ static int solo_snd_pcm_init(struct solo_dev *solo_dev)
45648
45649 int solo_g723_init(struct solo_dev *solo_dev)
45650 {
45651- static struct snd_device_ops ops = { NULL };
45652+ static struct snd_device_ops ops = { };
45653 struct snd_card *card;
45654 struct snd_kcontrol_new kctl;
45655 char name[32];
45656diff --git a/drivers/media/pci/solo6x10/solo6x10-p2m.c b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45657index 8c84846..27b4f83 100644
45658--- a/drivers/media/pci/solo6x10/solo6x10-p2m.c
45659+++ b/drivers/media/pci/solo6x10/solo6x10-p2m.c
45660@@ -73,7 +73,7 @@ int solo_p2m_dma_desc(struct solo_dev *solo_dev,
45661
45662 /* Get next ID. According to Softlogic, 6110 has problems on !=0 P2M */
45663 if (solo_dev->type != SOLO_DEV_6110 && multi_p2m) {
45664- p2m_id = atomic_inc_return(&solo_dev->p2m_count) % SOLO_NR_P2M;
45665+ p2m_id = atomic_inc_return_unchecked(&solo_dev->p2m_count) % SOLO_NR_P2M;
45666 if (p2m_id < 0)
45667 p2m_id = -p2m_id;
45668 }
45669diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
45670index 1ca54b0..7d7cb9a 100644
45671--- a/drivers/media/pci/solo6x10/solo6x10.h
45672+++ b/drivers/media/pci/solo6x10/solo6x10.h
45673@@ -218,7 +218,7 @@ struct solo_dev {
45674
45675 /* P2M DMA Engine */
45676 struct solo_p2m_dev p2m_dev[SOLO_NR_P2M];
45677- atomic_t p2m_count;
45678+ atomic_unchecked_t p2m_count;
45679 int p2m_jiffies;
45680 unsigned int p2m_timeouts;
45681
45682diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
45683index c135165..dc69499 100644
45684--- a/drivers/media/pci/tw68/tw68-core.c
45685+++ b/drivers/media/pci/tw68/tw68-core.c
45686@@ -60,7 +60,7 @@ static unsigned int card[] = {[0 ... (TW68_MAXBOARDS - 1)] = UNSET };
45687 module_param_array(card, int, NULL, 0444);
45688 MODULE_PARM_DESC(card, "card type");
45689
45690-static atomic_t tw68_instance = ATOMIC_INIT(0);
45691+static atomic_unchecked_t tw68_instance = ATOMIC_INIT(0);
45692
45693 /* ------------------------------------------------------------------ */
45694
45695diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
45696index ba2d8f9..1566684 100644
45697--- a/drivers/media/platform/omap/omap_vout.c
45698+++ b/drivers/media/platform/omap/omap_vout.c
45699@@ -63,7 +63,6 @@ enum omap_vout_channels {
45700 OMAP_VIDEO2,
45701 };
45702
45703-static struct videobuf_queue_ops video_vbq_ops;
45704 /* Variables configurable through module params*/
45705 static u32 video1_numbuffers = 3;
45706 static u32 video2_numbuffers = 3;
45707@@ -1012,6 +1011,12 @@ static int omap_vout_open(struct file *file)
45708 {
45709 struct videobuf_queue *q;
45710 struct omap_vout_device *vout = NULL;
45711+ static struct videobuf_queue_ops video_vbq_ops = {
45712+ .buf_setup = omap_vout_buffer_setup,
45713+ .buf_prepare = omap_vout_buffer_prepare,
45714+ .buf_release = omap_vout_buffer_release,
45715+ .buf_queue = omap_vout_buffer_queue,
45716+ };
45717
45718 vout = video_drvdata(file);
45719 v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev, "Entering %s\n", __func__);
45720@@ -1029,10 +1034,6 @@ static int omap_vout_open(struct file *file)
45721 vout->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
45722
45723 q = &vout->vbq;
45724- video_vbq_ops.buf_setup = omap_vout_buffer_setup;
45725- video_vbq_ops.buf_prepare = omap_vout_buffer_prepare;
45726- video_vbq_ops.buf_release = omap_vout_buffer_release;
45727- video_vbq_ops.buf_queue = omap_vout_buffer_queue;
45728 spin_lock_init(&vout->vbq_lock);
45729
45730 videobuf_queue_dma_contig_init(q, &video_vbq_ops, q->dev,
45731diff --git a/drivers/media/platform/s5p-tv/mixer.h b/drivers/media/platform/s5p-tv/mixer.h
45732index fb2acc5..a2fcbdc4 100644
45733--- a/drivers/media/platform/s5p-tv/mixer.h
45734+++ b/drivers/media/platform/s5p-tv/mixer.h
45735@@ -156,7 +156,7 @@ struct mxr_layer {
45736 /** layer index (unique identifier) */
45737 int idx;
45738 /** callbacks for layer methods */
45739- struct mxr_layer_ops ops;
45740+ struct mxr_layer_ops *ops;
45741 /** format array */
45742 const struct mxr_format **fmt_array;
45743 /** size of format array */
45744diff --git a/drivers/media/platform/s5p-tv/mixer_grp_layer.c b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45745index 74344c7..a39e70e 100644
45746--- a/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45747+++ b/drivers/media/platform/s5p-tv/mixer_grp_layer.c
45748@@ -235,7 +235,7 @@ struct mxr_layer *mxr_graph_layer_create(struct mxr_device *mdev, int idx)
45749 {
45750 struct mxr_layer *layer;
45751 int ret;
45752- struct mxr_layer_ops ops = {
45753+ static struct mxr_layer_ops ops = {
45754 .release = mxr_graph_layer_release,
45755 .buffer_set = mxr_graph_buffer_set,
45756 .stream_set = mxr_graph_stream_set,
45757diff --git a/drivers/media/platform/s5p-tv/mixer_reg.c b/drivers/media/platform/s5p-tv/mixer_reg.c
45758index b713403..53cb5ad 100644
45759--- a/drivers/media/platform/s5p-tv/mixer_reg.c
45760+++ b/drivers/media/platform/s5p-tv/mixer_reg.c
45761@@ -276,7 +276,7 @@ static void mxr_irq_layer_handle(struct mxr_layer *layer)
45762 layer->update_buf = next;
45763 }
45764
45765- layer->ops.buffer_set(layer, layer->update_buf);
45766+ layer->ops->buffer_set(layer, layer->update_buf);
45767
45768 if (done && done != layer->shadow_buf)
45769 vb2_buffer_done(&done->vb, VB2_BUF_STATE_DONE);
45770diff --git a/drivers/media/platform/s5p-tv/mixer_video.c b/drivers/media/platform/s5p-tv/mixer_video.c
45771index 72d4f2e..4b2ea0d 100644
45772--- a/drivers/media/platform/s5p-tv/mixer_video.c
45773+++ b/drivers/media/platform/s5p-tv/mixer_video.c
45774@@ -210,7 +210,7 @@ static void mxr_layer_default_geo(struct mxr_layer *layer)
45775 layer->geo.src.height = layer->geo.src.full_height;
45776
45777 mxr_geometry_dump(mdev, &layer->geo);
45778- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45779+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45780 mxr_geometry_dump(mdev, &layer->geo);
45781 }
45782
45783@@ -228,7 +228,7 @@ static void mxr_layer_update_output(struct mxr_layer *layer)
45784 layer->geo.dst.full_width = mbus_fmt.width;
45785 layer->geo.dst.full_height = mbus_fmt.height;
45786 layer->geo.dst.field = mbus_fmt.field;
45787- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45788+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SINK, 0);
45789
45790 mxr_geometry_dump(mdev, &layer->geo);
45791 }
45792@@ -334,7 +334,7 @@ static int mxr_s_fmt(struct file *file, void *priv,
45793 /* set source size to highest accepted value */
45794 geo->src.full_width = max(geo->dst.full_width, pix->width);
45795 geo->src.full_height = max(geo->dst.full_height, pix->height);
45796- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45797+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45798 mxr_geometry_dump(mdev, &layer->geo);
45799 /* set cropping to total visible screen */
45800 geo->src.width = pix->width;
45801@@ -342,12 +342,12 @@ static int mxr_s_fmt(struct file *file, void *priv,
45802 geo->src.x_offset = 0;
45803 geo->src.y_offset = 0;
45804 /* assure consistency of geometry */
45805- layer->ops.fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45806+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_CROP, MXR_NO_OFFSET);
45807 mxr_geometry_dump(mdev, &layer->geo);
45808 /* set full size to lowest possible value */
45809 geo->src.full_width = 0;
45810 geo->src.full_height = 0;
45811- layer->ops.fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45812+ layer->ops->fix_geometry(layer, MXR_GEOMETRY_SOURCE, 0);
45813 mxr_geometry_dump(mdev, &layer->geo);
45814
45815 /* returning results */
45816@@ -474,7 +474,7 @@ static int mxr_s_selection(struct file *file, void *fh,
45817 target->width = s->r.width;
45818 target->height = s->r.height;
45819
45820- layer->ops.fix_geometry(layer, stage, s->flags);
45821+ layer->ops->fix_geometry(layer, stage, s->flags);
45822
45823 /* retrieve update selection rectangle */
45824 res.left = target->x_offset;
45825@@ -938,13 +938,13 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
45826 mxr_output_get(mdev);
45827
45828 mxr_layer_update_output(layer);
45829- layer->ops.format_set(layer);
45830+ layer->ops->format_set(layer);
45831 /* enabling layer in hardware */
45832 spin_lock_irqsave(&layer->enq_slock, flags);
45833 layer->state = MXR_LAYER_STREAMING;
45834 spin_unlock_irqrestore(&layer->enq_slock, flags);
45835
45836- layer->ops.stream_set(layer, MXR_ENABLE);
45837+ layer->ops->stream_set(layer, MXR_ENABLE);
45838 mxr_streamer_get(mdev);
45839
45840 return 0;
45841@@ -1014,7 +1014,7 @@ static void stop_streaming(struct vb2_queue *vq)
45842 spin_unlock_irqrestore(&layer->enq_slock, flags);
45843
45844 /* disabling layer in hardware */
45845- layer->ops.stream_set(layer, MXR_DISABLE);
45846+ layer->ops->stream_set(layer, MXR_DISABLE);
45847 /* remove one streamer */
45848 mxr_streamer_put(mdev);
45849 /* allow changes in output configuration */
45850@@ -1052,8 +1052,8 @@ void mxr_base_layer_unregister(struct mxr_layer *layer)
45851
45852 void mxr_layer_release(struct mxr_layer *layer)
45853 {
45854- if (layer->ops.release)
45855- layer->ops.release(layer);
45856+ if (layer->ops->release)
45857+ layer->ops->release(layer);
45858 }
45859
45860 void mxr_base_layer_release(struct mxr_layer *layer)
45861@@ -1079,7 +1079,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev,
45862
45863 layer->mdev = mdev;
45864 layer->idx = idx;
45865- layer->ops = *ops;
45866+ layer->ops = ops;
45867
45868 spin_lock_init(&layer->enq_slock);
45869 INIT_LIST_HEAD(&layer->enq_list);
45870diff --git a/drivers/media/platform/s5p-tv/mixer_vp_layer.c b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45871index c9388c4..ce71ece 100644
45872--- a/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45873+++ b/drivers/media/platform/s5p-tv/mixer_vp_layer.c
45874@@ -206,7 +206,7 @@ struct mxr_layer *mxr_vp_layer_create(struct mxr_device *mdev, int idx)
45875 {
45876 struct mxr_layer *layer;
45877 int ret;
45878- struct mxr_layer_ops ops = {
45879+ static struct mxr_layer_ops ops = {
45880 .release = mxr_vp_layer_release,
45881 .buffer_set = mxr_vp_buffer_set,
45882 .stream_set = mxr_vp_stream_set,
45883diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
45884index 82affae..42833ec 100644
45885--- a/drivers/media/radio/radio-cadet.c
45886+++ b/drivers/media/radio/radio-cadet.c
45887@@ -333,6 +333,8 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45888 unsigned char readbuf[RDS_BUFFER];
45889 int i = 0;
45890
45891+ if (count > RDS_BUFFER)
45892+ return -EFAULT;
45893 mutex_lock(&dev->lock);
45894 if (dev->rdsstat == 0)
45895 cadet_start_rds(dev);
45896@@ -349,8 +351,9 @@ static ssize_t cadet_read(struct file *file, char __user *data, size_t count, lo
45897 readbuf[i++] = dev->rdsbuf[dev->rdsout++];
45898 mutex_unlock(&dev->lock);
45899
45900- if (i && copy_to_user(data, readbuf, i))
45901- return -EFAULT;
45902+ if (i > sizeof(readbuf) || (i && copy_to_user(data, readbuf, i)))
45903+ i = -EFAULT;
45904+
45905 return i;
45906 }
45907
45908diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
45909index 5236035..c622c74 100644
45910--- a/drivers/media/radio/radio-maxiradio.c
45911+++ b/drivers/media/radio/radio-maxiradio.c
45912@@ -61,7 +61,7 @@ MODULE_PARM_DESC(radio_nr, "Radio device number");
45913 /* TEA5757 pin mappings */
45914 static const int clk = 1, data = 2, wren = 4, mo_st = 8, power = 16;
45915
45916-static atomic_t maxiradio_instance = ATOMIC_INIT(0);
45917+static atomic_unchecked_t maxiradio_instance = ATOMIC_INIT(0);
45918
45919 #define PCI_VENDOR_ID_GUILLEMOT 0x5046
45920 #define PCI_DEVICE_ID_GUILLEMOT_MAXIRADIO 0x1001
45921diff --git a/drivers/media/radio/radio-shark.c b/drivers/media/radio/radio-shark.c
45922index 050b3bb..79f62b9 100644
45923--- a/drivers/media/radio/radio-shark.c
45924+++ b/drivers/media/radio/radio-shark.c
45925@@ -79,7 +79,7 @@ struct shark_device {
45926 u32 last_val;
45927 };
45928
45929-static atomic_t shark_instance = ATOMIC_INIT(0);
45930+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45931
45932 static void shark_write_val(struct snd_tea575x *tea, u32 val)
45933 {
45934diff --git a/drivers/media/radio/radio-shark2.c b/drivers/media/radio/radio-shark2.c
45935index 8654e0d..0608a64 100644
45936--- a/drivers/media/radio/radio-shark2.c
45937+++ b/drivers/media/radio/radio-shark2.c
45938@@ -74,7 +74,7 @@ struct shark_device {
45939 u8 *transfer_buffer;
45940 };
45941
45942-static atomic_t shark_instance = ATOMIC_INIT(0);
45943+static atomic_unchecked_t shark_instance = ATOMIC_INIT(0);
45944
45945 static int shark_write_reg(struct radio_tea5777 *tea, u64 reg)
45946 {
45947diff --git a/drivers/media/radio/radio-si476x.c b/drivers/media/radio/radio-si476x.c
45948index dccf586..d5db411 100644
45949--- a/drivers/media/radio/radio-si476x.c
45950+++ b/drivers/media/radio/radio-si476x.c
45951@@ -1445,7 +1445,7 @@ static int si476x_radio_probe(struct platform_device *pdev)
45952 struct si476x_radio *radio;
45953 struct v4l2_ctrl *ctrl;
45954
45955- static atomic_t instance = ATOMIC_INIT(0);
45956+ static atomic_unchecked_t instance = ATOMIC_INIT(0);
45957
45958 radio = devm_kzalloc(&pdev->dev, sizeof(*radio), GFP_KERNEL);
45959 if (!radio)
45960diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
45961index 704397f..4d05977 100644
45962--- a/drivers/media/radio/wl128x/fmdrv_common.c
45963+++ b/drivers/media/radio/wl128x/fmdrv_common.c
45964@@ -71,7 +71,7 @@ module_param(default_rds_buf, uint, 0444);
45965 MODULE_PARM_DESC(rds_buf, "RDS buffer entries");
45966
45967 /* Radio Nr */
45968-static u32 radio_nr = -1;
45969+static int radio_nr = -1;
45970 module_param(radio_nr, int, 0444);
45971 MODULE_PARM_DESC(radio_nr, "Radio Nr");
45972
45973diff --git a/drivers/media/usb/dvb-usb/cinergyT2-core.c b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45974index 9fd1527..8927230 100644
45975--- a/drivers/media/usb/dvb-usb/cinergyT2-core.c
45976+++ b/drivers/media/usb/dvb-usb/cinergyT2-core.c
45977@@ -50,29 +50,73 @@ static struct dvb_usb_device_properties cinergyt2_properties;
45978
45979 static int cinergyt2_streaming_ctrl(struct dvb_usb_adapter *adap, int enable)
45980 {
45981- char buf[] = { CINERGYT2_EP1_CONTROL_STREAM_TRANSFER, enable ? 1 : 0 };
45982- char result[64];
45983- return dvb_usb_generic_rw(adap->dev, buf, sizeof(buf), result,
45984- sizeof(result), 0);
45985+ char *buf;
45986+ char *result;
45987+ int retval;
45988+
45989+ buf = kmalloc(2, GFP_KERNEL);
45990+ if (buf == NULL)
45991+ return -ENOMEM;
45992+ result = kmalloc(64, GFP_KERNEL);
45993+ if (result == NULL) {
45994+ kfree(buf);
45995+ return -ENOMEM;
45996+ }
45997+
45998+ buf[0] = CINERGYT2_EP1_CONTROL_STREAM_TRANSFER;
45999+ buf[1] = enable ? 1 : 0;
46000+
46001+ retval = dvb_usb_generic_rw(adap->dev, buf, 2, result, 64, 0);
46002+
46003+ kfree(buf);
46004+ kfree(result);
46005+ return retval;
46006 }
46007
46008 static int cinergyt2_power_ctrl(struct dvb_usb_device *d, int enable)
46009 {
46010- char buf[] = { CINERGYT2_EP1_SLEEP_MODE, enable ? 0 : 1 };
46011- char state[3];
46012- return dvb_usb_generic_rw(d, buf, sizeof(buf), state, sizeof(state), 0);
46013+ char *buf;
46014+ char *state;
46015+ int retval;
46016+
46017+ buf = kmalloc(2, GFP_KERNEL);
46018+ if (buf == NULL)
46019+ return -ENOMEM;
46020+ state = kmalloc(3, GFP_KERNEL);
46021+ if (state == NULL) {
46022+ kfree(buf);
46023+ return -ENOMEM;
46024+ }
46025+
46026+ buf[0] = CINERGYT2_EP1_SLEEP_MODE;
46027+ buf[1] = enable ? 1 : 0;
46028+
46029+ retval = dvb_usb_generic_rw(d, buf, 2, state, 3, 0);
46030+
46031+ kfree(buf);
46032+ kfree(state);
46033+ return retval;
46034 }
46035
46036 static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46037 {
46038- char query[] = { CINERGYT2_EP1_GET_FIRMWARE_VERSION };
46039- char state[3];
46040+ char *query;
46041+ char *state;
46042 int ret;
46043+ query = kmalloc(1, GFP_KERNEL);
46044+ if (query == NULL)
46045+ return -ENOMEM;
46046+ state = kmalloc(3, GFP_KERNEL);
46047+ if (state == NULL) {
46048+ kfree(query);
46049+ return -ENOMEM;
46050+ }
46051+
46052+ query[0] = CINERGYT2_EP1_GET_FIRMWARE_VERSION;
46053
46054 adap->fe_adap[0].fe = cinergyt2_fe_attach(adap->dev);
46055
46056- ret = dvb_usb_generic_rw(adap->dev, query, sizeof(query), state,
46057- sizeof(state), 0);
46058+ ret = dvb_usb_generic_rw(adap->dev, query, 1, state, 3, 0);
46059 if (ret < 0) {
46060 deb_rc("cinergyt2_power_ctrl() Failed to retrieve sleep "
46061 "state info\n");
46062@@ -80,7 +124,8 @@ static int cinergyt2_frontend_attach(struct dvb_usb_adapter *adap)
46063
46064 /* Copy this pointer as we are gonna need it in the release phase */
46065 cinergyt2_usb_device = adap->dev;
46066-
46067+ kfree(query);
46068+ kfree(state);
46069 return 0;
46070 }
46071
46072@@ -141,12 +186,23 @@ static int repeatable_keys[] = {
46073 static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46074 {
46075 struct cinergyt2_state *st = d->priv;
46076- u8 key[5] = {0, 0, 0, 0, 0}, cmd = CINERGYT2_EP1_GET_RC_EVENTS;
46077+ u8 *key, *cmd;
46078 int i;
46079
46080+ cmd = kmalloc(1, GFP_KERNEL);
46081+ if (cmd == NULL)
46082+ return -EINVAL;
46083+ key = kzalloc(5, GFP_KERNEL);
46084+ if (key == NULL) {
46085+ kfree(cmd);
46086+ return -EINVAL;
46087+ }
46088+
46089+ cmd[0] = CINERGYT2_EP1_GET_RC_EVENTS;
46090+
46091 *state = REMOTE_NO_KEY_PRESSED;
46092
46093- dvb_usb_generic_rw(d, &cmd, 1, key, sizeof(key), 0);
46094+ dvb_usb_generic_rw(d, cmd, 1, key, 5, 0);
46095 if (key[4] == 0xff) {
46096 /* key repeat */
46097 st->rc_counter++;
46098@@ -157,12 +213,12 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46099 *event = d->last_event;
46100 deb_rc("repeat key, event %x\n",
46101 *event);
46102- return 0;
46103+ goto out;
46104 }
46105 }
46106 deb_rc("repeated key (non repeatable)\n");
46107 }
46108- return 0;
46109+ goto out;
46110 }
46111
46112 /* hack to pass checksum on the custom field */
46113@@ -174,6 +230,9 @@ static int cinergyt2_rc_query(struct dvb_usb_device *d, u32 *event, int *state)
46114
46115 deb_rc("key: %*ph\n", 5, key);
46116 }
46117+out:
46118+ kfree(cmd);
46119+ kfree(key);
46120 return 0;
46121 }
46122
46123diff --git a/drivers/media/usb/dvb-usb/cinergyT2-fe.c b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46124index c890fe4..f9b2ae6 100644
46125--- a/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46126+++ b/drivers/media/usb/dvb-usb/cinergyT2-fe.c
46127@@ -145,103 +145,176 @@ static int cinergyt2_fe_read_status(struct dvb_frontend *fe,
46128 fe_status_t *status)
46129 {
46130 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46131- struct dvbt_get_status_msg result;
46132- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46133+ struct dvbt_get_status_msg *result;
46134+ u8 *cmd;
46135 int ret;
46136
46137- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&result,
46138- sizeof(result), 0);
46139+ cmd = kmalloc(1, GFP_KERNEL);
46140+ if (cmd == NULL)
46141+ return -ENOMEM;
46142+ result = kmalloc(sizeof(*result), GFP_KERNEL);
46143+ if (result == NULL) {
46144+ kfree(cmd);
46145+ return -ENOMEM;
46146+ }
46147+
46148+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46149+
46150+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)result,
46151+ sizeof(*result), 0);
46152 if (ret < 0)
46153- return ret;
46154+ goto out;
46155
46156 *status = 0;
46157
46158- if (0xffff - le16_to_cpu(result.gain) > 30)
46159+ if (0xffff - le16_to_cpu(result->gain) > 30)
46160 *status |= FE_HAS_SIGNAL;
46161- if (result.lock_bits & (1 << 6))
46162+ if (result->lock_bits & (1 << 6))
46163 *status |= FE_HAS_LOCK;
46164- if (result.lock_bits & (1 << 5))
46165+ if (result->lock_bits & (1 << 5))
46166 *status |= FE_HAS_SYNC;
46167- if (result.lock_bits & (1 << 4))
46168+ if (result->lock_bits & (1 << 4))
46169 *status |= FE_HAS_CARRIER;
46170- if (result.lock_bits & (1 << 1))
46171+ if (result->lock_bits & (1 << 1))
46172 *status |= FE_HAS_VITERBI;
46173
46174 if ((*status & (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC)) !=
46175 (FE_HAS_CARRIER | FE_HAS_VITERBI | FE_HAS_SYNC))
46176 *status &= ~FE_HAS_LOCK;
46177
46178- return 0;
46179+out:
46180+ kfree(cmd);
46181+ kfree(result);
46182+ return ret;
46183 }
46184
46185 static int cinergyt2_fe_read_ber(struct dvb_frontend *fe, u32 *ber)
46186 {
46187 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46188- struct dvbt_get_status_msg status;
46189- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46190+ struct dvbt_get_status_msg *status;
46191+ char *cmd;
46192 int ret;
46193
46194- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46195- sizeof(status), 0);
46196+ cmd = kmalloc(1, GFP_KERNEL);
46197+ if (cmd == NULL)
46198+ return -ENOMEM;
46199+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46200+ if (status == NULL) {
46201+ kfree(cmd);
46202+ return -ENOMEM;
46203+ }
46204+
46205+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46206+
46207+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46208+ sizeof(*status), 0);
46209 if (ret < 0)
46210- return ret;
46211+ goto out;
46212
46213- *ber = le32_to_cpu(status.viterbi_error_rate);
46214+ *ber = le32_to_cpu(status->viterbi_error_rate);
46215+out:
46216+ kfree(cmd);
46217+ kfree(status);
46218 return 0;
46219 }
46220
46221 static int cinergyt2_fe_read_unc_blocks(struct dvb_frontend *fe, u32 *unc)
46222 {
46223 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46224- struct dvbt_get_status_msg status;
46225- u8 cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46226+ struct dvbt_get_status_msg *status;
46227+ u8 *cmd;
46228 int ret;
46229
46230- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (u8 *)&status,
46231- sizeof(status), 0);
46232+ cmd = kmalloc(1, GFP_KERNEL);
46233+ if (cmd == NULL)
46234+ return -ENOMEM;
46235+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46236+ if (status == NULL) {
46237+ kfree(cmd);
46238+ return -ENOMEM;
46239+ }
46240+
46241+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46242+
46243+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (u8 *)status,
46244+ sizeof(*status), 0);
46245 if (ret < 0) {
46246 err("cinergyt2_fe_read_unc_blocks() Failed! (Error=%d)\n",
46247 ret);
46248- return ret;
46249+ goto out;
46250 }
46251- *unc = le32_to_cpu(status.uncorrected_block_count);
46252- return 0;
46253+ *unc = le32_to_cpu(status->uncorrected_block_count);
46254+
46255+out:
46256+ kfree(cmd);
46257+ kfree(status);
46258+ return ret;
46259 }
46260
46261 static int cinergyt2_fe_read_signal_strength(struct dvb_frontend *fe,
46262 u16 *strength)
46263 {
46264 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46265- struct dvbt_get_status_msg status;
46266- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46267+ struct dvbt_get_status_msg *status;
46268+ char *cmd;
46269 int ret;
46270
46271- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46272- sizeof(status), 0);
46273+ cmd = kmalloc(1, GFP_KERNEL);
46274+ if (cmd == NULL)
46275+ return -ENOMEM;
46276+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46277+ if (status == NULL) {
46278+ kfree(cmd);
46279+ return -ENOMEM;
46280+ }
46281+
46282+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46283+
46284+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46285+ sizeof(*status), 0);
46286 if (ret < 0) {
46287 err("cinergyt2_fe_read_signal_strength() Failed!"
46288 " (Error=%d)\n", ret);
46289- return ret;
46290+ goto out;
46291 }
46292- *strength = (0xffff - le16_to_cpu(status.gain));
46293+ *strength = (0xffff - le16_to_cpu(status->gain));
46294+
46295+out:
46296+ kfree(cmd);
46297+ kfree(status);
46298 return 0;
46299 }
46300
46301 static int cinergyt2_fe_read_snr(struct dvb_frontend *fe, u16 *snr)
46302 {
46303 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46304- struct dvbt_get_status_msg status;
46305- char cmd[] = { CINERGYT2_EP1_GET_TUNER_STATUS };
46306+ struct dvbt_get_status_msg *status;
46307+ char *cmd;
46308 int ret;
46309
46310- ret = dvb_usb_generic_rw(state->d, cmd, sizeof(cmd), (char *)&status,
46311- sizeof(status), 0);
46312+ cmd = kmalloc(1, GFP_KERNEL);
46313+ if (cmd == NULL)
46314+ return -ENOMEM;
46315+ status = kmalloc(sizeof(*status), GFP_KERNEL);
46316+ if (status == NULL) {
46317+ kfree(cmd);
46318+ return -ENOMEM;
46319+ }
46320+
46321+ cmd[0] = CINERGYT2_EP1_GET_TUNER_STATUS;
46322+
46323+ ret = dvb_usb_generic_rw(state->d, cmd, 1, (char *)status,
46324+ sizeof(*status), 0);
46325 if (ret < 0) {
46326 err("cinergyt2_fe_read_snr() Failed! (Error=%d)\n", ret);
46327- return ret;
46328+ goto out;
46329 }
46330- *snr = (status.snr << 8) | status.snr;
46331- return 0;
46332+ *snr = (status->snr << 8) | status->snr;
46333+
46334+out:
46335+ kfree(cmd);
46336+ kfree(status);
46337+ return ret;
46338 }
46339
46340 static int cinergyt2_fe_init(struct dvb_frontend *fe)
46341@@ -266,35 +339,46 @@ static int cinergyt2_fe_set_frontend(struct dvb_frontend *fe)
46342 {
46343 struct dtv_frontend_properties *fep = &fe->dtv_property_cache;
46344 struct cinergyt2_fe_state *state = fe->demodulator_priv;
46345- struct dvbt_set_parameters_msg param;
46346- char result[2];
46347+ struct dvbt_set_parameters_msg *param;
46348+ char *result;
46349 int err;
46350
46351- param.cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46352- param.tps = cpu_to_le16(compute_tps(fep));
46353- param.freq = cpu_to_le32(fep->frequency / 1000);
46354- param.flags = 0;
46355+ result = kmalloc(2, GFP_KERNEL);
46356+ if (result == NULL)
46357+ return -ENOMEM;
46358+ param = kmalloc(sizeof(*param), GFP_KERNEL);
46359+ if (param == NULL) {
46360+ kfree(result);
46361+ return -ENOMEM;
46362+ }
46363+
46364+ param->cmd = CINERGYT2_EP1_SET_TUNER_PARAMETERS;
46365+ param->tps = cpu_to_le16(compute_tps(fep));
46366+ param->freq = cpu_to_le32(fep->frequency / 1000);
46367+ param->flags = 0;
46368
46369 switch (fep->bandwidth_hz) {
46370 default:
46371 case 8000000:
46372- param.bandwidth = 8;
46373+ param->bandwidth = 8;
46374 break;
46375 case 7000000:
46376- param.bandwidth = 7;
46377+ param->bandwidth = 7;
46378 break;
46379 case 6000000:
46380- param.bandwidth = 6;
46381+ param->bandwidth = 6;
46382 break;
46383 }
46384
46385 err = dvb_usb_generic_rw(state->d,
46386- (char *)&param, sizeof(param),
46387- result, sizeof(result), 0);
46388+ (char *)param, sizeof(*param),
46389+ result, 2, 0);
46390 if (err < 0)
46391 err("cinergyt2_fe_set_frontend() Failed! err=%d\n", err);
46392
46393- return (err < 0) ? err : 0;
46394+ kfree(result);
46395+ kfree(param);
46396+ return err;
46397 }
46398
46399 static void cinergyt2_fe_release(struct dvb_frontend *fe)
46400diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46401index 733a7ff..f8b52e3 100644
46402--- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46403+++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c
46404@@ -35,42 +35,57 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le
46405
46406 int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw, int type)
46407 {
46408- struct hexline hx;
46409- u8 reset;
46410+ struct hexline *hx;
46411+ u8 *reset;
46412 int ret,pos=0;
46413
46414+ reset = kmalloc(1, GFP_KERNEL);
46415+ if (reset == NULL)
46416+ return -ENOMEM;
46417+
46418+ hx = kmalloc(sizeof(struct hexline), GFP_KERNEL);
46419+ if (hx == NULL) {
46420+ kfree(reset);
46421+ return -ENOMEM;
46422+ }
46423+
46424 /* stop the CPU */
46425- reset = 1;
46426- if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1)) != 1)
46427+ reset[0] = 1;
46428+ if ((ret = usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1)) != 1)
46429 err("could not stop the USB controller CPU.");
46430
46431- while ((ret = dvb_usb_get_hexline(fw,&hx,&pos)) > 0) {
46432- deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx.addr,hx.len,hx.chk);
46433- ret = usb_cypress_writemem(udev,hx.addr,hx.data,hx.len);
46434+ while ((ret = dvb_usb_get_hexline(fw,hx,&pos)) > 0) {
46435+ deb_fw("writing to address 0x%04x (buffer: 0x%02x %02x)\n",hx->addr,hx->len,hx->chk);
46436+ ret = usb_cypress_writemem(udev,hx->addr,hx->data,hx->len);
46437
46438- if (ret != hx.len) {
46439+ if (ret != hx->len) {
46440 err("error while transferring firmware "
46441 "(transferred size: %d, block size: %d)",
46442- ret,hx.len);
46443+ ret,hx->len);
46444 ret = -EINVAL;
46445 break;
46446 }
46447 }
46448 if (ret < 0) {
46449 err("firmware download failed at %d with %d",pos,ret);
46450+ kfree(reset);
46451+ kfree(hx);
46452 return ret;
46453 }
46454
46455 if (ret == 0) {
46456 /* restart the CPU */
46457- reset = 0;
46458- if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,&reset,1) != 1) {
46459+ reset[0] = 0;
46460+ if (ret || usb_cypress_writemem(udev,cypress[type].cpu_cs_register,reset,1) != 1) {
46461 err("could not restart the USB controller CPU.");
46462 ret = -EINVAL;
46463 }
46464 } else
46465 ret = -EIO;
46466
46467+ kfree(reset);
46468+ kfree(hx);
46469+
46470 return ret;
46471 }
46472 EXPORT_SYMBOL(usb_cypress_load_firmware);
46473diff --git a/drivers/media/usb/dvb-usb/dw2102.c b/drivers/media/usb/dvb-usb/dw2102.c
46474index 1a3df10..57997a5 100644
46475--- a/drivers/media/usb/dvb-usb/dw2102.c
46476+++ b/drivers/media/usb/dvb-usb/dw2102.c
46477@@ -118,7 +118,7 @@ struct su3000_state {
46478
46479 struct s6x0_state {
46480 int (*old_set_voltage)(struct dvb_frontend *f, fe_sec_voltage_t v);
46481-};
46482+} __no_const;
46483
46484 /* debug */
46485 static int dvb_usb_dw2102_debug;
46486diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
46487index 5801ae7..83f71fa 100644
46488--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
46489+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
46490@@ -87,8 +87,11 @@ struct technisat_usb2_state {
46491 static int technisat_usb2_i2c_access(struct usb_device *udev,
46492 u8 device_addr, u8 *tx, u8 txlen, u8 *rx, u8 rxlen)
46493 {
46494- u8 b[64];
46495- int ret, actual_length;
46496+ u8 *b = kmalloc(64, GFP_KERNEL);
46497+ int ret, actual_length, error = 0;
46498+
46499+ if (b == NULL)
46500+ return -ENOMEM;
46501
46502 deb_i2c("i2c-access: %02x, tx: ", device_addr);
46503 debug_dump(tx, txlen, deb_i2c);
46504@@ -121,7 +124,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46505
46506 if (ret < 0) {
46507 err("i2c-error: out failed %02x = %d", device_addr, ret);
46508- return -ENODEV;
46509+ error = -ENODEV;
46510+ goto out;
46511 }
46512
46513 ret = usb_bulk_msg(udev,
46514@@ -129,7 +133,8 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46515 b, 64, &actual_length, 1000);
46516 if (ret < 0) {
46517 err("i2c-error: in failed %02x = %d", device_addr, ret);
46518- return -ENODEV;
46519+ error = -ENODEV;
46520+ goto out;
46521 }
46522
46523 if (b[0] != I2C_STATUS_OK) {
46524@@ -137,8 +142,10 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46525 /* handle tuner-i2c-nak */
46526 if (!(b[0] == I2C_STATUS_NAK &&
46527 device_addr == 0x60
46528- /* && device_is_technisat_usb2 */))
46529- return -ENODEV;
46530+ /* && device_is_technisat_usb2 */)) {
46531+ error = -ENODEV;
46532+ goto out;
46533+ }
46534 }
46535
46536 deb_i2c("status: %d, ", b[0]);
46537@@ -152,7 +159,9 @@ static int technisat_usb2_i2c_access(struct usb_device *udev,
46538
46539 deb_i2c("\n");
46540
46541- return 0;
46542+out:
46543+ kfree(b);
46544+ return error;
46545 }
46546
46547 static int technisat_usb2_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msg,
46548@@ -224,14 +233,16 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
46549 {
46550 int ret;
46551
46552- u8 led[8] = {
46553- red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
46554- 0
46555- };
46556+ u8 *led = kzalloc(8, GFP_KERNEL);
46557+
46558+ if (led == NULL)
46559+ return -ENOMEM;
46560
46561 if (disable_led_control && state != TECH_LED_OFF)
46562 return 0;
46563
46564+ led[0] = red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST;
46565+
46566 switch (state) {
46567 case TECH_LED_ON:
46568 led[1] = 0x82;
46569@@ -263,16 +274,22 @@ static int technisat_usb2_set_led(struct dvb_usb_device *d, int red, enum techni
46570 red ? SET_RED_LED_VENDOR_REQUEST : SET_GREEN_LED_VENDOR_REQUEST,
46571 USB_TYPE_VENDOR | USB_DIR_OUT,
46572 0, 0,
46573- led, sizeof(led), 500);
46574+ led, 8, 500);
46575
46576 mutex_unlock(&d->i2c_mutex);
46577+
46578+ kfree(led);
46579+
46580 return ret;
46581 }
46582
46583 static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 green)
46584 {
46585 int ret;
46586- u8 b = 0;
46587+ u8 *b = kzalloc(1, GFP_KERNEL);
46588+
46589+ if (b == NULL)
46590+ return -ENOMEM;
46591
46592 if (mutex_lock_interruptible(&d->i2c_mutex) < 0)
46593 return -EAGAIN;
46594@@ -281,10 +298,12 @@ static int technisat_usb2_set_led_timer(struct dvb_usb_device *d, u8 red, u8 gre
46595 SET_LED_TIMER_DIVIDER_VENDOR_REQUEST,
46596 USB_TYPE_VENDOR | USB_DIR_OUT,
46597 (red << 8) | green, 0,
46598- &b, 1, 500);
46599+ b, 1, 500);
46600
46601 mutex_unlock(&d->i2c_mutex);
46602
46603+ kfree(b);
46604+
46605 return ret;
46606 }
46607
46608@@ -328,7 +347,7 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46609 struct dvb_usb_device_description **desc, int *cold)
46610 {
46611 int ret;
46612- u8 version[3];
46613+ u8 *version = kmalloc(3, GFP_KERNEL);
46614
46615 /* first select the interface */
46616 if (usb_set_interface(udev, 0, 1) != 0)
46617@@ -338,11 +357,14 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46618
46619 *cold = 0; /* by default do not download a firmware - just in case something is wrong */
46620
46621+ if (version == NULL)
46622+ return 0;
46623+
46624 ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0),
46625 GET_VERSION_INFO_VENDOR_REQUEST,
46626 USB_TYPE_VENDOR | USB_DIR_IN,
46627 0, 0,
46628- version, sizeof(version), 500);
46629+ version, 3, 500);
46630
46631 if (ret < 0)
46632 *cold = 1;
46633@@ -351,6 +373,8 @@ static int technisat_usb2_identify_state(struct usb_device *udev,
46634 *cold = 0;
46635 }
46636
46637+ kfree(version);
46638+
46639 return 0;
46640 }
46641
46642@@ -594,10 +618,15 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
46643
46644 static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46645 {
46646- u8 buf[62], *b;
46647+ u8 *buf, *b;
46648 int ret;
46649 struct ir_raw_event ev;
46650
46651+ buf = kmalloc(62, GFP_KERNEL);
46652+
46653+ if (buf == NULL)
46654+ return -ENOMEM;
46655+
46656 buf[0] = GET_IR_DATA_VENDOR_REQUEST;
46657 buf[1] = 0x08;
46658 buf[2] = 0x8f;
46659@@ -620,16 +649,20 @@ static int technisat_usb2_get_ir(struct dvb_usb_device *d)
46660 GET_IR_DATA_VENDOR_REQUEST,
46661 USB_TYPE_VENDOR | USB_DIR_IN,
46662 0x8080, 0,
46663- buf, sizeof(buf), 500);
46664+ buf, 62, 500);
46665
46666 unlock:
46667 mutex_unlock(&d->i2c_mutex);
46668
46669- if (ret < 0)
46670+ if (ret < 0) {
46671+ kfree(buf);
46672 return ret;
46673+ }
46674
46675- if (ret == 1)
46676+ if (ret == 1) {
46677+ kfree(buf);
46678 return 0; /* no key pressed */
46679+ }
46680
46681 /* decoding */
46682 b = buf+1;
46683@@ -656,6 +689,8 @@ unlock:
46684
46685 ir_raw_event_handle(d->rc_dev);
46686
46687+ kfree(buf);
46688+
46689 return 1;
46690 }
46691
46692diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46693index af63543..0436f20 100644
46694--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46695+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
46696@@ -429,7 +429,7 @@ static int get_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46697 * by passing a very big num_planes value */
46698 uplane = compat_alloc_user_space(num_planes *
46699 sizeof(struct v4l2_plane));
46700- kp->m.planes = (__force struct v4l2_plane *)uplane;
46701+ kp->m.planes = (__force_kernel struct v4l2_plane *)uplane;
46702
46703 while (--num_planes >= 0) {
46704 ret = get_v4l2_plane32(uplane, uplane32, kp->memory);
46705@@ -500,7 +500,7 @@ static int put_v4l2_buffer32(struct v4l2_buffer *kp, struct v4l2_buffer32 __user
46706 if (num_planes == 0)
46707 return 0;
46708
46709- uplane = (__force struct v4l2_plane __user *)kp->m.planes;
46710+ uplane = (struct v4l2_plane __force_user *)kp->m.planes;
46711 if (get_user(p, &up->m.planes))
46712 return -EFAULT;
46713 uplane32 = compat_ptr(p);
46714@@ -564,7 +564,7 @@ static int get_v4l2_framebuffer32(struct v4l2_framebuffer *kp, struct v4l2_frame
46715 get_user(kp->flags, &up->flags) ||
46716 copy_from_user(&kp->fmt, &up->fmt, sizeof(up->fmt)))
46717 return -EFAULT;
46718- kp->base = (__force void *)compat_ptr(tmp);
46719+ kp->base = (__force_kernel void *)compat_ptr(tmp);
46720 return 0;
46721 }
46722
46723@@ -669,7 +669,7 @@ static int get_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46724 n * sizeof(struct v4l2_ext_control32)))
46725 return -EFAULT;
46726 kcontrols = compat_alloc_user_space(n * sizeof(struct v4l2_ext_control));
46727- kp->controls = (__force struct v4l2_ext_control *)kcontrols;
46728+ kp->controls = (__force_kernel struct v4l2_ext_control *)kcontrols;
46729 while (--n >= 0) {
46730 u32 id;
46731
46732@@ -696,7 +696,7 @@ static int put_v4l2_ext_controls32(struct v4l2_ext_controls *kp, struct v4l2_ext
46733 {
46734 struct v4l2_ext_control32 __user *ucontrols;
46735 struct v4l2_ext_control __user *kcontrols =
46736- (__force struct v4l2_ext_control __user *)kp->controls;
46737+ (struct v4l2_ext_control __force_user *)kp->controls;
46738 int n = kp->count;
46739 compat_caddr_t p;
46740
46741@@ -780,7 +780,7 @@ static int get_v4l2_edid32(struct v4l2_edid *kp, struct v4l2_edid32 __user *up)
46742 get_user(tmp, &up->edid) ||
46743 copy_from_user(kp->reserved, up->reserved, sizeof(kp->reserved)))
46744 return -EFAULT;
46745- kp->edid = (__force u8 *)compat_ptr(tmp);
46746+ kp->edid = (__force_kernel u8 *)compat_ptr(tmp);
46747 return 0;
46748 }
46749
46750diff --git a/drivers/media/v4l2-core/v4l2-device.c b/drivers/media/v4l2-core/v4l2-device.c
46751index 015f92a..59e311e 100644
46752--- a/drivers/media/v4l2-core/v4l2-device.c
46753+++ b/drivers/media/v4l2-core/v4l2-device.c
46754@@ -75,9 +75,9 @@ int v4l2_device_put(struct v4l2_device *v4l2_dev)
46755 EXPORT_SYMBOL_GPL(v4l2_device_put);
46756
46757 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
46758- atomic_t *instance)
46759+ atomic_unchecked_t *instance)
46760 {
46761- int num = atomic_inc_return(instance) - 1;
46762+ int num = atomic_inc_return_unchecked(instance) - 1;
46763 int len = strlen(basename);
46764
46765 if (basename[len - 1] >= '0' && basename[len - 1] <= '9')
46766diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
46767index b084072..36706d7 100644
46768--- a/drivers/media/v4l2-core/v4l2-ioctl.c
46769+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
46770@@ -2151,7 +2151,8 @@ struct v4l2_ioctl_info {
46771 struct file *file, void *fh, void *p);
46772 } u;
46773 void (*debug)(const void *arg, bool write_only);
46774-};
46775+} __do_const;
46776+typedef struct v4l2_ioctl_info __no_const v4l2_ioctl_info_no_const;
46777
46778 /* This control needs a priority check */
46779 #define INFO_FL_PRIO (1 << 0)
46780@@ -2335,7 +2336,7 @@ static long __video_do_ioctl(struct file *file,
46781 struct video_device *vfd = video_devdata(file);
46782 const struct v4l2_ioctl_ops *ops = vfd->ioctl_ops;
46783 bool write_only = false;
46784- struct v4l2_ioctl_info default_info;
46785+ v4l2_ioctl_info_no_const default_info;
46786 const struct v4l2_ioctl_info *info;
46787 void *fh = file->private_data;
46788 struct v4l2_fh *vfh = NULL;
46789@@ -2426,7 +2427,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46790 ret = -EINVAL;
46791 break;
46792 }
46793- *user_ptr = (void __user *)buf->m.planes;
46794+ *user_ptr = (void __force_user *)buf->m.planes;
46795 *kernel_ptr = (void **)&buf->m.planes;
46796 *array_size = sizeof(struct v4l2_plane) * buf->length;
46797 ret = 1;
46798@@ -2443,7 +2444,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46799 ret = -EINVAL;
46800 break;
46801 }
46802- *user_ptr = (void __user *)edid->edid;
46803+ *user_ptr = (void __force_user *)edid->edid;
46804 *kernel_ptr = (void **)&edid->edid;
46805 *array_size = edid->blocks * 128;
46806 ret = 1;
46807@@ -2461,7 +2462,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
46808 ret = -EINVAL;
46809 break;
46810 }
46811- *user_ptr = (void __user *)ctrls->controls;
46812+ *user_ptr = (void __force_user *)ctrls->controls;
46813 *kernel_ptr = (void **)&ctrls->controls;
46814 *array_size = sizeof(struct v4l2_ext_control)
46815 * ctrls->count;
46816@@ -2562,7 +2563,7 @@ video_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
46817 }
46818
46819 if (has_array_args) {
46820- *kernel_ptr = (void __force *)user_ptr;
46821+ *kernel_ptr = (void __force_kernel *)user_ptr;
46822 if (copy_to_user(user_ptr, mbuf, array_size))
46823 err = -EFAULT;
46824 goto out_array_args;
46825diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
46826index 24696f5..3637780 100644
46827--- a/drivers/memory/omap-gpmc.c
46828+++ b/drivers/memory/omap-gpmc.c
46829@@ -211,7 +211,6 @@ struct omap3_gpmc_regs {
46830 };
46831
46832 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
46833-static struct irq_chip gpmc_irq_chip;
46834 static int gpmc_irq_start;
46835
46836 static struct resource gpmc_mem_root;
46837@@ -939,6 +938,17 @@ static void gpmc_irq_noop(struct irq_data *data) { }
46838
46839 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
46840
46841+static struct irq_chip gpmc_irq_chip = {
46842+ .name = "gpmc",
46843+ .irq_startup = gpmc_irq_noop_ret,
46844+ .irq_enable = gpmc_irq_enable,
46845+ .irq_disable = gpmc_irq_disable,
46846+ .irq_shutdown = gpmc_irq_noop,
46847+ .irq_ack = gpmc_irq_noop,
46848+ .irq_mask = gpmc_irq_noop,
46849+ .irq_unmask = gpmc_irq_noop,
46850+};
46851+
46852 static int gpmc_setup_irq(void)
46853 {
46854 int i;
46855@@ -953,15 +963,6 @@ static int gpmc_setup_irq(void)
46856 return gpmc_irq_start;
46857 }
46858
46859- gpmc_irq_chip.name = "gpmc";
46860- gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
46861- gpmc_irq_chip.irq_enable = gpmc_irq_enable;
46862- gpmc_irq_chip.irq_disable = gpmc_irq_disable;
46863- gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
46864- gpmc_irq_chip.irq_ack = gpmc_irq_noop;
46865- gpmc_irq_chip.irq_mask = gpmc_irq_noop;
46866- gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
46867-
46868 gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
46869 gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;
46870
46871diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
46872index 187f836..679544b 100644
46873--- a/drivers/message/fusion/mptbase.c
46874+++ b/drivers/message/fusion/mptbase.c
46875@@ -6746,8 +6746,13 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46876 seq_printf(m, " MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
46877 seq_printf(m, " MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
46878
46879+#ifdef CONFIG_GRKERNSEC_HIDESYM
46880+ seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n", NULL, NULL);
46881+#else
46882 seq_printf(m, " RequestFrames @ 0x%p (Dma @ 0x%p)\n",
46883 (void *)ioc->req_frames, (void *)(ulong)ioc->req_frames_dma);
46884+#endif
46885+
46886 /*
46887 * Rounding UP to nearest 4-kB boundary here...
46888 */
46889@@ -6760,7 +6765,11 @@ static int mpt_iocinfo_proc_show(struct seq_file *m, void *v)
46890 ioc->facts.GlobalCredits);
46891
46892 seq_printf(m, " Frames @ 0x%p (Dma @ 0x%p)\n",
46893+#ifdef CONFIG_GRKERNSEC_HIDESYM
46894+ NULL, NULL);
46895+#else
46896 (void *)ioc->alloc, (void *)(ulong)ioc->alloc_dma);
46897+#endif
46898 sz = (ioc->reply_sz * ioc->reply_depth) + 128;
46899 seq_printf(m, " {CurRepSz=%d} x {CurRepDepth=%d} = %d bytes ^= 0x%x\n",
46900 ioc->reply_sz, ioc->reply_depth, ioc->reply_sz*ioc->reply_depth, sz);
46901diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c
46902index 5bdaae1..eced16f 100644
46903--- a/drivers/message/fusion/mptsas.c
46904+++ b/drivers/message/fusion/mptsas.c
46905@@ -446,6 +446,23 @@ mptsas_is_end_device(struct mptsas_devinfo * attached)
46906 return 0;
46907 }
46908
46909+static inline void
46910+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46911+{
46912+ if (phy_info->port_details) {
46913+ phy_info->port_details->rphy = rphy;
46914+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46915+ ioc->name, rphy));
46916+ }
46917+
46918+ if (rphy) {
46919+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46920+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46921+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46922+ ioc->name, rphy, rphy->dev.release));
46923+ }
46924+}
46925+
46926 /* no mutex */
46927 static void
46928 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
46929@@ -484,23 +501,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *phy_info)
46930 return NULL;
46931 }
46932
46933-static inline void
46934-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
46935-{
46936- if (phy_info->port_details) {
46937- phy_info->port_details->rphy = rphy;
46938- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
46939- ioc->name, rphy));
46940- }
46941-
46942- if (rphy) {
46943- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
46944- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
46945- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
46946- ioc->name, rphy, rphy->dev.release));
46947- }
46948-}
46949-
46950 static inline struct sas_port *
46951 mptsas_get_port(struct mptsas_phyinfo *phy_info)
46952 {
46953diff --git a/drivers/mfd/ab8500-debugfs.c b/drivers/mfd/ab8500-debugfs.c
46954index 9a8e185..27ff17d 100644
46955--- a/drivers/mfd/ab8500-debugfs.c
46956+++ b/drivers/mfd/ab8500-debugfs.c
46957@@ -100,7 +100,7 @@ static int irq_last;
46958 static u32 *irq_count;
46959 static int num_irqs;
46960
46961-static struct device_attribute **dev_attr;
46962+static device_attribute_no_const **dev_attr;
46963 static char **event_name;
46964
46965 static u8 avg_sample = SAMPLE_16;
46966diff --git a/drivers/mfd/kempld-core.c b/drivers/mfd/kempld-core.c
46967index 5615522..1eb6f3dc 100644
46968--- a/drivers/mfd/kempld-core.c
46969+++ b/drivers/mfd/kempld-core.c
46970@@ -499,7 +499,7 @@ static struct platform_driver kempld_driver = {
46971 .remove = kempld_remove,
46972 };
46973
46974-static struct dmi_system_id kempld_dmi_table[] __initdata = {
46975+static const struct dmi_system_id kempld_dmi_table[] __initconst = {
46976 {
46977 .ident = "BHL6",
46978 .matches = {
46979diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c
46980index c880c89..45a7c68 100644
46981--- a/drivers/mfd/max8925-i2c.c
46982+++ b/drivers/mfd/max8925-i2c.c
46983@@ -152,7 +152,7 @@ static int max8925_probe(struct i2c_client *client,
46984 const struct i2c_device_id *id)
46985 {
46986 struct max8925_platform_data *pdata = dev_get_platdata(&client->dev);
46987- static struct max8925_chip *chip;
46988+ struct max8925_chip *chip;
46989 struct device_node *node = client->dev.of_node;
46990
46991 if (node && !pdata) {
46992diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
46993index 7612d89..70549c2 100644
46994--- a/drivers/mfd/tps65910.c
46995+++ b/drivers/mfd/tps65910.c
46996@@ -230,7 +230,7 @@ static int tps65910_irq_init(struct tps65910 *tps65910, int irq,
46997 struct tps65910_platform_data *pdata)
46998 {
46999 int ret = 0;
47000- static struct regmap_irq_chip *tps6591x_irqs_chip;
47001+ struct regmap_irq_chip *tps6591x_irqs_chip;
47002
47003 if (!irq) {
47004 dev_warn(tps65910->dev, "No interrupt support, no core IRQ\n");
47005diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c
47006index 1b772ef..01e77d33 100644
47007--- a/drivers/mfd/twl4030-irq.c
47008+++ b/drivers/mfd/twl4030-irq.c
47009@@ -34,6 +34,7 @@
47010 #include <linux/of.h>
47011 #include <linux/irqdomain.h>
47012 #include <linux/i2c/twl.h>
47013+#include <asm/pgtable.h>
47014
47015 #include "twl-core.h"
47016
47017@@ -729,10 +730,12 @@ int twl4030_init_irq(struct device *dev, int irq_num)
47018 * Install an irq handler for each of the SIH modules;
47019 * clone dummy irq_chip since PIH can't *do* anything
47020 */
47021- twl4030_irq_chip = dummy_irq_chip;
47022- twl4030_irq_chip.name = "twl4030";
47023+ pax_open_kernel();
47024+ memcpy((void *)&twl4030_irq_chip, &dummy_irq_chip, sizeof twl4030_irq_chip);
47025+ *(const char **)&twl4030_irq_chip.name = "twl4030";
47026
47027- twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47028+ *(void **)&twl4030_sih_irq_chip.irq_ack = dummy_irq_chip.irq_ack;
47029+ pax_close_kernel();
47030
47031 for (i = irq_base; i < irq_end; i++) {
47032 irq_set_chip_and_handler(i, &twl4030_irq_chip,
47033diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
47034index 464419b..64bae8d 100644
47035--- a/drivers/misc/c2port/core.c
47036+++ b/drivers/misc/c2port/core.c
47037@@ -922,7 +922,9 @@ struct c2port_device *c2port_device_register(char *name,
47038 goto error_idr_alloc;
47039 c2dev->id = ret;
47040
47041- bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47042+ pax_open_kernel();
47043+ *(size_t *)&bin_attr_flash_data.size = ops->blocks_num * ops->block_size;
47044+ pax_close_kernel();
47045
47046 c2dev->dev = device_create(c2port_class, NULL, 0, c2dev,
47047 "c2port%d", c2dev->id);
47048diff --git a/drivers/misc/eeprom/sunxi_sid.c b/drivers/misc/eeprom/sunxi_sid.c
47049index 8385177..2f54635 100644
47050--- a/drivers/misc/eeprom/sunxi_sid.c
47051+++ b/drivers/misc/eeprom/sunxi_sid.c
47052@@ -126,7 +126,9 @@ static int sunxi_sid_probe(struct platform_device *pdev)
47053
47054 platform_set_drvdata(pdev, sid_data);
47055
47056- sid_bin_attr.size = sid_data->keysize;
47057+ pax_open_kernel();
47058+ *(size_t *)&sid_bin_attr.size = sid_data->keysize;
47059+ pax_close_kernel();
47060 if (device_create_bin_file(&pdev->dev, &sid_bin_attr))
47061 return -ENODEV;
47062
47063diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c
47064index 36f5d52..32311c3 100644
47065--- a/drivers/misc/kgdbts.c
47066+++ b/drivers/misc/kgdbts.c
47067@@ -834,7 +834,7 @@ static void run_plant_and_detach_test(int is_early)
47068 char before[BREAK_INSTR_SIZE];
47069 char after[BREAK_INSTR_SIZE];
47070
47071- probe_kernel_read(before, (char *)kgdbts_break_test,
47072+ probe_kernel_read(before, ktla_ktva((char *)kgdbts_break_test),
47073 BREAK_INSTR_SIZE);
47074 init_simple_test();
47075 ts.tst = plant_and_detach_test;
47076@@ -842,7 +842,7 @@ static void run_plant_and_detach_test(int is_early)
47077 /* Activate test with initial breakpoint */
47078 if (!is_early)
47079 kgdb_breakpoint();
47080- probe_kernel_read(after, (char *)kgdbts_break_test,
47081+ probe_kernel_read(after, ktla_ktva((char *)kgdbts_break_test),
47082 BREAK_INSTR_SIZE);
47083 if (memcmp(before, after, BREAK_INSTR_SIZE)) {
47084 printk(KERN_CRIT "kgdbts: ERROR kgdb corrupted memory\n");
47085diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c
47086index 3ef4627..8d00486 100644
47087--- a/drivers/misc/lis3lv02d/lis3lv02d.c
47088+++ b/drivers/misc/lis3lv02d/lis3lv02d.c
47089@@ -497,7 +497,7 @@ static irqreturn_t lis302dl_interrupt(int irq, void *data)
47090 * the lid is closed. This leads to interrupts as soon as a little move
47091 * is done.
47092 */
47093- atomic_inc(&lis3->count);
47094+ atomic_inc_unchecked(&lis3->count);
47095
47096 wake_up_interruptible(&lis3->misc_wait);
47097 kill_fasync(&lis3->async_queue, SIGIO, POLL_IN);
47098@@ -583,7 +583,7 @@ static int lis3lv02d_misc_open(struct inode *inode, struct file *file)
47099 if (lis3->pm_dev)
47100 pm_runtime_get_sync(lis3->pm_dev);
47101
47102- atomic_set(&lis3->count, 0);
47103+ atomic_set_unchecked(&lis3->count, 0);
47104 return 0;
47105 }
47106
47107@@ -615,7 +615,7 @@ static ssize_t lis3lv02d_misc_read(struct file *file, char __user *buf,
47108 add_wait_queue(&lis3->misc_wait, &wait);
47109 while (true) {
47110 set_current_state(TASK_INTERRUPTIBLE);
47111- data = atomic_xchg(&lis3->count, 0);
47112+ data = atomic_xchg_unchecked(&lis3->count, 0);
47113 if (data)
47114 break;
47115
47116@@ -656,7 +656,7 @@ static unsigned int lis3lv02d_misc_poll(struct file *file, poll_table *wait)
47117 struct lis3lv02d, miscdev);
47118
47119 poll_wait(file, &lis3->misc_wait, wait);
47120- if (atomic_read(&lis3->count))
47121+ if (atomic_read_unchecked(&lis3->count))
47122 return POLLIN | POLLRDNORM;
47123 return 0;
47124 }
47125diff --git a/drivers/misc/lis3lv02d/lis3lv02d.h b/drivers/misc/lis3lv02d/lis3lv02d.h
47126index c439c82..1f20f57 100644
47127--- a/drivers/misc/lis3lv02d/lis3lv02d.h
47128+++ b/drivers/misc/lis3lv02d/lis3lv02d.h
47129@@ -297,7 +297,7 @@ struct lis3lv02d {
47130 struct input_polled_dev *idev; /* input device */
47131 struct platform_device *pdev; /* platform device */
47132 struct regulator_bulk_data regulators[2];
47133- atomic_t count; /* interrupt count after last read */
47134+ atomic_unchecked_t count; /* interrupt count after last read */
47135 union axis_conversion ac; /* hw -> logical axis */
47136 int mapped_btns[3];
47137
47138diff --git a/drivers/misc/sgi-gru/gruhandles.c b/drivers/misc/sgi-gru/gruhandles.c
47139index 2f30bad..c4c13d0 100644
47140--- a/drivers/misc/sgi-gru/gruhandles.c
47141+++ b/drivers/misc/sgi-gru/gruhandles.c
47142@@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op op, unsigned long clks)
47143 unsigned long nsec;
47144
47145 nsec = CLKS2NSEC(clks);
47146- atomic_long_inc(&mcs_op_statistics[op].count);
47147- atomic_long_add(nsec, &mcs_op_statistics[op].total);
47148+ atomic_long_inc_unchecked(&mcs_op_statistics[op].count);
47149+ atomic_long_add_unchecked(nsec, &mcs_op_statistics[op].total);
47150 if (mcs_op_statistics[op].max < nsec)
47151 mcs_op_statistics[op].max = nsec;
47152 }
47153diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
47154index 4f76359..cdfcb2e 100644
47155--- a/drivers/misc/sgi-gru/gruprocfs.c
47156+++ b/drivers/misc/sgi-gru/gruprocfs.c
47157@@ -32,9 +32,9 @@
47158
47159 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f)
47160
47161-static void printstat_val(struct seq_file *s, atomic_long_t *v, char *id)
47162+static void printstat_val(struct seq_file *s, atomic_long_unchecked_t *v, char *id)
47163 {
47164- unsigned long val = atomic_long_read(v);
47165+ unsigned long val = atomic_long_read_unchecked(v);
47166
47167 seq_printf(s, "%16lu %s\n", val, id);
47168 }
47169@@ -134,8 +134,8 @@ static int mcs_statistics_show(struct seq_file *s, void *p)
47170
47171 seq_printf(s, "%-20s%12s%12s%12s\n", "#id", "count", "aver-clks", "max-clks");
47172 for (op = 0; op < mcsop_last; op++) {
47173- count = atomic_long_read(&mcs_op_statistics[op].count);
47174- total = atomic_long_read(&mcs_op_statistics[op].total);
47175+ count = atomic_long_read_unchecked(&mcs_op_statistics[op].count);
47176+ total = atomic_long_read_unchecked(&mcs_op_statistics[op].total);
47177 max = mcs_op_statistics[op].max;
47178 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
47179 count ? total / count : 0, max);
47180diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
47181index 5c3ce24..4915ccb 100644
47182--- a/drivers/misc/sgi-gru/grutables.h
47183+++ b/drivers/misc/sgi-gru/grutables.h
47184@@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
47185 * GRU statistics.
47186 */
47187 struct gru_stats_s {
47188- atomic_long_t vdata_alloc;
47189- atomic_long_t vdata_free;
47190- atomic_long_t gts_alloc;
47191- atomic_long_t gts_free;
47192- atomic_long_t gms_alloc;
47193- atomic_long_t gms_free;
47194- atomic_long_t gts_double_allocate;
47195- atomic_long_t assign_context;
47196- atomic_long_t assign_context_failed;
47197- atomic_long_t free_context;
47198- atomic_long_t load_user_context;
47199- atomic_long_t load_kernel_context;
47200- atomic_long_t lock_kernel_context;
47201- atomic_long_t unlock_kernel_context;
47202- atomic_long_t steal_user_context;
47203- atomic_long_t steal_kernel_context;
47204- atomic_long_t steal_context_failed;
47205- atomic_long_t nopfn;
47206- atomic_long_t asid_new;
47207- atomic_long_t asid_next;
47208- atomic_long_t asid_wrap;
47209- atomic_long_t asid_reuse;
47210- atomic_long_t intr;
47211- atomic_long_t intr_cbr;
47212- atomic_long_t intr_tfh;
47213- atomic_long_t intr_spurious;
47214- atomic_long_t intr_mm_lock_failed;
47215- atomic_long_t call_os;
47216- atomic_long_t call_os_wait_queue;
47217- atomic_long_t user_flush_tlb;
47218- atomic_long_t user_unload_context;
47219- atomic_long_t user_exception;
47220- atomic_long_t set_context_option;
47221- atomic_long_t check_context_retarget_intr;
47222- atomic_long_t check_context_unload;
47223- atomic_long_t tlb_dropin;
47224- atomic_long_t tlb_preload_page;
47225- atomic_long_t tlb_dropin_fail_no_asid;
47226- atomic_long_t tlb_dropin_fail_upm;
47227- atomic_long_t tlb_dropin_fail_invalid;
47228- atomic_long_t tlb_dropin_fail_range_active;
47229- atomic_long_t tlb_dropin_fail_idle;
47230- atomic_long_t tlb_dropin_fail_fmm;
47231- atomic_long_t tlb_dropin_fail_no_exception;
47232- atomic_long_t tfh_stale_on_fault;
47233- atomic_long_t mmu_invalidate_range;
47234- atomic_long_t mmu_invalidate_page;
47235- atomic_long_t flush_tlb;
47236- atomic_long_t flush_tlb_gru;
47237- atomic_long_t flush_tlb_gru_tgh;
47238- atomic_long_t flush_tlb_gru_zero_asid;
47239+ atomic_long_unchecked_t vdata_alloc;
47240+ atomic_long_unchecked_t vdata_free;
47241+ atomic_long_unchecked_t gts_alloc;
47242+ atomic_long_unchecked_t gts_free;
47243+ atomic_long_unchecked_t gms_alloc;
47244+ atomic_long_unchecked_t gms_free;
47245+ atomic_long_unchecked_t gts_double_allocate;
47246+ atomic_long_unchecked_t assign_context;
47247+ atomic_long_unchecked_t assign_context_failed;
47248+ atomic_long_unchecked_t free_context;
47249+ atomic_long_unchecked_t load_user_context;
47250+ atomic_long_unchecked_t load_kernel_context;
47251+ atomic_long_unchecked_t lock_kernel_context;
47252+ atomic_long_unchecked_t unlock_kernel_context;
47253+ atomic_long_unchecked_t steal_user_context;
47254+ atomic_long_unchecked_t steal_kernel_context;
47255+ atomic_long_unchecked_t steal_context_failed;
47256+ atomic_long_unchecked_t nopfn;
47257+ atomic_long_unchecked_t asid_new;
47258+ atomic_long_unchecked_t asid_next;
47259+ atomic_long_unchecked_t asid_wrap;
47260+ atomic_long_unchecked_t asid_reuse;
47261+ atomic_long_unchecked_t intr;
47262+ atomic_long_unchecked_t intr_cbr;
47263+ atomic_long_unchecked_t intr_tfh;
47264+ atomic_long_unchecked_t intr_spurious;
47265+ atomic_long_unchecked_t intr_mm_lock_failed;
47266+ atomic_long_unchecked_t call_os;
47267+ atomic_long_unchecked_t call_os_wait_queue;
47268+ atomic_long_unchecked_t user_flush_tlb;
47269+ atomic_long_unchecked_t user_unload_context;
47270+ atomic_long_unchecked_t user_exception;
47271+ atomic_long_unchecked_t set_context_option;
47272+ atomic_long_unchecked_t check_context_retarget_intr;
47273+ atomic_long_unchecked_t check_context_unload;
47274+ atomic_long_unchecked_t tlb_dropin;
47275+ atomic_long_unchecked_t tlb_preload_page;
47276+ atomic_long_unchecked_t tlb_dropin_fail_no_asid;
47277+ atomic_long_unchecked_t tlb_dropin_fail_upm;
47278+ atomic_long_unchecked_t tlb_dropin_fail_invalid;
47279+ atomic_long_unchecked_t tlb_dropin_fail_range_active;
47280+ atomic_long_unchecked_t tlb_dropin_fail_idle;
47281+ atomic_long_unchecked_t tlb_dropin_fail_fmm;
47282+ atomic_long_unchecked_t tlb_dropin_fail_no_exception;
47283+ atomic_long_unchecked_t tfh_stale_on_fault;
47284+ atomic_long_unchecked_t mmu_invalidate_range;
47285+ atomic_long_unchecked_t mmu_invalidate_page;
47286+ atomic_long_unchecked_t flush_tlb;
47287+ atomic_long_unchecked_t flush_tlb_gru;
47288+ atomic_long_unchecked_t flush_tlb_gru_tgh;
47289+ atomic_long_unchecked_t flush_tlb_gru_zero_asid;
47290
47291- atomic_long_t copy_gpa;
47292- atomic_long_t read_gpa;
47293+ atomic_long_unchecked_t copy_gpa;
47294+ atomic_long_unchecked_t read_gpa;
47295
47296- atomic_long_t mesq_receive;
47297- atomic_long_t mesq_receive_none;
47298- atomic_long_t mesq_send;
47299- atomic_long_t mesq_send_failed;
47300- atomic_long_t mesq_noop;
47301- atomic_long_t mesq_send_unexpected_error;
47302- atomic_long_t mesq_send_lb_overflow;
47303- atomic_long_t mesq_send_qlimit_reached;
47304- atomic_long_t mesq_send_amo_nacked;
47305- atomic_long_t mesq_send_put_nacked;
47306- atomic_long_t mesq_page_overflow;
47307- atomic_long_t mesq_qf_locked;
47308- atomic_long_t mesq_qf_noop_not_full;
47309- atomic_long_t mesq_qf_switch_head_failed;
47310- atomic_long_t mesq_qf_unexpected_error;
47311- atomic_long_t mesq_noop_unexpected_error;
47312- atomic_long_t mesq_noop_lb_overflow;
47313- atomic_long_t mesq_noop_qlimit_reached;
47314- atomic_long_t mesq_noop_amo_nacked;
47315- atomic_long_t mesq_noop_put_nacked;
47316- atomic_long_t mesq_noop_page_overflow;
47317+ atomic_long_unchecked_t mesq_receive;
47318+ atomic_long_unchecked_t mesq_receive_none;
47319+ atomic_long_unchecked_t mesq_send;
47320+ atomic_long_unchecked_t mesq_send_failed;
47321+ atomic_long_unchecked_t mesq_noop;
47322+ atomic_long_unchecked_t mesq_send_unexpected_error;
47323+ atomic_long_unchecked_t mesq_send_lb_overflow;
47324+ atomic_long_unchecked_t mesq_send_qlimit_reached;
47325+ atomic_long_unchecked_t mesq_send_amo_nacked;
47326+ atomic_long_unchecked_t mesq_send_put_nacked;
47327+ atomic_long_unchecked_t mesq_page_overflow;
47328+ atomic_long_unchecked_t mesq_qf_locked;
47329+ atomic_long_unchecked_t mesq_qf_noop_not_full;
47330+ atomic_long_unchecked_t mesq_qf_switch_head_failed;
47331+ atomic_long_unchecked_t mesq_qf_unexpected_error;
47332+ atomic_long_unchecked_t mesq_noop_unexpected_error;
47333+ atomic_long_unchecked_t mesq_noop_lb_overflow;
47334+ atomic_long_unchecked_t mesq_noop_qlimit_reached;
47335+ atomic_long_unchecked_t mesq_noop_amo_nacked;
47336+ atomic_long_unchecked_t mesq_noop_put_nacked;
47337+ atomic_long_unchecked_t mesq_noop_page_overflow;
47338
47339 };
47340
47341@@ -251,8 +251,8 @@ enum mcs_op {cchop_allocate, cchop_start, cchop_interrupt, cchop_interrupt_sync,
47342 tghop_invalidate, mcsop_last};
47343
47344 struct mcs_op_statistic {
47345- atomic_long_t count;
47346- atomic_long_t total;
47347+ atomic_long_unchecked_t count;
47348+ atomic_long_unchecked_t total;
47349 unsigned long max;
47350 };
47351
47352@@ -275,7 +275,7 @@ extern struct mcs_op_statistic mcs_op_statistics[mcsop_last];
47353
47354 #define STAT(id) do { \
47355 if (gru_options & OPT_STATS) \
47356- atomic_long_inc(&gru_stats.id); \
47357+ atomic_long_inc_unchecked(&gru_stats.id); \
47358 } while (0)
47359
47360 #ifdef CONFIG_SGI_GRU_DEBUG
47361diff --git a/drivers/misc/sgi-xp/xp.h b/drivers/misc/sgi-xp/xp.h
47362index c862cd4..0d176fe 100644
47363--- a/drivers/misc/sgi-xp/xp.h
47364+++ b/drivers/misc/sgi-xp/xp.h
47365@@ -288,7 +288,7 @@ struct xpc_interface {
47366 xpc_notify_func, void *);
47367 void (*received) (short, int, void *);
47368 enum xp_retval (*partid_to_nasids) (short, void *);
47369-};
47370+} __no_const;
47371
47372 extern struct xpc_interface xpc_interface;
47373
47374diff --git a/drivers/misc/sgi-xp/xp_main.c b/drivers/misc/sgi-xp/xp_main.c
47375index 01be66d..e3a0c7e 100644
47376--- a/drivers/misc/sgi-xp/xp_main.c
47377+++ b/drivers/misc/sgi-xp/xp_main.c
47378@@ -78,13 +78,13 @@ xpc_notloaded(void)
47379 }
47380
47381 struct xpc_interface xpc_interface = {
47382- (void (*)(int))xpc_notloaded,
47383- (void (*)(int))xpc_notloaded,
47384- (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47385- (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47386+ .connect = (void (*)(int))xpc_notloaded,
47387+ .disconnect = (void (*)(int))xpc_notloaded,
47388+ .send = (enum xp_retval(*)(short, int, u32, void *, u16))xpc_notloaded,
47389+ .send_notify = (enum xp_retval(*)(short, int, u32, void *, u16, xpc_notify_func,
47390 void *))xpc_notloaded,
47391- (void (*)(short, int, void *))xpc_notloaded,
47392- (enum xp_retval(*)(short, void *))xpc_notloaded
47393+ .received = (void (*)(short, int, void *))xpc_notloaded,
47394+ .partid_to_nasids = (enum xp_retval(*)(short, void *))xpc_notloaded
47395 };
47396 EXPORT_SYMBOL_GPL(xpc_interface);
47397
47398diff --git a/drivers/misc/sgi-xp/xpc.h b/drivers/misc/sgi-xp/xpc.h
47399index b94d5f7..7f494c5 100644
47400--- a/drivers/misc/sgi-xp/xpc.h
47401+++ b/drivers/misc/sgi-xp/xpc.h
47402@@ -835,6 +835,7 @@ struct xpc_arch_operations {
47403 void (*received_payload) (struct xpc_channel *, void *);
47404 void (*notify_senders_of_disconnect) (struct xpc_channel *);
47405 };
47406+typedef struct xpc_arch_operations __no_const xpc_arch_operations_no_const;
47407
47408 /* struct xpc_partition act_state values (for XPC HB) */
47409
47410@@ -876,7 +877,7 @@ extern struct xpc_registration xpc_registrations[];
47411 /* found in xpc_main.c */
47412 extern struct device *xpc_part;
47413 extern struct device *xpc_chan;
47414-extern struct xpc_arch_operations xpc_arch_ops;
47415+extern xpc_arch_operations_no_const xpc_arch_ops;
47416 extern int xpc_disengage_timelimit;
47417 extern int xpc_disengage_timedout;
47418 extern int xpc_activate_IRQ_rcvd;
47419diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
47420index 82dc574..8539ab2 100644
47421--- a/drivers/misc/sgi-xp/xpc_main.c
47422+++ b/drivers/misc/sgi-xp/xpc_main.c
47423@@ -166,7 +166,7 @@ static struct notifier_block xpc_die_notifier = {
47424 .notifier_call = xpc_system_die,
47425 };
47426
47427-struct xpc_arch_operations xpc_arch_ops;
47428+xpc_arch_operations_no_const xpc_arch_ops;
47429
47430 /*
47431 * Timer function to enforce the timelimit on the partition disengage.
47432@@ -1210,7 +1210,7 @@ xpc_system_die(struct notifier_block *nb, unsigned long event, void *_die_args)
47433
47434 if (((die_args->trapnr == X86_TRAP_MF) ||
47435 (die_args->trapnr == X86_TRAP_XF)) &&
47436- !user_mode_vm(die_args->regs))
47437+ !user_mode(die_args->regs))
47438 xpc_die_deactivate();
47439
47440 break;
47441diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
47442index c69afb5..5c2d0f5 100644
47443--- a/drivers/mmc/card/block.c
47444+++ b/drivers/mmc/card/block.c
47445@@ -577,7 +577,7 @@ static int mmc_blk_ioctl_cmd(struct block_device *bdev,
47446 if (idata->ic.postsleep_min_us)
47447 usleep_range(idata->ic.postsleep_min_us, idata->ic.postsleep_max_us);
47448
47449- if (copy_to_user(&(ic_ptr->response), cmd.resp, sizeof(cmd.resp))) {
47450+ if (copy_to_user(ic_ptr->response, cmd.resp, sizeof(cmd.resp))) {
47451 err = -EFAULT;
47452 goto cmd_rel_host;
47453 }
47454diff --git a/drivers/mmc/host/dw_mmc.h b/drivers/mmc/host/dw_mmc.h
47455index 18c4afe..43be71e 100644
47456--- a/drivers/mmc/host/dw_mmc.h
47457+++ b/drivers/mmc/host/dw_mmc.h
47458@@ -271,5 +271,5 @@ struct dw_mci_drv_data {
47459 void (*set_ios)(struct dw_mci *host, struct mmc_ios *ios);
47460 int (*parse_dt)(struct dw_mci *host);
47461 int (*execute_tuning)(struct dw_mci_slot *slot);
47462-};
47463+} __do_const;
47464 #endif /* _DW_MMC_H_ */
47465diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
47466index 7fe1619..ae0781b 100644
47467--- a/drivers/mmc/host/mmci.c
47468+++ b/drivers/mmc/host/mmci.c
47469@@ -1630,7 +1630,9 @@ static int mmci_probe(struct amba_device *dev,
47470 mmc->caps |= MMC_CAP_CMD23;
47471
47472 if (variant->busy_detect) {
47473- mmci_ops.card_busy = mmci_card_busy;
47474+ pax_open_kernel();
47475+ *(void **)&mmci_ops.card_busy = mmci_card_busy;
47476+ pax_close_kernel();
47477 mmci_write_datactrlreg(host, MCI_ST_DPSM_BUSYMODE);
47478 mmc->caps |= MMC_CAP_WAIT_WHILE_BUSY;
47479 mmc->max_busy_timeout = 0;
47480diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
47481index f84cfb0..aebe5d6 100644
47482--- a/drivers/mmc/host/omap_hsmmc.c
47483+++ b/drivers/mmc/host/omap_hsmmc.c
47484@@ -2054,7 +2054,9 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
47485
47486 if (host->pdata->controller_flags & OMAP_HSMMC_BROKEN_MULTIBLOCK_READ) {
47487 dev_info(&pdev->dev, "multiblock reads disabled due to 35xx erratum 2.1.1.128; MMC read performance may suffer\n");
47488- omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47489+ pax_open_kernel();
47490+ *(void **)&omap_hsmmc_ops.multi_io_quirk = omap_hsmmc_multi_io_quirk;
47491+ pax_close_kernel();
47492 }
47493
47494 pm_runtime_enable(host->dev);
47495diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
47496index 10ef824..88461a2 100644
47497--- a/drivers/mmc/host/sdhci-esdhc-imx.c
47498+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
47499@@ -989,9 +989,12 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
47500 host->mmc->caps |= MMC_CAP_1_8V_DDR;
47501 }
47502
47503- if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING)
47504- sdhci_esdhc_ops.platform_execute_tuning =
47505+ if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
47506+ pax_open_kernel();
47507+ *(void **)&sdhci_esdhc_ops.platform_execute_tuning =
47508 esdhc_executing_tuning;
47509+ pax_close_kernel();
47510+ }
47511
47512 if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
47513 writel(readl(host->ioaddr + ESDHC_TUNING_CTRL) |
47514diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
47515index c6d2dd7..81b1ca3 100644
47516--- a/drivers/mmc/host/sdhci-s3c.c
47517+++ b/drivers/mmc/host/sdhci-s3c.c
47518@@ -598,9 +598,11 @@ static int sdhci_s3c_probe(struct platform_device *pdev)
47519 * we can use overriding functions instead of default.
47520 */
47521 if (sc->no_divider) {
47522- sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47523- sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47524- sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47525+ pax_open_kernel();
47526+ *(void **)&sdhci_s3c_ops.set_clock = sdhci_cmu_set_clock;
47527+ *(void **)&sdhci_s3c_ops.get_min_clock = sdhci_cmu_get_min_clock;
47528+ *(void **)&sdhci_s3c_ops.get_max_clock = sdhci_cmu_get_max_clock;
47529+ pax_close_kernel();
47530 }
47531
47532 /* It supports additional host capabilities if needed */
47533diff --git a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
47534index 423666b..81ff5eb 100644
47535--- a/drivers/mtd/chips/cfi_cmdset_0020.c
47536+++ b/drivers/mtd/chips/cfi_cmdset_0020.c
47537@@ -666,7 +666,7 @@ cfi_staa_writev(struct mtd_info *mtd, const struct kvec *vecs,
47538 size_t totlen = 0, thislen;
47539 int ret = 0;
47540 size_t buflen = 0;
47541- static char *buffer;
47542+ char *buffer;
47543
47544 if (!ECCBUF_SIZE) {
47545 /* We should fall back to a general writev implementation.
47546diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
47547index f44c606..aa4e804 100644
47548--- a/drivers/mtd/nand/denali.c
47549+++ b/drivers/mtd/nand/denali.c
47550@@ -24,6 +24,7 @@
47551 #include <linux/slab.h>
47552 #include <linux/mtd/mtd.h>
47553 #include <linux/module.h>
47554+#include <linux/slab.h>
47555
47556 #include "denali.h"
47557
47558diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47559index 33f3c3c..d6bbe6a 100644
47560--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47561+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
47562@@ -386,7 +386,7 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
47563
47564 /* first try to map the upper buffer directly */
47565 if (virt_addr_valid(this->upper_buf) &&
47566- !object_is_on_stack(this->upper_buf)) {
47567+ !object_starts_on_stack(this->upper_buf)) {
47568 sg_init_one(sgl, this->upper_buf, this->upper_len);
47569 ret = dma_map_sg(this->dev, sgl, 1, dr);
47570 if (ret == 0)
47571diff --git a/drivers/mtd/nftlmount.c b/drivers/mtd/nftlmount.c
47572index a5dfbfb..8042ab4 100644
47573--- a/drivers/mtd/nftlmount.c
47574+++ b/drivers/mtd/nftlmount.c
47575@@ -24,6 +24,7 @@
47576 #include <asm/errno.h>
47577 #include <linux/delay.h>
47578 #include <linux/slab.h>
47579+#include <linux/sched.h>
47580 #include <linux/mtd/mtd.h>
47581 #include <linux/mtd/nand.h>
47582 #include <linux/mtd/nftl.h>
47583diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c
47584index c23184a..4115c41 100644
47585--- a/drivers/mtd/sm_ftl.c
47586+++ b/drivers/mtd/sm_ftl.c
47587@@ -56,7 +56,7 @@ static ssize_t sm_attr_show(struct device *dev, struct device_attribute *attr,
47588 #define SM_CIS_VENDOR_OFFSET 0x59
47589 static struct attribute_group *sm_create_sysfs_attributes(struct sm_ftl *ftl)
47590 {
47591- struct attribute_group *attr_group;
47592+ attribute_group_no_const *attr_group;
47593 struct attribute **attributes;
47594 struct sm_sysfs_attribute *vendor_attribute;
47595 char *vendor;
47596diff --git a/drivers/net/bonding/bond_netlink.c b/drivers/net/bonding/bond_netlink.c
47597index 7b11243..b3278a3 100644
47598--- a/drivers/net/bonding/bond_netlink.c
47599+++ b/drivers/net/bonding/bond_netlink.c
47600@@ -585,7 +585,7 @@ nla_put_failure:
47601 return -EMSGSIZE;
47602 }
47603
47604-struct rtnl_link_ops bond_link_ops __read_mostly = {
47605+struct rtnl_link_ops bond_link_ops = {
47606 .kind = "bond",
47607 .priv_size = sizeof(struct bonding),
47608 .setup = bond_setup,
47609diff --git a/drivers/net/caif/caif_hsi.c b/drivers/net/caif/caif_hsi.c
47610index b3b922a..80bba38 100644
47611--- a/drivers/net/caif/caif_hsi.c
47612+++ b/drivers/net/caif/caif_hsi.c
47613@@ -1444,7 +1444,7 @@ err:
47614 return -ENODEV;
47615 }
47616
47617-static struct rtnl_link_ops caif_hsi_link_ops __read_mostly = {
47618+static struct rtnl_link_ops caif_hsi_link_ops = {
47619 .kind = "cfhsi",
47620 .priv_size = sizeof(struct cfhsi),
47621 .setup = cfhsi_setup,
47622diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
47623index 58808f65..0bdc7b3 100644
47624--- a/drivers/net/can/Kconfig
47625+++ b/drivers/net/can/Kconfig
47626@@ -98,7 +98,7 @@ config CAN_JANZ_ICAN3
47627
47628 config CAN_FLEXCAN
47629 tristate "Support for Freescale FLEXCAN based chips"
47630- depends on ARM || PPC
47631+ depends on (ARM && CPU_LITTLE_ENDIAN) || PPC
47632 ---help---
47633 Say Y here if you want to support for Freescale FlexCAN.
47634
47635diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c
47636index b0f6924..59e9640 100644
47637--- a/drivers/net/can/dev.c
47638+++ b/drivers/net/can/dev.c
47639@@ -959,7 +959,7 @@ static int can_newlink(struct net *src_net, struct net_device *dev,
47640 return -EOPNOTSUPP;
47641 }
47642
47643-static struct rtnl_link_ops can_link_ops __read_mostly = {
47644+static struct rtnl_link_ops can_link_ops = {
47645 .kind = "can",
47646 .maxtype = IFLA_CAN_MAX,
47647 .policy = can_policy,
47648diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c
47649index 674f367..ec3a31f 100644
47650--- a/drivers/net/can/vcan.c
47651+++ b/drivers/net/can/vcan.c
47652@@ -163,7 +163,7 @@ static void vcan_setup(struct net_device *dev)
47653 dev->destructor = free_netdev;
47654 }
47655
47656-static struct rtnl_link_ops vcan_link_ops __read_mostly = {
47657+static struct rtnl_link_ops vcan_link_ops = {
47658 .kind = "vcan",
47659 .setup = vcan_setup,
47660 };
47661diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
47662index 49adbf1..fff7ff8 100644
47663--- a/drivers/net/dummy.c
47664+++ b/drivers/net/dummy.c
47665@@ -164,7 +164,7 @@ static int dummy_validate(struct nlattr *tb[], struct nlattr *data[])
47666 return 0;
47667 }
47668
47669-static struct rtnl_link_ops dummy_link_ops __read_mostly = {
47670+static struct rtnl_link_ops dummy_link_ops = {
47671 .kind = DRV_NAME,
47672 .setup = dummy_setup,
47673 .validate = dummy_validate,
47674diff --git a/drivers/net/ethernet/8390/ax88796.c b/drivers/net/ethernet/8390/ax88796.c
47675index 0443654..4f0aa18 100644
47676--- a/drivers/net/ethernet/8390/ax88796.c
47677+++ b/drivers/net/ethernet/8390/ax88796.c
47678@@ -889,9 +889,11 @@ static int ax_probe(struct platform_device *pdev)
47679 if (ax->plat->reg_offsets)
47680 ei_local->reg_offset = ax->plat->reg_offsets;
47681 else {
47682+ resource_size_t _mem_size = mem_size;
47683+ do_div(_mem_size, 0x18);
47684 ei_local->reg_offset = ax->reg_offsets;
47685 for (ret = 0; ret < 0x18; ret++)
47686- ax->reg_offsets[ret] = (mem_size / 0x18) * ret;
47687+ ax->reg_offsets[ret] = _mem_size * ret;
47688 }
47689
47690 if (!request_mem_region(mem->start, mem_size, pdev->name)) {
47691diff --git a/drivers/net/ethernet/altera/altera_tse_main.c b/drivers/net/ethernet/altera/altera_tse_main.c
47692index 6725dc0..163549c 100644
47693--- a/drivers/net/ethernet/altera/altera_tse_main.c
47694+++ b/drivers/net/ethernet/altera/altera_tse_main.c
47695@@ -1216,7 +1216,7 @@ static int tse_shutdown(struct net_device *dev)
47696 return 0;
47697 }
47698
47699-static struct net_device_ops altera_tse_netdev_ops = {
47700+static net_device_ops_no_const altera_tse_netdev_ops __read_only = {
47701 .ndo_open = tse_open,
47702 .ndo_stop = tse_shutdown,
47703 .ndo_start_xmit = tse_start_xmit,
47704@@ -1453,11 +1453,13 @@ static int altera_tse_probe(struct platform_device *pdev)
47705 ndev->netdev_ops = &altera_tse_netdev_ops;
47706 altera_tse_set_ethtool_ops(ndev);
47707
47708+ pax_open_kernel();
47709 altera_tse_netdev_ops.ndo_set_rx_mode = tse_set_rx_mode;
47710
47711 if (priv->hash_filter)
47712 altera_tse_netdev_ops.ndo_set_rx_mode =
47713 tse_set_rx_mode_hashfilter;
47714+ pax_close_kernel();
47715
47716 /* Scatter/gather IO is not supported,
47717 * so it is turned off
47718diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-common.h b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47719index 29a0927..5a348e24 100644
47720--- a/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47721+++ b/drivers/net/ethernet/amd/xgbe/xgbe-common.h
47722@@ -1122,14 +1122,14 @@ do { \
47723 * operations, everything works on mask values.
47724 */
47725 #define XMDIO_READ(_pdata, _mmd, _reg) \
47726- ((_pdata)->hw_if.read_mmd_regs((_pdata), 0, \
47727+ ((_pdata)->hw_if->read_mmd_regs((_pdata), 0, \
47728 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff)))
47729
47730 #define XMDIO_READ_BITS(_pdata, _mmd, _reg, _mask) \
47731 (XMDIO_READ((_pdata), _mmd, _reg) & _mask)
47732
47733 #define XMDIO_WRITE(_pdata, _mmd, _reg, _val) \
47734- ((_pdata)->hw_if.write_mmd_regs((_pdata), 0, \
47735+ ((_pdata)->hw_if->write_mmd_regs((_pdata), 0, \
47736 MII_ADDR_C45 | (_mmd << 16) | ((_reg) & 0xffff), (_val)))
47737
47738 #define XMDIO_WRITE_BITS(_pdata, _mmd, _reg, _mask, _val) \
47739diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47740index 8a50b01..39c1ad0 100644
47741--- a/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47742+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dcb.c
47743@@ -187,7 +187,7 @@ static int xgbe_dcb_ieee_setets(struct net_device *netdev,
47744
47745 memcpy(pdata->ets, ets, sizeof(*pdata->ets));
47746
47747- pdata->hw_if.config_dcb_tc(pdata);
47748+ pdata->hw_if->config_dcb_tc(pdata);
47749
47750 return 0;
47751 }
47752@@ -226,7 +226,7 @@ static int xgbe_dcb_ieee_setpfc(struct net_device *netdev,
47753
47754 memcpy(pdata->pfc, pfc, sizeof(*pdata->pfc));
47755
47756- pdata->hw_if.config_dcb_pfc(pdata);
47757+ pdata->hw_if->config_dcb_pfc(pdata);
47758
47759 return 0;
47760 }
47761diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47762index d81fc6b..6f8ab25 100644
47763--- a/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47764+++ b/drivers/net/ethernet/amd/xgbe/xgbe-desc.c
47765@@ -347,7 +347,7 @@ static int xgbe_map_rx_buffer(struct xgbe_prv_data *pdata,
47766
47767 static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47768 {
47769- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47770+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47771 struct xgbe_channel *channel;
47772 struct xgbe_ring *ring;
47773 struct xgbe_ring_data *rdata;
47774@@ -388,7 +388,7 @@ static void xgbe_wrapper_tx_descriptor_init(struct xgbe_prv_data *pdata)
47775
47776 static void xgbe_wrapper_rx_descriptor_init(struct xgbe_prv_data *pdata)
47777 {
47778- struct xgbe_hw_if *hw_if = &pdata->hw_if;
47779+ struct xgbe_hw_if *hw_if = pdata->hw_if;
47780 struct xgbe_channel *channel;
47781 struct xgbe_ring *ring;
47782 struct xgbe_ring_desc *rdesc;
47783@@ -620,17 +620,12 @@ err_out:
47784 return 0;
47785 }
47786
47787-void xgbe_init_function_ptrs_desc(struct xgbe_desc_if *desc_if)
47788-{
47789- DBGPR("-->xgbe_init_function_ptrs_desc\n");
47790-
47791- desc_if->alloc_ring_resources = xgbe_alloc_ring_resources;
47792- desc_if->free_ring_resources = xgbe_free_ring_resources;
47793- desc_if->map_tx_skb = xgbe_map_tx_skb;
47794- desc_if->map_rx_buffer = xgbe_map_rx_buffer;
47795- desc_if->unmap_rdata = xgbe_unmap_rdata;
47796- desc_if->wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init;
47797- desc_if->wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init;
47798-
47799- DBGPR("<--xgbe_init_function_ptrs_desc\n");
47800-}
47801+const struct xgbe_desc_if default_xgbe_desc_if = {
47802+ .alloc_ring_resources = xgbe_alloc_ring_resources,
47803+ .free_ring_resources = xgbe_free_ring_resources,
47804+ .map_tx_skb = xgbe_map_tx_skb,
47805+ .map_rx_buffer = xgbe_map_rx_buffer,
47806+ .unmap_rdata = xgbe_unmap_rdata,
47807+ .wrapper_tx_desc_init = xgbe_wrapper_tx_descriptor_init,
47808+ .wrapper_rx_desc_init = xgbe_wrapper_rx_descriptor_init,
47809+};
47810diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47811index 400757b..d8c53f6 100644
47812--- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47813+++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
47814@@ -2748,7 +2748,7 @@ static void xgbe_powerdown_rx(struct xgbe_prv_data *pdata)
47815
47816 static int xgbe_init(struct xgbe_prv_data *pdata)
47817 {
47818- struct xgbe_desc_if *desc_if = &pdata->desc_if;
47819+ struct xgbe_desc_if *desc_if = pdata->desc_if;
47820 int ret;
47821
47822 DBGPR("-->xgbe_init\n");
47823@@ -2813,108 +2813,103 @@ static int xgbe_init(struct xgbe_prv_data *pdata)
47824 return 0;
47825 }
47826
47827-void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *hw_if)
47828-{
47829- DBGPR("-->xgbe_init_function_ptrs\n");
47830-
47831- hw_if->tx_complete = xgbe_tx_complete;
47832-
47833- hw_if->set_promiscuous_mode = xgbe_set_promiscuous_mode;
47834- hw_if->set_all_multicast_mode = xgbe_set_all_multicast_mode;
47835- hw_if->add_mac_addresses = xgbe_add_mac_addresses;
47836- hw_if->set_mac_address = xgbe_set_mac_address;
47837-
47838- hw_if->enable_rx_csum = xgbe_enable_rx_csum;
47839- hw_if->disable_rx_csum = xgbe_disable_rx_csum;
47840-
47841- hw_if->enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping;
47842- hw_if->disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping;
47843- hw_if->enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering;
47844- hw_if->disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering;
47845- hw_if->update_vlan_hash_table = xgbe_update_vlan_hash_table;
47846-
47847- hw_if->read_mmd_regs = xgbe_read_mmd_regs;
47848- hw_if->write_mmd_regs = xgbe_write_mmd_regs;
47849-
47850- hw_if->set_gmii_speed = xgbe_set_gmii_speed;
47851- hw_if->set_gmii_2500_speed = xgbe_set_gmii_2500_speed;
47852- hw_if->set_xgmii_speed = xgbe_set_xgmii_speed;
47853-
47854- hw_if->enable_tx = xgbe_enable_tx;
47855- hw_if->disable_tx = xgbe_disable_tx;
47856- hw_if->enable_rx = xgbe_enable_rx;
47857- hw_if->disable_rx = xgbe_disable_rx;
47858-
47859- hw_if->powerup_tx = xgbe_powerup_tx;
47860- hw_if->powerdown_tx = xgbe_powerdown_tx;
47861- hw_if->powerup_rx = xgbe_powerup_rx;
47862- hw_if->powerdown_rx = xgbe_powerdown_rx;
47863-
47864- hw_if->dev_xmit = xgbe_dev_xmit;
47865- hw_if->dev_read = xgbe_dev_read;
47866- hw_if->enable_int = xgbe_enable_int;
47867- hw_if->disable_int = xgbe_disable_int;
47868- hw_if->init = xgbe_init;
47869- hw_if->exit = xgbe_exit;
47870+const struct xgbe_hw_if default_xgbe_hw_if = {
47871+ .tx_complete = xgbe_tx_complete,
47872+
47873+ .set_promiscuous_mode = xgbe_set_promiscuous_mode,
47874+ .set_all_multicast_mode = xgbe_set_all_multicast_mode,
47875+ .add_mac_addresses = xgbe_add_mac_addresses,
47876+ .set_mac_address = xgbe_set_mac_address,
47877+
47878+ .enable_rx_csum = xgbe_enable_rx_csum,
47879+ .disable_rx_csum = xgbe_disable_rx_csum,
47880+
47881+ .enable_rx_vlan_stripping = xgbe_enable_rx_vlan_stripping,
47882+ .disable_rx_vlan_stripping = xgbe_disable_rx_vlan_stripping,
47883+ .enable_rx_vlan_filtering = xgbe_enable_rx_vlan_filtering,
47884+ .disable_rx_vlan_filtering = xgbe_disable_rx_vlan_filtering,
47885+ .update_vlan_hash_table = xgbe_update_vlan_hash_table,
47886+
47887+ .read_mmd_regs = xgbe_read_mmd_regs,
47888+ .write_mmd_regs = xgbe_write_mmd_regs,
47889+
47890+ .set_gmii_speed = xgbe_set_gmii_speed,
47891+ .set_gmii_2500_speed = xgbe_set_gmii_2500_speed,
47892+ .set_xgmii_speed = xgbe_set_xgmii_speed,
47893+
47894+ .enable_tx = xgbe_enable_tx,
47895+ .disable_tx = xgbe_disable_tx,
47896+ .enable_rx = xgbe_enable_rx,
47897+ .disable_rx = xgbe_disable_rx,
47898+
47899+ .powerup_tx = xgbe_powerup_tx,
47900+ .powerdown_tx = xgbe_powerdown_tx,
47901+ .powerup_rx = xgbe_powerup_rx,
47902+ .powerdown_rx = xgbe_powerdown_rx,
47903+
47904+ .dev_xmit = xgbe_dev_xmit,
47905+ .dev_read = xgbe_dev_read,
47906+ .enable_int = xgbe_enable_int,
47907+ .disable_int = xgbe_disable_int,
47908+ .init = xgbe_init,
47909+ .exit = xgbe_exit,
47910
47911 /* Descriptor related Sequences have to be initialized here */
47912- hw_if->tx_desc_init = xgbe_tx_desc_init;
47913- hw_if->rx_desc_init = xgbe_rx_desc_init;
47914- hw_if->tx_desc_reset = xgbe_tx_desc_reset;
47915- hw_if->rx_desc_reset = xgbe_rx_desc_reset;
47916- hw_if->is_last_desc = xgbe_is_last_desc;
47917- hw_if->is_context_desc = xgbe_is_context_desc;
47918- hw_if->tx_start_xmit = xgbe_tx_start_xmit;
47919+ .tx_desc_init = xgbe_tx_desc_init,
47920+ .rx_desc_init = xgbe_rx_desc_init,
47921+ .tx_desc_reset = xgbe_tx_desc_reset,
47922+ .rx_desc_reset = xgbe_rx_desc_reset,
47923+ .is_last_desc = xgbe_is_last_desc,
47924+ .is_context_desc = xgbe_is_context_desc,
47925+ .tx_start_xmit = xgbe_tx_start_xmit,
47926
47927 /* For FLOW ctrl */
47928- hw_if->config_tx_flow_control = xgbe_config_tx_flow_control;
47929- hw_if->config_rx_flow_control = xgbe_config_rx_flow_control;
47930+ .config_tx_flow_control = xgbe_config_tx_flow_control,
47931+ .config_rx_flow_control = xgbe_config_rx_flow_control,
47932
47933 /* For RX coalescing */
47934- hw_if->config_rx_coalesce = xgbe_config_rx_coalesce;
47935- hw_if->config_tx_coalesce = xgbe_config_tx_coalesce;
47936- hw_if->usec_to_riwt = xgbe_usec_to_riwt;
47937- hw_if->riwt_to_usec = xgbe_riwt_to_usec;
47938+ .config_rx_coalesce = xgbe_config_rx_coalesce,
47939+ .config_tx_coalesce = xgbe_config_tx_coalesce,
47940+ .usec_to_riwt = xgbe_usec_to_riwt,
47941+ .riwt_to_usec = xgbe_riwt_to_usec,
47942
47943 /* For RX and TX threshold config */
47944- hw_if->config_rx_threshold = xgbe_config_rx_threshold;
47945- hw_if->config_tx_threshold = xgbe_config_tx_threshold;
47946+ .config_rx_threshold = xgbe_config_rx_threshold,
47947+ .config_tx_threshold = xgbe_config_tx_threshold,
47948
47949 /* For RX and TX Store and Forward Mode config */
47950- hw_if->config_rsf_mode = xgbe_config_rsf_mode;
47951- hw_if->config_tsf_mode = xgbe_config_tsf_mode;
47952+ .config_rsf_mode = xgbe_config_rsf_mode,
47953+ .config_tsf_mode = xgbe_config_tsf_mode,
47954
47955 /* For TX DMA Operating on Second Frame config */
47956- hw_if->config_osp_mode = xgbe_config_osp_mode;
47957+ .config_osp_mode = xgbe_config_osp_mode,
47958
47959 /* For RX and TX PBL config */
47960- hw_if->config_rx_pbl_val = xgbe_config_rx_pbl_val;
47961- hw_if->get_rx_pbl_val = xgbe_get_rx_pbl_val;
47962- hw_if->config_tx_pbl_val = xgbe_config_tx_pbl_val;
47963- hw_if->get_tx_pbl_val = xgbe_get_tx_pbl_val;
47964- hw_if->config_pblx8 = xgbe_config_pblx8;
47965+ .config_rx_pbl_val = xgbe_config_rx_pbl_val,
47966+ .get_rx_pbl_val = xgbe_get_rx_pbl_val,
47967+ .config_tx_pbl_val = xgbe_config_tx_pbl_val,
47968+ .get_tx_pbl_val = xgbe_get_tx_pbl_val,
47969+ .config_pblx8 = xgbe_config_pblx8,
47970
47971 /* For MMC statistics support */
47972- hw_if->tx_mmc_int = xgbe_tx_mmc_int;
47973- hw_if->rx_mmc_int = xgbe_rx_mmc_int;
47974- hw_if->read_mmc_stats = xgbe_read_mmc_stats;
47975+ .tx_mmc_int = xgbe_tx_mmc_int,
47976+ .rx_mmc_int = xgbe_rx_mmc_int,
47977+ .read_mmc_stats = xgbe_read_mmc_stats,
47978
47979 /* For PTP config */
47980- hw_if->config_tstamp = xgbe_config_tstamp;
47981- hw_if->update_tstamp_addend = xgbe_update_tstamp_addend;
47982- hw_if->set_tstamp_time = xgbe_set_tstamp_time;
47983- hw_if->get_tstamp_time = xgbe_get_tstamp_time;
47984- hw_if->get_tx_tstamp = xgbe_get_tx_tstamp;
47985+ .config_tstamp = xgbe_config_tstamp,
47986+ .update_tstamp_addend = xgbe_update_tstamp_addend,
47987+ .set_tstamp_time = xgbe_set_tstamp_time,
47988+ .get_tstamp_time = xgbe_get_tstamp_time,
47989+ .get_tx_tstamp = xgbe_get_tx_tstamp,
47990
47991 /* For Data Center Bridging config */
47992- hw_if->config_dcb_tc = xgbe_config_dcb_tc;
47993- hw_if->config_dcb_pfc = xgbe_config_dcb_pfc;
47994+ .config_dcb_tc = xgbe_config_dcb_tc,
47995+ .config_dcb_pfc = xgbe_config_dcb_pfc,
47996
47997 /* For Receive Side Scaling */
47998- hw_if->enable_rss = xgbe_enable_rss;
47999- hw_if->disable_rss = xgbe_disable_rss;
48000- hw_if->set_rss_hash_key = xgbe_set_rss_hash_key;
48001- hw_if->set_rss_lookup_table = xgbe_set_rss_lookup_table;
48002-
48003- DBGPR("<--xgbe_init_function_ptrs\n");
48004-}
48005+ .enable_rss = xgbe_enable_rss,
48006+ .disable_rss = xgbe_disable_rss,
48007+ .set_rss_hash_key = xgbe_set_rss_hash_key,
48008+ .set_rss_lookup_table = xgbe_set_rss_lookup_table,
48009+};
48010diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48011index 885b02b..4b31a4c 100644
48012--- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48013+++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
48014@@ -244,7 +244,7 @@ static int xgbe_maybe_stop_tx_queue(struct xgbe_channel *channel,
48015 * support, tell it now
48016 */
48017 if (ring->tx.xmit_more)
48018- pdata->hw_if.tx_start_xmit(channel, ring);
48019+ pdata->hw_if->tx_start_xmit(channel, ring);
48020
48021 return NETDEV_TX_BUSY;
48022 }
48023@@ -272,7 +272,7 @@ static int xgbe_calc_rx_buf_size(struct net_device *netdev, unsigned int mtu)
48024
48025 static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48026 {
48027- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48028+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48029 struct xgbe_channel *channel;
48030 enum xgbe_int int_id;
48031 unsigned int i;
48032@@ -294,7 +294,7 @@ static void xgbe_enable_rx_tx_ints(struct xgbe_prv_data *pdata)
48033
48034 static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48035 {
48036- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48037+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48038 struct xgbe_channel *channel;
48039 enum xgbe_int int_id;
48040 unsigned int i;
48041@@ -317,7 +317,7 @@ static void xgbe_disable_rx_tx_ints(struct xgbe_prv_data *pdata)
48042 static irqreturn_t xgbe_isr(int irq, void *data)
48043 {
48044 struct xgbe_prv_data *pdata = data;
48045- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48046+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48047 struct xgbe_channel *channel;
48048 unsigned int dma_isr, dma_ch_isr;
48049 unsigned int mac_isr, mac_tssr;
48050@@ -673,7 +673,7 @@ static void xgbe_free_irqs(struct xgbe_prv_data *pdata)
48051
48052 void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48053 {
48054- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48055+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48056
48057 DBGPR("-->xgbe_init_tx_coalesce\n");
48058
48059@@ -687,7 +687,7 @@ void xgbe_init_tx_coalesce(struct xgbe_prv_data *pdata)
48060
48061 void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48062 {
48063- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48064+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48065
48066 DBGPR("-->xgbe_init_rx_coalesce\n");
48067
48068@@ -701,7 +701,7 @@ void xgbe_init_rx_coalesce(struct xgbe_prv_data *pdata)
48069
48070 static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48071 {
48072- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48073+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48074 struct xgbe_channel *channel;
48075 struct xgbe_ring *ring;
48076 struct xgbe_ring_data *rdata;
48077@@ -726,7 +726,7 @@ static void xgbe_free_tx_data(struct xgbe_prv_data *pdata)
48078
48079 static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48080 {
48081- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48082+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48083 struct xgbe_channel *channel;
48084 struct xgbe_ring *ring;
48085 struct xgbe_ring_data *rdata;
48086@@ -752,7 +752,7 @@ static void xgbe_free_rx_data(struct xgbe_prv_data *pdata)
48087 static void xgbe_adjust_link(struct net_device *netdev)
48088 {
48089 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48090- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48091+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48092 struct phy_device *phydev = pdata->phydev;
48093 int new_state = 0;
48094
48095@@ -860,7 +860,7 @@ static void xgbe_phy_exit(struct xgbe_prv_data *pdata)
48096 int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48097 {
48098 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48099- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48100+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48101 unsigned long flags;
48102
48103 DBGPR("-->xgbe_powerdown\n");
48104@@ -898,7 +898,7 @@ int xgbe_powerdown(struct net_device *netdev, unsigned int caller)
48105 int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48106 {
48107 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48108- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48109+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48110 unsigned long flags;
48111
48112 DBGPR("-->xgbe_powerup\n");
48113@@ -935,7 +935,7 @@ int xgbe_powerup(struct net_device *netdev, unsigned int caller)
48114
48115 static int xgbe_start(struct xgbe_prv_data *pdata)
48116 {
48117- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48118+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48119 struct net_device *netdev = pdata->netdev;
48120 int ret;
48121
48122@@ -976,7 +976,7 @@ err_napi:
48123
48124 static void xgbe_stop(struct xgbe_prv_data *pdata)
48125 {
48126- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48127+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48128 struct xgbe_channel *channel;
48129 struct net_device *netdev = pdata->netdev;
48130 struct netdev_queue *txq;
48131@@ -1203,7 +1203,7 @@ static int xgbe_set_hwtstamp_settings(struct xgbe_prv_data *pdata,
48132 return -ERANGE;
48133 }
48134
48135- pdata->hw_if.config_tstamp(pdata, mac_tscr);
48136+ pdata->hw_if->config_tstamp(pdata, mac_tscr);
48137
48138 memcpy(&pdata->tstamp_config, &config, sizeof(config));
48139
48140@@ -1352,7 +1352,7 @@ static void xgbe_packet_info(struct xgbe_prv_data *pdata,
48141 static int xgbe_open(struct net_device *netdev)
48142 {
48143 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48144- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48145+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48146 int ret;
48147
48148 DBGPR("-->xgbe_open\n");
48149@@ -1424,7 +1424,7 @@ err_phy_init:
48150 static int xgbe_close(struct net_device *netdev)
48151 {
48152 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48153- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48154+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48155
48156 DBGPR("-->xgbe_close\n");
48157
48158@@ -1452,8 +1452,8 @@ static int xgbe_close(struct net_device *netdev)
48159 static int xgbe_xmit(struct sk_buff *skb, struct net_device *netdev)
48160 {
48161 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48162- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48163- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48164+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48165+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48166 struct xgbe_channel *channel;
48167 struct xgbe_ring *ring;
48168 struct xgbe_packet_data *packet;
48169@@ -1521,7 +1521,7 @@ tx_netdev_return:
48170 static void xgbe_set_rx_mode(struct net_device *netdev)
48171 {
48172 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48173- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48174+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48175 unsigned int pr_mode, am_mode;
48176
48177 DBGPR("-->xgbe_set_rx_mode\n");
48178@@ -1540,7 +1540,7 @@ static void xgbe_set_rx_mode(struct net_device *netdev)
48179 static int xgbe_set_mac_address(struct net_device *netdev, void *addr)
48180 {
48181 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48182- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48183+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48184 struct sockaddr *saddr = addr;
48185
48186 DBGPR("-->xgbe_set_mac_address\n");
48187@@ -1607,7 +1607,7 @@ static struct rtnl_link_stats64 *xgbe_get_stats64(struct net_device *netdev,
48188
48189 DBGPR("-->%s\n", __func__);
48190
48191- pdata->hw_if.read_mmc_stats(pdata);
48192+ pdata->hw_if->read_mmc_stats(pdata);
48193
48194 s->rx_packets = pstats->rxframecount_gb;
48195 s->rx_bytes = pstats->rxoctetcount_gb;
48196@@ -1634,7 +1634,7 @@ static int xgbe_vlan_rx_add_vid(struct net_device *netdev, __be16 proto,
48197 u16 vid)
48198 {
48199 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48200- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48201+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48202
48203 DBGPR("-->%s\n", __func__);
48204
48205@@ -1650,7 +1650,7 @@ static int xgbe_vlan_rx_kill_vid(struct net_device *netdev, __be16 proto,
48206 u16 vid)
48207 {
48208 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48209- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48210+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48211
48212 DBGPR("-->%s\n", __func__);
48213
48214@@ -1716,7 +1716,7 @@ static int xgbe_set_features(struct net_device *netdev,
48215 netdev_features_t features)
48216 {
48217 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48218- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48219+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48220 netdev_features_t rxhash, rxcsum, rxvlan, rxvlan_filter;
48221 int ret = 0;
48222
48223@@ -1781,8 +1781,8 @@ struct net_device_ops *xgbe_get_netdev_ops(void)
48224 static void xgbe_rx_refresh(struct xgbe_channel *channel)
48225 {
48226 struct xgbe_prv_data *pdata = channel->pdata;
48227- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48228- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48229+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48230+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48231 struct xgbe_ring *ring = channel->rx_ring;
48232 struct xgbe_ring_data *rdata;
48233
48234@@ -1835,8 +1835,8 @@ static struct sk_buff *xgbe_create_skb(struct xgbe_prv_data *pdata,
48235 static int xgbe_tx_poll(struct xgbe_channel *channel)
48236 {
48237 struct xgbe_prv_data *pdata = channel->pdata;
48238- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48239- struct xgbe_desc_if *desc_if = &pdata->desc_if;
48240+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48241+ struct xgbe_desc_if *desc_if = pdata->desc_if;
48242 struct xgbe_ring *ring = channel->tx_ring;
48243 struct xgbe_ring_data *rdata;
48244 struct xgbe_ring_desc *rdesc;
48245@@ -1901,7 +1901,7 @@ static int xgbe_tx_poll(struct xgbe_channel *channel)
48246 static int xgbe_rx_poll(struct xgbe_channel *channel, int budget)
48247 {
48248 struct xgbe_prv_data *pdata = channel->pdata;
48249- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48250+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48251 struct xgbe_ring *ring = channel->rx_ring;
48252 struct xgbe_ring_data *rdata;
48253 struct xgbe_packet_data *packet;
48254diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48255index ebf4893..a8f51c6 100644
48256--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48257+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
48258@@ -203,7 +203,7 @@ static void xgbe_get_ethtool_stats(struct net_device *netdev,
48259
48260 DBGPR("-->%s\n", __func__);
48261
48262- pdata->hw_if.read_mmc_stats(pdata);
48263+ pdata->hw_if->read_mmc_stats(pdata);
48264 for (i = 0; i < XGBE_STATS_COUNT; i++) {
48265 stat = (u8 *)pdata + xgbe_gstring_stats[i].stat_offset;
48266 *data++ = *(u64 *)stat;
48267@@ -378,7 +378,7 @@ static int xgbe_get_coalesce(struct net_device *netdev,
48268 struct ethtool_coalesce *ec)
48269 {
48270 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48271- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48272+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48273 unsigned int riwt;
48274
48275 DBGPR("-->xgbe_get_coalesce\n");
48276@@ -401,7 +401,7 @@ static int xgbe_set_coalesce(struct net_device *netdev,
48277 struct ethtool_coalesce *ec)
48278 {
48279 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48280- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48281+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48282 unsigned int rx_frames, rx_riwt, rx_usecs;
48283 unsigned int tx_frames, tx_usecs;
48284
48285@@ -536,7 +536,7 @@ static int xgbe_set_rxfh(struct net_device *netdev, const u32 *indir,
48286 const u8 *key, const u8 hfunc)
48287 {
48288 struct xgbe_prv_data *pdata = netdev_priv(netdev);
48289- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48290+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48291 unsigned int ret;
48292
48293 if (hfunc != ETH_RSS_HASH_NO_CHANGE && hfunc != ETH_RSS_HASH_TOP)
48294diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48295index 32dd651..225cca3 100644
48296--- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48297+++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c
48298@@ -159,12 +159,6 @@ static void xgbe_default_config(struct xgbe_prv_data *pdata)
48299 DBGPR("<--xgbe_default_config\n");
48300 }
48301
48302-static void xgbe_init_all_fptrs(struct xgbe_prv_data *pdata)
48303-{
48304- xgbe_init_function_ptrs_dev(&pdata->hw_if);
48305- xgbe_init_function_ptrs_desc(&pdata->desc_if);
48306-}
48307-
48308 #ifdef CONFIG_ACPI
48309 static int xgbe_acpi_support(struct xgbe_prv_data *pdata)
48310 {
48311@@ -396,9 +390,8 @@ static int xgbe_probe(struct platform_device *pdev)
48312 memcpy(netdev->dev_addr, pdata->mac_addr, netdev->addr_len);
48313
48314 /* Set all the function pointers */
48315- xgbe_init_all_fptrs(pdata);
48316- hw_if = &pdata->hw_if;
48317- desc_if = &pdata->desc_if;
48318+ hw_if = pdata->hw_if = &default_xgbe_hw_if;
48319+ desc_if = pdata->desc_if = &default_xgbe_desc_if;
48320
48321 /* Issue software reset to device */
48322 hw_if->exit(pdata);
48323diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48324index 59e267f..0842a88 100644
48325--- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48326+++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
48327@@ -126,7 +126,7 @@
48328 static int xgbe_mdio_read(struct mii_bus *mii, int prtad, int mmd_reg)
48329 {
48330 struct xgbe_prv_data *pdata = mii->priv;
48331- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48332+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48333 int mmd_data;
48334
48335 DBGPR_MDIO("-->xgbe_mdio_read: prtad=%#x mmd_reg=%#x\n",
48336@@ -143,7 +143,7 @@ static int xgbe_mdio_write(struct mii_bus *mii, int prtad, int mmd_reg,
48337 u16 mmd_val)
48338 {
48339 struct xgbe_prv_data *pdata = mii->priv;
48340- struct xgbe_hw_if *hw_if = &pdata->hw_if;
48341+ struct xgbe_hw_if *hw_if = pdata->hw_if;
48342 int mmd_data = mmd_val;
48343
48344 DBGPR_MDIO("-->xgbe_mdio_write: prtad=%#x mmd_reg=%#x mmd_data=%#x\n",
48345diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48346index f326178..8bd7daf 100644
48347--- a/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48348+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ptp.c
48349@@ -129,7 +129,7 @@ static cycle_t xgbe_cc_read(const struct cyclecounter *cc)
48350 tstamp_cc);
48351 u64 nsec;
48352
48353- nsec = pdata->hw_if.get_tstamp_time(pdata);
48354+ nsec = pdata->hw_if->get_tstamp_time(pdata);
48355
48356 return nsec;
48357 }
48358@@ -158,7 +158,7 @@ static int xgbe_adjfreq(struct ptp_clock_info *info, s32 delta)
48359
48360 spin_lock_irqsave(&pdata->tstamp_lock, flags);
48361
48362- pdata->hw_if.update_tstamp_addend(pdata, addend);
48363+ pdata->hw_if->update_tstamp_addend(pdata, addend);
48364
48365 spin_unlock_irqrestore(&pdata->tstamp_lock, flags);
48366
48367diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
48368index 13e8f95..1d8beef 100644
48369--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
48370+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
48371@@ -675,8 +675,8 @@ struct xgbe_prv_data {
48372 int dev_irq;
48373 unsigned int per_channel_irq;
48374
48375- struct xgbe_hw_if hw_if;
48376- struct xgbe_desc_if desc_if;
48377+ struct xgbe_hw_if *hw_if;
48378+ struct xgbe_desc_if *desc_if;
48379
48380 /* AXI DMA settings */
48381 unsigned int coherent;
48382@@ -798,6 +798,9 @@ struct xgbe_prv_data {
48383 #endif
48384 };
48385
48386+extern const struct xgbe_hw_if default_xgbe_hw_if;
48387+extern const struct xgbe_desc_if default_xgbe_desc_if;
48388+
48389 /* Function prototypes*/
48390
48391 void xgbe_init_function_ptrs_dev(struct xgbe_hw_if *);
48392diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48393index adcacda..fa6e0ae 100644
48394--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48395+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
48396@@ -1065,7 +1065,7 @@ static inline u8 bnx2x_get_path_func_num(struct bnx2x *bp)
48397 static inline void bnx2x_init_bp_objs(struct bnx2x *bp)
48398 {
48399 /* RX_MODE controlling object */
48400- bnx2x_init_rx_mode_obj(bp, &bp->rx_mode_obj);
48401+ bnx2x_init_rx_mode_obj(bp);
48402
48403 /* multicast configuration controlling object */
48404 bnx2x_init_mcast_obj(bp, &bp->mcast_obj, bp->fp->cl_id, bp->fp->cid,
48405diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48406index 07cdf9b..b08ecc7 100644
48407--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48408+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
48409@@ -2329,15 +2329,14 @@ int bnx2x_config_rx_mode(struct bnx2x *bp,
48410 return rc;
48411 }
48412
48413-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48414- struct bnx2x_rx_mode_obj *o)
48415+void bnx2x_init_rx_mode_obj(struct bnx2x *bp)
48416 {
48417 if (CHIP_IS_E1x(bp)) {
48418- o->wait_comp = bnx2x_empty_rx_mode_wait;
48419- o->config_rx_mode = bnx2x_set_rx_mode_e1x;
48420+ bp->rx_mode_obj.wait_comp = bnx2x_empty_rx_mode_wait;
48421+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e1x;
48422 } else {
48423- o->wait_comp = bnx2x_wait_rx_mode_comp_e2;
48424- o->config_rx_mode = bnx2x_set_rx_mode_e2;
48425+ bp->rx_mode_obj.wait_comp = bnx2x_wait_rx_mode_comp_e2;
48426+ bp->rx_mode_obj.config_rx_mode = bnx2x_set_rx_mode_e2;
48427 }
48428 }
48429
48430diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48431index 86baecb..ff3bb46 100644
48432--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48433+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
48434@@ -1411,8 +1411,7 @@ int bnx2x_vlan_mac_move(struct bnx2x *bp,
48435
48436 /********************* RX MODE ****************/
48437
48438-void bnx2x_init_rx_mode_obj(struct bnx2x *bp,
48439- struct bnx2x_rx_mode_obj *o);
48440+void bnx2x_init_rx_mode_obj(struct bnx2x *bp);
48441
48442 /**
48443 * bnx2x_config_rx_mode - Send and RX_MODE ramrod according to the provided parameters.
48444diff --git a/drivers/net/ethernet/broadcom/tg3.h b/drivers/net/ethernet/broadcom/tg3.h
48445index 31c9f82..e65e986 100644
48446--- a/drivers/net/ethernet/broadcom/tg3.h
48447+++ b/drivers/net/ethernet/broadcom/tg3.h
48448@@ -150,6 +150,7 @@
48449 #define CHIPREV_ID_5750_A0 0x4000
48450 #define CHIPREV_ID_5750_A1 0x4001
48451 #define CHIPREV_ID_5750_A3 0x4003
48452+#define CHIPREV_ID_5750_C1 0x4201
48453 #define CHIPREV_ID_5750_C2 0x4202
48454 #define CHIPREV_ID_5752_A0_HW 0x5000
48455 #define CHIPREV_ID_5752_A0 0x6000
48456diff --git a/drivers/net/ethernet/brocade/bna/bna_enet.c b/drivers/net/ethernet/brocade/bna/bna_enet.c
48457index 903466e..b285864 100644
48458--- a/drivers/net/ethernet/brocade/bna/bna_enet.c
48459+++ b/drivers/net/ethernet/brocade/bna/bna_enet.c
48460@@ -1693,10 +1693,10 @@ bna_cb_ioceth_reset(void *arg)
48461 }
48462
48463 static struct bfa_ioc_cbfn bna_ioceth_cbfn = {
48464- bna_cb_ioceth_enable,
48465- bna_cb_ioceth_disable,
48466- bna_cb_ioceth_hbfail,
48467- bna_cb_ioceth_reset
48468+ .enable_cbfn = bna_cb_ioceth_enable,
48469+ .disable_cbfn = bna_cb_ioceth_disable,
48470+ .hbfail_cbfn = bna_cb_ioceth_hbfail,
48471+ .reset_cbfn = bna_cb_ioceth_reset
48472 };
48473
48474 static void bna_attr_init(struct bna_ioceth *ioceth)
48475diff --git a/drivers/net/ethernet/chelsio/cxgb3/l2t.h b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48476index 8cffcdf..aadf043 100644
48477--- a/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48478+++ b/drivers/net/ethernet/chelsio/cxgb3/l2t.h
48479@@ -87,7 +87,7 @@ typedef void (*arp_failure_handler_func)(struct t3cdev * dev,
48480 */
48481 struct l2t_skb_cb {
48482 arp_failure_handler_func arp_failure_handler;
48483-};
48484+} __no_const;
48485
48486 #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
48487
48488diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48489index d929951..a2c23f5 100644
48490--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48491+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
48492@@ -2215,7 +2215,7 @@ static void get_regs(struct net_device *dev, struct ethtool_regs *regs,
48493
48494 int i;
48495 struct adapter *ap = netdev2adap(dev);
48496- static const unsigned int *reg_ranges;
48497+ const unsigned int *reg_ranges;
48498 int arr_size = 0, buf_size = 0;
48499
48500 if (is_t4(ap->params.chip)) {
48501diff --git a/drivers/net/ethernet/dec/tulip/de4x5.c b/drivers/net/ethernet/dec/tulip/de4x5.c
48502index badff18..e15c4ec 100644
48503--- a/drivers/net/ethernet/dec/tulip/de4x5.c
48504+++ b/drivers/net/ethernet/dec/tulip/de4x5.c
48505@@ -5373,7 +5373,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48506 for (i=0; i<ETH_ALEN; i++) {
48507 tmp.addr[i] = dev->dev_addr[i];
48508 }
48509- if (copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48510+ if (ioc->len > sizeof tmp.addr || copy_to_user(ioc->data, tmp.addr, ioc->len)) return -EFAULT;
48511 break;
48512
48513 case DE4X5_SET_HWADDR: /* Set the hardware address */
48514@@ -5413,7 +5413,7 @@ de4x5_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
48515 spin_lock_irqsave(&lp->lock, flags);
48516 memcpy(&statbuf, &lp->pktStats, ioc->len);
48517 spin_unlock_irqrestore(&lp->lock, flags);
48518- if (copy_to_user(ioc->data, &statbuf, ioc->len))
48519+ if (ioc->len > sizeof statbuf || copy_to_user(ioc->data, &statbuf, ioc->len))
48520 return -EFAULT;
48521 break;
48522 }
48523diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
48524index e6b790f..051ba2d 100644
48525--- a/drivers/net/ethernet/emulex/benet/be_main.c
48526+++ b/drivers/net/ethernet/emulex/benet/be_main.c
48527@@ -536,7 +536,7 @@ static void accumulate_16bit_val(u32 *acc, u16 val)
48528
48529 if (wrapped)
48530 newacc += 65536;
48531- ACCESS_ONCE(*acc) = newacc;
48532+ ACCESS_ONCE_RW(*acc) = newacc;
48533 }
48534
48535 static void populate_erx_stats(struct be_adapter *adapter,
48536diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
48537index 6d0c5d5..55be363 100644
48538--- a/drivers/net/ethernet/faraday/ftgmac100.c
48539+++ b/drivers/net/ethernet/faraday/ftgmac100.c
48540@@ -30,6 +30,8 @@
48541 #include <linux/netdevice.h>
48542 #include <linux/phy.h>
48543 #include <linux/platform_device.h>
48544+#include <linux/interrupt.h>
48545+#include <linux/irqreturn.h>
48546 #include <net/ip.h>
48547
48548 #include "ftgmac100.h"
48549diff --git a/drivers/net/ethernet/faraday/ftmac100.c b/drivers/net/ethernet/faraday/ftmac100.c
48550index dce5f7b..2433466 100644
48551--- a/drivers/net/ethernet/faraday/ftmac100.c
48552+++ b/drivers/net/ethernet/faraday/ftmac100.c
48553@@ -31,6 +31,8 @@
48554 #include <linux/module.h>
48555 #include <linux/netdevice.h>
48556 #include <linux/platform_device.h>
48557+#include <linux/interrupt.h>
48558+#include <linux/irqreturn.h>
48559
48560 #include "ftmac100.h"
48561
48562diff --git a/drivers/net/ethernet/intel/i40e/i40e_ptp.c b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48563index fabcfa1..188fd22 100644
48564--- a/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48565+++ b/drivers/net/ethernet/intel/i40e/i40e_ptp.c
48566@@ -419,7 +419,7 @@ void i40e_ptp_set_increment(struct i40e_pf *pf)
48567 wr32(hw, I40E_PRTTSYN_INC_H, incval >> 32);
48568
48569 /* Update the base adjustement value. */
48570- ACCESS_ONCE(pf->ptp_base_adj) = incval;
48571+ ACCESS_ONCE_RW(pf->ptp_base_adj) = incval;
48572 smp_mb(); /* Force the above update. */
48573 }
48574
48575diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48576index 79c00f5..8da39f6 100644
48577--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48578+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
48579@@ -785,7 +785,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)
48580 }
48581
48582 /* update the base incval used to calculate frequency adjustment */
48583- ACCESS_ONCE(adapter->base_incval) = incval;
48584+ ACCESS_ONCE_RW(adapter->base_incval) = incval;
48585 smp_mb();
48586
48587 /* need lock to prevent incorrect read while modifying cyclecounter */
48588diff --git a/drivers/net/ethernet/mellanox/mlx4/en_tx.c b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48589index 55f9f5c..18cc64b 100644
48590--- a/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48591+++ b/drivers/net/ethernet/mellanox/mlx4/en_tx.c
48592@@ -466,8 +466,8 @@ static bool mlx4_en_process_tx_cq(struct net_device *dev,
48593 wmb();
48594
48595 /* we want to dirty this cache line once */
48596- ACCESS_ONCE(ring->last_nr_txbb) = last_nr_txbb;
48597- ACCESS_ONCE(ring->cons) = ring_cons + txbbs_skipped;
48598+ ACCESS_ONCE_RW(ring->last_nr_txbb) = last_nr_txbb;
48599+ ACCESS_ONCE_RW(ring->cons) = ring_cons + txbbs_skipped;
48600
48601 netdev_tx_completed_queue(ring->tx_queue, packets, bytes);
48602
48603diff --git a/drivers/net/ethernet/neterion/vxge/vxge-config.c b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48604index 6223930..975033d 100644
48605--- a/drivers/net/ethernet/neterion/vxge/vxge-config.c
48606+++ b/drivers/net/ethernet/neterion/vxge/vxge-config.c
48607@@ -3457,7 +3457,10 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48608 struct __vxge_hw_fifo *fifo;
48609 struct vxge_hw_fifo_config *config;
48610 u32 txdl_size, txdl_per_memblock;
48611- struct vxge_hw_mempool_cbs fifo_mp_callback;
48612+ static struct vxge_hw_mempool_cbs fifo_mp_callback = {
48613+ .item_func_alloc = __vxge_hw_fifo_mempool_item_alloc,
48614+ };
48615+
48616 struct __vxge_hw_virtualpath *vpath;
48617
48618 if ((vp == NULL) || (attr == NULL)) {
48619@@ -3540,8 +3543,6 @@ __vxge_hw_fifo_create(struct __vxge_hw_vpath_handle *vp,
48620 goto exit;
48621 }
48622
48623- fifo_mp_callback.item_func_alloc = __vxge_hw_fifo_mempool_item_alloc;
48624-
48625 fifo->mempool =
48626 __vxge_hw_mempool_create(vpath->hldev,
48627 fifo->config->memblock_size,
48628diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48629index 2bb48d5..d1a865d 100644
48630--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48631+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
48632@@ -2324,7 +2324,9 @@ int qlcnic_83xx_configure_opmode(struct qlcnic_adapter *adapter)
48633 max_tx_rings = QLCNIC_MAX_VNIC_TX_RINGS;
48634 } else if (ret == QLC_83XX_DEFAULT_OPMODE) {
48635 ahw->nic_mode = QLCNIC_DEFAULT_MODE;
48636- adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48637+ pax_open_kernel();
48638+ *(void **)&adapter->nic_ops->init_driver = qlcnic_83xx_init_default_driver;
48639+ pax_close_kernel();
48640 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48641 max_sds_rings = QLCNIC_MAX_SDS_RINGS;
48642 max_tx_rings = QLCNIC_MAX_TX_RINGS;
48643diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48644index be7d7a6..a8983f8 100644
48645--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48646+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_vnic.c
48647@@ -207,17 +207,23 @@ int qlcnic_83xx_config_vnic_opmode(struct qlcnic_adapter *adapter)
48648 case QLCNIC_NON_PRIV_FUNC:
48649 ahw->op_mode = QLCNIC_NON_PRIV_FUNC;
48650 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48651- nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48652+ pax_open_kernel();
48653+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_non_privileged_vnic;
48654+ pax_close_kernel();
48655 break;
48656 case QLCNIC_PRIV_FUNC:
48657 ahw->op_mode = QLCNIC_PRIV_FUNC;
48658 ahw->idc.state_entry = qlcnic_83xx_idc_vnic_pf_entry;
48659- nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48660+ pax_open_kernel();
48661+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_privileged_vnic;
48662+ pax_close_kernel();
48663 break;
48664 case QLCNIC_MGMT_FUNC:
48665 ahw->op_mode = QLCNIC_MGMT_FUNC;
48666 ahw->idc.state_entry = qlcnic_83xx_idc_ready_state_entry;
48667- nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48668+ pax_open_kernel();
48669+ *(void **)&nic_ops->init_driver = qlcnic_83xx_init_mgmt_vnic;
48670+ pax_close_kernel();
48671 break;
48672 default:
48673 dev_err(&adapter->pdev->dev, "Invalid Virtual NIC opmode\n");
48674diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48675index 332bb8a..e6adcd1 100644
48676--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48677+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_minidump.c
48678@@ -1285,7 +1285,7 @@ flash_temp:
48679 int qlcnic_dump_fw(struct qlcnic_adapter *adapter)
48680 {
48681 struct qlcnic_fw_dump *fw_dump = &adapter->ahw->fw_dump;
48682- static const struct qlcnic_dump_operations *fw_dump_ops;
48683+ const struct qlcnic_dump_operations *fw_dump_ops;
48684 struct qlcnic_83xx_dump_template_hdr *hdr_83xx;
48685 u32 entry_offset, dump, no_entries, buf_offset = 0;
48686 int i, k, ops_cnt, ops_index, dump_size = 0;
48687diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
48688index c70ab40..00b28e0 100644
48689--- a/drivers/net/ethernet/realtek/r8169.c
48690+++ b/drivers/net/ethernet/realtek/r8169.c
48691@@ -788,22 +788,22 @@ struct rtl8169_private {
48692 struct mdio_ops {
48693 void (*write)(struct rtl8169_private *, int, int);
48694 int (*read)(struct rtl8169_private *, int);
48695- } mdio_ops;
48696+ } __no_const mdio_ops;
48697
48698 struct pll_power_ops {
48699 void (*down)(struct rtl8169_private *);
48700 void (*up)(struct rtl8169_private *);
48701- } pll_power_ops;
48702+ } __no_const pll_power_ops;
48703
48704 struct jumbo_ops {
48705 void (*enable)(struct rtl8169_private *);
48706 void (*disable)(struct rtl8169_private *);
48707- } jumbo_ops;
48708+ } __no_const jumbo_ops;
48709
48710 struct csi_ops {
48711 void (*write)(struct rtl8169_private *, int, int);
48712 u32 (*read)(struct rtl8169_private *, int);
48713- } csi_ops;
48714+ } __no_const csi_ops;
48715
48716 int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
48717 int (*get_settings)(struct net_device *, struct ethtool_cmd *);
48718diff --git a/drivers/net/ethernet/sfc/ptp.c b/drivers/net/ethernet/sfc/ptp.c
48719index 6b861e3..204ac86 100644
48720--- a/drivers/net/ethernet/sfc/ptp.c
48721+++ b/drivers/net/ethernet/sfc/ptp.c
48722@@ -822,7 +822,7 @@ static int efx_ptp_synchronize(struct efx_nic *efx, unsigned int num_readings)
48723 ptp->start.dma_addr);
48724
48725 /* Clear flag that signals MC ready */
48726- ACCESS_ONCE(*start) = 0;
48727+ ACCESS_ONCE_RW(*start) = 0;
48728 rc = efx_mcdi_rpc_start(efx, MC_CMD_PTP, synch_buf,
48729 MC_CMD_PTP_IN_SYNCHRONIZE_LEN);
48730 EFX_BUG_ON_PARANOID(rc);
48731diff --git a/drivers/net/ethernet/sfc/selftest.c b/drivers/net/ethernet/sfc/selftest.c
48732index 10b6173..b605dfd5 100644
48733--- a/drivers/net/ethernet/sfc/selftest.c
48734+++ b/drivers/net/ethernet/sfc/selftest.c
48735@@ -46,7 +46,7 @@ struct efx_loopback_payload {
48736 struct iphdr ip;
48737 struct udphdr udp;
48738 __be16 iteration;
48739- const char msg[64];
48740+ char msg[64];
48741 } __packed;
48742
48743 /* Loopback test source MAC address */
48744diff --git a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48745index 08c483b..2c4a553 100644
48746--- a/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48747+++ b/drivers/net/ethernet/stmicro/stmmac/mmc_core.c
48748@@ -140,8 +140,8 @@ void dwmac_mmc_ctrl(void __iomem *ioaddr, unsigned int mode)
48749
48750 writel(value, ioaddr + MMC_CNTRL);
48751
48752- pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48753- MMC_CNTRL, value);
48754+// pr_debug("stmmac: MMC ctrl register (offset 0x%x): 0x%08x\n",
48755+// MMC_CNTRL, value);
48756 }
48757
48758 /* To mask all all interrupts.*/
48759diff --git a/drivers/net/ethernet/via/via-rhine.c b/drivers/net/ethernet/via/via-rhine.c
48760index 17e2766..c332f1e 100644
48761--- a/drivers/net/ethernet/via/via-rhine.c
48762+++ b/drivers/net/ethernet/via/via-rhine.c
48763@@ -2514,7 +2514,7 @@ static struct platform_driver rhine_driver_platform = {
48764 }
48765 };
48766
48767-static struct dmi_system_id rhine_dmi_table[] __initdata = {
48768+static const struct dmi_system_id rhine_dmi_table[] __initconst = {
48769 {
48770 .ident = "EPIA-M",
48771 .matches = {
48772diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h
48773index 384ca4f..dd7d4f9 100644
48774--- a/drivers/net/hyperv/hyperv_net.h
48775+++ b/drivers/net/hyperv/hyperv_net.h
48776@@ -171,7 +171,7 @@ struct rndis_device {
48777 enum rndis_device_state state;
48778 bool link_state;
48779 bool link_change;
48780- atomic_t new_req_id;
48781+ atomic_unchecked_t new_req_id;
48782
48783 spinlock_t request_lock;
48784 struct list_head req_list;
48785diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
48786index 7816d98..7890614 100644
48787--- a/drivers/net/hyperv/rndis_filter.c
48788+++ b/drivers/net/hyperv/rndis_filter.c
48789@@ -102,7 +102,7 @@ static struct rndis_request *get_rndis_request(struct rndis_device *dev,
48790 * template
48791 */
48792 set = &rndis_msg->msg.set_req;
48793- set->req_id = atomic_inc_return(&dev->new_req_id);
48794+ set->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48795
48796 /* Add to the request list */
48797 spin_lock_irqsave(&dev->request_lock, flags);
48798@@ -918,7 +918,7 @@ static void rndis_filter_halt_device(struct rndis_device *dev)
48799
48800 /* Setup the rndis set */
48801 halt = &request->request_msg.msg.halt_req;
48802- halt->req_id = atomic_inc_return(&dev->new_req_id);
48803+ halt->req_id = atomic_inc_return_unchecked(&dev->new_req_id);
48804
48805 /* Ignore return since this msg is optional. */
48806 rndis_filter_send_request(dev, request);
48807diff --git a/drivers/net/ifb.c b/drivers/net/ifb.c
48808index 34f846b..4a0d5b1 100644
48809--- a/drivers/net/ifb.c
48810+++ b/drivers/net/ifb.c
48811@@ -253,7 +253,7 @@ static int ifb_validate(struct nlattr *tb[], struct nlattr *data[])
48812 return 0;
48813 }
48814
48815-static struct rtnl_link_ops ifb_link_ops __read_mostly = {
48816+static struct rtnl_link_ops ifb_link_ops = {
48817 .kind = "ifb",
48818 .priv_size = sizeof(struct ifb_private),
48819 .setup = ifb_setup,
48820diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
48821index 1df38bd..4bc20b0 100644
48822--- a/drivers/net/macvlan.c
48823+++ b/drivers/net/macvlan.c
48824@@ -335,7 +335,7 @@ static void macvlan_broadcast_enqueue(struct macvlan_port *port,
48825 free_nskb:
48826 kfree_skb(nskb);
48827 err:
48828- atomic_long_inc(&skb->dev->rx_dropped);
48829+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
48830 }
48831
48832 static void macvlan_flush_sources(struct macvlan_port *port,
48833@@ -1459,13 +1459,15 @@ static const struct nla_policy macvlan_policy[IFLA_MACVLAN_MAX + 1] = {
48834 int macvlan_link_register(struct rtnl_link_ops *ops)
48835 {
48836 /* common fields */
48837- ops->priv_size = sizeof(struct macvlan_dev);
48838- ops->validate = macvlan_validate;
48839- ops->maxtype = IFLA_MACVLAN_MAX;
48840- ops->policy = macvlan_policy;
48841- ops->changelink = macvlan_changelink;
48842- ops->get_size = macvlan_get_size;
48843- ops->fill_info = macvlan_fill_info;
48844+ pax_open_kernel();
48845+ *(size_t *)&ops->priv_size = sizeof(struct macvlan_dev);
48846+ *(void **)&ops->validate = macvlan_validate;
48847+ *(int *)&ops->maxtype = IFLA_MACVLAN_MAX;
48848+ *(const void **)&ops->policy = macvlan_policy;
48849+ *(void **)&ops->changelink = macvlan_changelink;
48850+ *(void **)&ops->get_size = macvlan_get_size;
48851+ *(void **)&ops->fill_info = macvlan_fill_info;
48852+ pax_close_kernel();
48853
48854 return rtnl_link_register(ops);
48855 };
48856@@ -1551,7 +1553,7 @@ static int macvlan_device_event(struct notifier_block *unused,
48857 return NOTIFY_DONE;
48858 }
48859
48860-static struct notifier_block macvlan_notifier_block __read_mostly = {
48861+static struct notifier_block macvlan_notifier_block = {
48862 .notifier_call = macvlan_device_event,
48863 };
48864
48865diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c
48866index 27ecc5c..f636328 100644
48867--- a/drivers/net/macvtap.c
48868+++ b/drivers/net/macvtap.c
48869@@ -436,7 +436,7 @@ static void macvtap_setup(struct net_device *dev)
48870 dev->tx_queue_len = TUN_READQ_SIZE;
48871 }
48872
48873-static struct rtnl_link_ops macvtap_link_ops __read_mostly = {
48874+static struct rtnl_link_ops macvtap_link_ops = {
48875 .kind = "macvtap",
48876 .setup = macvtap_setup,
48877 .newlink = macvtap_newlink,
48878@@ -1033,7 +1033,7 @@ static long macvtap_ioctl(struct file *file, unsigned int cmd,
48879
48880 ret = 0;
48881 u = q->flags;
48882- if (copy_to_user(&ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48883+ if (copy_to_user(ifr->ifr_name, vlan->dev->name, IFNAMSIZ) ||
48884 put_user(u, &ifr->ifr_flags))
48885 ret = -EFAULT;
48886 macvtap_put_vlan(vlan);
48887@@ -1217,7 +1217,7 @@ static int macvtap_device_event(struct notifier_block *unused,
48888 return NOTIFY_DONE;
48889 }
48890
48891-static struct notifier_block macvtap_notifier_block __read_mostly = {
48892+static struct notifier_block macvtap_notifier_block = {
48893 .notifier_call = macvtap_device_event,
48894 };
48895
48896diff --git a/drivers/net/nlmon.c b/drivers/net/nlmon.c
48897index 34924df..a747360 100644
48898--- a/drivers/net/nlmon.c
48899+++ b/drivers/net/nlmon.c
48900@@ -154,7 +154,7 @@ static int nlmon_validate(struct nlattr *tb[], struct nlattr *data[])
48901 return 0;
48902 }
48903
48904-static struct rtnl_link_ops nlmon_link_ops __read_mostly = {
48905+static struct rtnl_link_ops nlmon_link_ops = {
48906 .kind = "nlmon",
48907 .priv_size = sizeof(struct nlmon),
48908 .setup = nlmon_setup,
48909diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
48910index bdfe51f..e7845c7 100644
48911--- a/drivers/net/phy/phy_device.c
48912+++ b/drivers/net/phy/phy_device.c
48913@@ -218,7 +218,7 @@ EXPORT_SYMBOL(phy_device_create);
48914 * zero on success.
48915 *
48916 */
48917-static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
48918+static int get_phy_c45_ids(struct mii_bus *bus, int addr, int *phy_id,
48919 struct phy_c45_device_ids *c45_ids) {
48920 int phy_reg;
48921 int i, reg_addr;
48922@@ -288,7 +288,7 @@ static int get_phy_c45_ids(struct mii_bus *bus, int addr, u32 *phy_id,
48923 * its return value is in turn returned.
48924 *
48925 */
48926-static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
48927+static int get_phy_id(struct mii_bus *bus, int addr, int *phy_id,
48928 bool is_c45, struct phy_c45_device_ids *c45_ids)
48929 {
48930 int phy_reg;
48931@@ -326,7 +326,7 @@ static int get_phy_id(struct mii_bus *bus, int addr, u32 *phy_id,
48932 struct phy_device *get_phy_device(struct mii_bus *bus, int addr, bool is_c45)
48933 {
48934 struct phy_c45_device_ids c45_ids = {0};
48935- u32 phy_id = 0;
48936+ int phy_id = 0;
48937 int r;
48938
48939 r = get_phy_id(bus, addr, &phy_id, is_c45, &c45_ids);
48940diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c
48941index 9d15566..5ad4ef6 100644
48942--- a/drivers/net/ppp/ppp_generic.c
48943+++ b/drivers/net/ppp/ppp_generic.c
48944@@ -1022,7 +1022,6 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48945 void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
48946 struct ppp_stats stats;
48947 struct ppp_comp_stats cstats;
48948- char *vers;
48949
48950 switch (cmd) {
48951 case SIOCGPPPSTATS:
48952@@ -1044,8 +1043,7 @@ ppp_net_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
48953 break;
48954
48955 case SIOCGPPPVER:
48956- vers = PPP_VERSION;
48957- if (copy_to_user(addr, vers, strlen(vers) + 1))
48958+ if (copy_to_user(addr, PPP_VERSION, sizeof(PPP_VERSION)))
48959 break;
48960 err = 0;
48961 break;
48962diff --git a/drivers/net/slip/slhc.c b/drivers/net/slip/slhc.c
48963index 079f7ad..b2a2bfa7 100644
48964--- a/drivers/net/slip/slhc.c
48965+++ b/drivers/net/slip/slhc.c
48966@@ -487,7 +487,7 @@ slhc_uncompress(struct slcompress *comp, unsigned char *icp, int isize)
48967 register struct tcphdr *thp;
48968 register struct iphdr *ip;
48969 register struct cstate *cs;
48970- int len, hdrlen;
48971+ long len, hdrlen;
48972 unsigned char *cp = icp;
48973
48974 /* We've got a compressed packet; read the change byte */
48975diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c
48976index 7d39484..d58499d 100644
48977--- a/drivers/net/team/team.c
48978+++ b/drivers/net/team/team.c
48979@@ -2099,7 +2099,7 @@ static unsigned int team_get_num_rx_queues(void)
48980 return TEAM_DEFAULT_NUM_RX_QUEUES;
48981 }
48982
48983-static struct rtnl_link_ops team_link_ops __read_mostly = {
48984+static struct rtnl_link_ops team_link_ops = {
48985 .kind = DRV_NAME,
48986 .priv_size = sizeof(struct team),
48987 .setup = team_setup,
48988@@ -2889,7 +2889,7 @@ static int team_device_event(struct notifier_block *unused,
48989 return NOTIFY_DONE;
48990 }
48991
48992-static struct notifier_block team_notifier_block __read_mostly = {
48993+static struct notifier_block team_notifier_block = {
48994 .notifier_call = team_device_event,
48995 };
48996
48997diff --git a/drivers/net/tun.c b/drivers/net/tun.c
48998index 857dca4..642f532 100644
48999--- a/drivers/net/tun.c
49000+++ b/drivers/net/tun.c
49001@@ -1421,7 +1421,7 @@ static int tun_validate(struct nlattr *tb[], struct nlattr *data[])
49002 return -EINVAL;
49003 }
49004
49005-static struct rtnl_link_ops tun_link_ops __read_mostly = {
49006+static struct rtnl_link_ops tun_link_ops = {
49007 .kind = DRV_NAME,
49008 .priv_size = sizeof(struct tun_struct),
49009 .setup = tun_setup,
49010@@ -1830,7 +1830,7 @@ unlock:
49011 }
49012
49013 static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49014- unsigned long arg, int ifreq_len)
49015+ unsigned long arg, size_t ifreq_len)
49016 {
49017 struct tun_file *tfile = file->private_data;
49018 struct tun_struct *tun;
49019@@ -1844,6 +1844,9 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd,
49020 int le;
49021 int ret;
49022
49023+ if (ifreq_len > sizeof ifr)
49024+ return -EFAULT;
49025+
49026 if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || _IOC_TYPE(cmd) == 0x89) {
49027 if (copy_from_user(&ifr, argp, ifreq_len))
49028 return -EFAULT;
49029diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
49030index 778e915..58c4d95 100644
49031--- a/drivers/net/usb/hso.c
49032+++ b/drivers/net/usb/hso.c
49033@@ -70,7 +70,7 @@
49034 #include <asm/byteorder.h>
49035 #include <linux/serial_core.h>
49036 #include <linux/serial.h>
49037-
49038+#include <asm/local.h>
49039
49040 #define MOD_AUTHOR "Option Wireless"
49041 #define MOD_DESCRIPTION "USB High Speed Option driver"
49042@@ -1183,7 +1183,7 @@ static void put_rxbuf_data_and_resubmit_ctrl_urb(struct hso_serial *serial)
49043 struct urb *urb;
49044
49045 urb = serial->rx_urb[0];
49046- if (serial->port.count > 0) {
49047+ if (atomic_read(&serial->port.count) > 0) {
49048 count = put_rxbuf_data(urb, serial);
49049 if (count == -1)
49050 return;
49051@@ -1221,7 +1221,7 @@ static void hso_std_serial_read_bulk_callback(struct urb *urb)
49052 DUMP1(urb->transfer_buffer, urb->actual_length);
49053
49054 /* Anyone listening? */
49055- if (serial->port.count == 0)
49056+ if (atomic_read(&serial->port.count) == 0)
49057 return;
49058
49059 if (serial->parent->port_spec & HSO_INFO_CRC_BUG)
49060@@ -1282,8 +1282,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49061 tty_port_tty_set(&serial->port, tty);
49062
49063 /* check for port already opened, if not set the termios */
49064- serial->port.count++;
49065- if (serial->port.count == 1) {
49066+ if (atomic_inc_return(&serial->port.count) == 1) {
49067 serial->rx_state = RX_IDLE;
49068 /* Force default termio settings */
49069 _hso_serial_set_termios(tty, NULL);
49070@@ -1293,7 +1292,7 @@ static int hso_serial_open(struct tty_struct *tty, struct file *filp)
49071 result = hso_start_serial_device(serial->parent, GFP_KERNEL);
49072 if (result) {
49073 hso_stop_serial_device(serial->parent);
49074- serial->port.count--;
49075+ atomic_dec(&serial->port.count);
49076 } else {
49077 kref_get(&serial->parent->ref);
49078 }
49079@@ -1331,10 +1330,10 @@ static void hso_serial_close(struct tty_struct *tty, struct file *filp)
49080
49081 /* reset the rts and dtr */
49082 /* do the actual close */
49083- serial->port.count--;
49084+ atomic_dec(&serial->port.count);
49085
49086- if (serial->port.count <= 0) {
49087- serial->port.count = 0;
49088+ if (atomic_read(&serial->port.count) <= 0) {
49089+ atomic_set(&serial->port.count, 0);
49090 tty_port_tty_set(&serial->port, NULL);
49091 if (!usb_gone)
49092 hso_stop_serial_device(serial->parent);
49093@@ -1417,7 +1416,7 @@ static void hso_serial_set_termios(struct tty_struct *tty, struct ktermios *old)
49094
49095 /* the actual setup */
49096 spin_lock_irqsave(&serial->serial_lock, flags);
49097- if (serial->port.count)
49098+ if (atomic_read(&serial->port.count))
49099 _hso_serial_set_termios(tty, old);
49100 else
49101 tty->termios = *old;
49102@@ -1886,7 +1885,7 @@ static void intr_callback(struct urb *urb)
49103 D1("Pending read interrupt on port %d\n", i);
49104 spin_lock(&serial->serial_lock);
49105 if (serial->rx_state == RX_IDLE &&
49106- serial->port.count > 0) {
49107+ atomic_read(&serial->port.count) > 0) {
49108 /* Setup and send a ctrl req read on
49109 * port i */
49110 if (!serial->rx_urb_filled[0]) {
49111@@ -3053,7 +3052,7 @@ static int hso_resume(struct usb_interface *iface)
49112 /* Start all serial ports */
49113 for (i = 0; i < HSO_SERIAL_TTY_MINORS; i++) {
49114 if (serial_table[i] && (serial_table[i]->interface == iface)) {
49115- if (dev2ser(serial_table[i])->port.count) {
49116+ if (atomic_read(&dev2ser(serial_table[i])->port.count)) {
49117 result =
49118 hso_start_serial_device(serial_table[i], GFP_NOIO);
49119 hso_kick_transmit(dev2ser(serial_table[i]));
49120diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
49121index 9f7c0ab..1577b4a 100644
49122--- a/drivers/net/usb/r8152.c
49123+++ b/drivers/net/usb/r8152.c
49124@@ -601,7 +601,7 @@ struct r8152 {
49125 void (*unload)(struct r8152 *);
49126 int (*eee_get)(struct r8152 *, struct ethtool_eee *);
49127 int (*eee_set)(struct r8152 *, struct ethtool_eee *);
49128- } rtl_ops;
49129+ } __no_const rtl_ops;
49130
49131 int intr_interval;
49132 u32 saved_wolopts;
49133diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
49134index a2515887..6d13233 100644
49135--- a/drivers/net/usb/sierra_net.c
49136+++ b/drivers/net/usb/sierra_net.c
49137@@ -51,7 +51,7 @@ static const char driver_name[] = "sierra_net";
49138 /* atomic counter partially included in MAC address to make sure 2 devices
49139 * do not end up with the same MAC - concept breaks in case of > 255 ifaces
49140 */
49141-static atomic_t iface_counter = ATOMIC_INIT(0);
49142+static atomic_unchecked_t iface_counter = ATOMIC_INIT(0);
49143
49144 /*
49145 * SYNC Timer Delay definition used to set the expiry time
49146@@ -697,7 +697,7 @@ static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
49147 dev->net->netdev_ops = &sierra_net_device_ops;
49148
49149 /* change MAC addr to include, ifacenum, and to be unique */
49150- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
49151+ dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return_unchecked(&iface_counter);
49152 dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
49153
49154 /* we will have to manufacture ethernet headers, prepare template */
49155diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
49156index 59b0e97..a6ed579 100644
49157--- a/drivers/net/virtio_net.c
49158+++ b/drivers/net/virtio_net.c
49159@@ -48,7 +48,7 @@ module_param(gso, bool, 0444);
49160 #define RECEIVE_AVG_WEIGHT 64
49161
49162 /* Minimum alignment for mergeable packet buffers. */
49163-#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256)
49164+#define MERGEABLE_BUFFER_ALIGN max(L1_CACHE_BYTES, 256UL)
49165
49166 #define VIRTNET_DRIVER_VERSION "1.0.0"
49167
49168diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
49169index fceb637..37c70fd 100644
49170--- a/drivers/net/vxlan.c
49171+++ b/drivers/net/vxlan.c
49172@@ -2935,7 +2935,7 @@ static struct net *vxlan_get_link_net(const struct net_device *dev)
49173 return vxlan->net;
49174 }
49175
49176-static struct rtnl_link_ops vxlan_link_ops __read_mostly = {
49177+static struct rtnl_link_ops vxlan_link_ops = {
49178 .kind = "vxlan",
49179 .maxtype = IFLA_VXLAN_MAX,
49180 .policy = vxlan_policy,
49181@@ -2983,7 +2983,7 @@ static int vxlan_lowerdev_event(struct notifier_block *unused,
49182 return NOTIFY_DONE;
49183 }
49184
49185-static struct notifier_block vxlan_notifier_block __read_mostly = {
49186+static struct notifier_block vxlan_notifier_block = {
49187 .notifier_call = vxlan_lowerdev_event,
49188 };
49189
49190diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c
49191index 5920c99..ff2e4a5 100644
49192--- a/drivers/net/wan/lmc/lmc_media.c
49193+++ b/drivers/net/wan/lmc/lmc_media.c
49194@@ -95,62 +95,63 @@ static inline void write_av9110_bit (lmc_softc_t *, int);
49195 static void write_av9110(lmc_softc_t *, u32, u32, u32, u32, u32);
49196
49197 lmc_media_t lmc_ds3_media = {
49198- lmc_ds3_init, /* special media init stuff */
49199- lmc_ds3_default, /* reset to default state */
49200- lmc_ds3_set_status, /* reset status to state provided */
49201- lmc_dummy_set_1, /* set clock source */
49202- lmc_dummy_set2_1, /* set line speed */
49203- lmc_ds3_set_100ft, /* set cable length */
49204- lmc_ds3_set_scram, /* set scrambler */
49205- lmc_ds3_get_link_status, /* get link status */
49206- lmc_dummy_set_1, /* set link status */
49207- lmc_ds3_set_crc_length, /* set CRC length */
49208- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49209- lmc_ds3_watchdog
49210+ .init = lmc_ds3_init, /* special media init stuff */
49211+ .defaults = lmc_ds3_default, /* reset to default state */
49212+ .set_status = lmc_ds3_set_status, /* reset status to state provided */
49213+ .set_clock_source = lmc_dummy_set_1, /* set clock source */
49214+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49215+ .set_cable_length = lmc_ds3_set_100ft, /* set cable length */
49216+ .set_scrambler = lmc_ds3_set_scram, /* set scrambler */
49217+ .get_link_status = lmc_ds3_get_link_status, /* get link status */
49218+ .set_link_status = lmc_dummy_set_1, /* set link status */
49219+ .set_crc_length = lmc_ds3_set_crc_length, /* set CRC length */
49220+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49221+ .watchdog = lmc_ds3_watchdog
49222 };
49223
49224 lmc_media_t lmc_hssi_media = {
49225- lmc_hssi_init, /* special media init stuff */
49226- lmc_hssi_default, /* reset to default state */
49227- lmc_hssi_set_status, /* reset status to state provided */
49228- lmc_hssi_set_clock, /* set clock source */
49229- lmc_dummy_set2_1, /* set line speed */
49230- lmc_dummy_set_1, /* set cable length */
49231- lmc_dummy_set_1, /* set scrambler */
49232- lmc_hssi_get_link_status, /* get link status */
49233- lmc_hssi_set_link_status, /* set link status */
49234- lmc_hssi_set_crc_length, /* set CRC length */
49235- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49236- lmc_hssi_watchdog
49237+ .init = lmc_hssi_init, /* special media init stuff */
49238+ .defaults = lmc_hssi_default, /* reset to default state */
49239+ .set_status = lmc_hssi_set_status, /* reset status to state provided */
49240+ .set_clock_source = lmc_hssi_set_clock, /* set clock source */
49241+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49242+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49243+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49244+ .get_link_status = lmc_hssi_get_link_status, /* get link status */
49245+ .set_link_status = lmc_hssi_set_link_status, /* set link status */
49246+ .set_crc_length = lmc_hssi_set_crc_length, /* set CRC length */
49247+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49248+ .watchdog = lmc_hssi_watchdog
49249 };
49250
49251-lmc_media_t lmc_ssi_media = { lmc_ssi_init, /* special media init stuff */
49252- lmc_ssi_default, /* reset to default state */
49253- lmc_ssi_set_status, /* reset status to state provided */
49254- lmc_ssi_set_clock, /* set clock source */
49255- lmc_ssi_set_speed, /* set line speed */
49256- lmc_dummy_set_1, /* set cable length */
49257- lmc_dummy_set_1, /* set scrambler */
49258- lmc_ssi_get_link_status, /* get link status */
49259- lmc_ssi_set_link_status, /* set link status */
49260- lmc_ssi_set_crc_length, /* set CRC length */
49261- lmc_dummy_set_1, /* set T1 or E1 circuit type */
49262- lmc_ssi_watchdog
49263+lmc_media_t lmc_ssi_media = {
49264+ .init = lmc_ssi_init, /* special media init stuff */
49265+ .defaults = lmc_ssi_default, /* reset to default state */
49266+ .set_status = lmc_ssi_set_status, /* reset status to state provided */
49267+ .set_clock_source = lmc_ssi_set_clock, /* set clock source */
49268+ .set_speed = lmc_ssi_set_speed, /* set line speed */
49269+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49270+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49271+ .get_link_status = lmc_ssi_get_link_status, /* get link status */
49272+ .set_link_status = lmc_ssi_set_link_status, /* set link status */
49273+ .set_crc_length = lmc_ssi_set_crc_length, /* set CRC length */
49274+ .set_circuit_type = lmc_dummy_set_1, /* set T1 or E1 circuit type */
49275+ .watchdog = lmc_ssi_watchdog
49276 };
49277
49278 lmc_media_t lmc_t1_media = {
49279- lmc_t1_init, /* special media init stuff */
49280- lmc_t1_default, /* reset to default state */
49281- lmc_t1_set_status, /* reset status to state provided */
49282- lmc_t1_set_clock, /* set clock source */
49283- lmc_dummy_set2_1, /* set line speed */
49284- lmc_dummy_set_1, /* set cable length */
49285- lmc_dummy_set_1, /* set scrambler */
49286- lmc_t1_get_link_status, /* get link status */
49287- lmc_dummy_set_1, /* set link status */
49288- lmc_t1_set_crc_length, /* set CRC length */
49289- lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49290- lmc_t1_watchdog
49291+ .init = lmc_t1_init, /* special media init stuff */
49292+ .defaults = lmc_t1_default, /* reset to default state */
49293+ .set_status = lmc_t1_set_status, /* reset status to state provided */
49294+ .set_clock_source = lmc_t1_set_clock, /* set clock source */
49295+ .set_speed = lmc_dummy_set2_1, /* set line speed */
49296+ .set_cable_length = lmc_dummy_set_1, /* set cable length */
49297+ .set_scrambler = lmc_dummy_set_1, /* set scrambler */
49298+ .get_link_status = lmc_t1_get_link_status, /* get link status */
49299+ .set_link_status = lmc_dummy_set_1, /* set link status */
49300+ .set_crc_length = lmc_t1_set_crc_length, /* set CRC length */
49301+ .set_circuit_type = lmc_t1_set_circuit_type, /* set T1 or E1 circuit type */
49302+ .watchdog = lmc_t1_watchdog
49303 };
49304
49305 static void
49306diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c
49307index feacc3b..5bac0de 100644
49308--- a/drivers/net/wan/z85230.c
49309+++ b/drivers/net/wan/z85230.c
49310@@ -485,9 +485,9 @@ static void z8530_status(struct z8530_channel *chan)
49311
49312 struct z8530_irqhandler z8530_sync =
49313 {
49314- z8530_rx,
49315- z8530_tx,
49316- z8530_status
49317+ .rx = z8530_rx,
49318+ .tx = z8530_tx,
49319+ .status = z8530_status
49320 };
49321
49322 EXPORT_SYMBOL(z8530_sync);
49323@@ -605,15 +605,15 @@ static void z8530_dma_status(struct z8530_channel *chan)
49324 }
49325
49326 static struct z8530_irqhandler z8530_dma_sync = {
49327- z8530_dma_rx,
49328- z8530_dma_tx,
49329- z8530_dma_status
49330+ .rx = z8530_dma_rx,
49331+ .tx = z8530_dma_tx,
49332+ .status = z8530_dma_status
49333 };
49334
49335 static struct z8530_irqhandler z8530_txdma_sync = {
49336- z8530_rx,
49337- z8530_dma_tx,
49338- z8530_dma_status
49339+ .rx = z8530_rx,
49340+ .tx = z8530_dma_tx,
49341+ .status = z8530_dma_status
49342 };
49343
49344 /**
49345@@ -680,9 +680,9 @@ static void z8530_status_clear(struct z8530_channel *chan)
49346
49347 struct z8530_irqhandler z8530_nop=
49348 {
49349- z8530_rx_clear,
49350- z8530_tx_clear,
49351- z8530_status_clear
49352+ .rx = z8530_rx_clear,
49353+ .tx = z8530_tx_clear,
49354+ .status = z8530_status_clear
49355 };
49356
49357
49358diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c
49359index 0b60295..b8bfa5b 100644
49360--- a/drivers/net/wimax/i2400m/rx.c
49361+++ b/drivers/net/wimax/i2400m/rx.c
49362@@ -1359,7 +1359,7 @@ int i2400m_rx_setup(struct i2400m *i2400m)
49363 if (i2400m->rx_roq == NULL)
49364 goto error_roq_alloc;
49365
49366- rd = kcalloc(I2400M_RO_CIN + 1, sizeof(*i2400m->rx_roq[0].log),
49367+ rd = kcalloc(sizeof(*i2400m->rx_roq[0].log), I2400M_RO_CIN + 1,
49368 GFP_KERNEL);
49369 if (rd == NULL) {
49370 result = -ENOMEM;
49371diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
49372index e71a2ce..2268d61 100644
49373--- a/drivers/net/wireless/airo.c
49374+++ b/drivers/net/wireless/airo.c
49375@@ -7846,7 +7846,7 @@ static int writerids(struct net_device *dev, aironet_ioctl *comp) {
49376 struct airo_info *ai = dev->ml_priv;
49377 int ridcode;
49378 int enabled;
49379- static int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49380+ int (* writer)(struct airo_info *, u16 rid, const void *, int, int);
49381 unsigned char *iobuf;
49382
49383 /* Only super-user can write RIDs */
49384diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
49385index da92bfa..5a9001a 100644
49386--- a/drivers/net/wireless/at76c50x-usb.c
49387+++ b/drivers/net/wireless/at76c50x-usb.c
49388@@ -353,7 +353,7 @@ static int at76_dfu_get_state(struct usb_device *udev, u8 *state)
49389 }
49390
49391 /* Convert timeout from the DFU status to jiffies */
49392-static inline unsigned long at76_get_timeout(struct dfu_status *s)
49393+static inline unsigned long __intentional_overflow(-1) at76_get_timeout(struct dfu_status *s)
49394 {
49395 return msecs_to_jiffies((s->poll_timeout[2] << 16)
49396 | (s->poll_timeout[1] << 8)
49397diff --git a/drivers/net/wireless/ath/ath10k/htc.c b/drivers/net/wireless/ath/ath10k/htc.c
49398index 2fd9e18..3f55bdd 100644
49399--- a/drivers/net/wireless/ath/ath10k/htc.c
49400+++ b/drivers/net/wireless/ath/ath10k/htc.c
49401@@ -849,7 +849,10 @@ int ath10k_htc_start(struct ath10k_htc *htc)
49402 /* registered target arrival callback from the HIF layer */
49403 int ath10k_htc_init(struct ath10k *ar)
49404 {
49405- struct ath10k_hif_cb htc_callbacks;
49406+ static struct ath10k_hif_cb htc_callbacks = {
49407+ .rx_completion = ath10k_htc_rx_completion_handler,
49408+ .tx_completion = ath10k_htc_tx_completion_handler,
49409+ };
49410 struct ath10k_htc_ep *ep = NULL;
49411 struct ath10k_htc *htc = &ar->htc;
49412
49413@@ -858,8 +861,6 @@ int ath10k_htc_init(struct ath10k *ar)
49414 ath10k_htc_reset_endpoint_states(htc);
49415
49416 /* setup HIF layer callbacks */
49417- htc_callbacks.rx_completion = ath10k_htc_rx_completion_handler;
49418- htc_callbacks.tx_completion = ath10k_htc_tx_completion_handler;
49419 htc->ar = ar;
49420
49421 /* Get HIF default pipe for HTC message exchange */
49422diff --git a/drivers/net/wireless/ath/ath10k/htc.h b/drivers/net/wireless/ath/ath10k/htc.h
49423index 527179c..a890150 100644
49424--- a/drivers/net/wireless/ath/ath10k/htc.h
49425+++ b/drivers/net/wireless/ath/ath10k/htc.h
49426@@ -270,13 +270,13 @@ enum ath10k_htc_ep_id {
49427
49428 struct ath10k_htc_ops {
49429 void (*target_send_suspend_complete)(struct ath10k *ar);
49430-};
49431+} __no_const;
49432
49433 struct ath10k_htc_ep_ops {
49434 void (*ep_tx_complete)(struct ath10k *, struct sk_buff *);
49435 void (*ep_rx_complete)(struct ath10k *, struct sk_buff *);
49436 void (*ep_tx_credits)(struct ath10k *);
49437-};
49438+} __no_const;
49439
49440 /* service connection information */
49441 struct ath10k_htc_svc_conn_req {
49442diff --git a/drivers/net/wireless/ath/ath9k/ar9002_mac.c b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49443index f816909..e56cd8b 100644
49444--- a/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49445+++ b/drivers/net/wireless/ath/ath9k/ar9002_mac.c
49446@@ -220,8 +220,8 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49447 ads->ds_txstatus6 = ads->ds_txstatus7 = 0;
49448 ads->ds_txstatus8 = ads->ds_txstatus9 = 0;
49449
49450- ACCESS_ONCE(ads->ds_link) = i->link;
49451- ACCESS_ONCE(ads->ds_data) = i->buf_addr[0];
49452+ ACCESS_ONCE_RW(ads->ds_link) = i->link;
49453+ ACCESS_ONCE_RW(ads->ds_data) = i->buf_addr[0];
49454
49455 ctl1 = i->buf_len[0] | (i->is_last ? 0 : AR_TxMore);
49456 ctl6 = SM(i->keytype, AR_EncrType);
49457@@ -235,26 +235,26 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49458
49459 if ((i->is_first || i->is_last) &&
49460 i->aggr != AGGR_BUF_MIDDLE && i->aggr != AGGR_BUF_LAST) {
49461- ACCESS_ONCE(ads->ds_ctl2) = set11nTries(i->rates, 0)
49462+ ACCESS_ONCE_RW(ads->ds_ctl2) = set11nTries(i->rates, 0)
49463 | set11nTries(i->rates, 1)
49464 | set11nTries(i->rates, 2)
49465 | set11nTries(i->rates, 3)
49466 | (i->dur_update ? AR_DurUpdateEna : 0)
49467 | SM(0, AR_BurstDur);
49468
49469- ACCESS_ONCE(ads->ds_ctl3) = set11nRate(i->rates, 0)
49470+ ACCESS_ONCE_RW(ads->ds_ctl3) = set11nRate(i->rates, 0)
49471 | set11nRate(i->rates, 1)
49472 | set11nRate(i->rates, 2)
49473 | set11nRate(i->rates, 3);
49474 } else {
49475- ACCESS_ONCE(ads->ds_ctl2) = 0;
49476- ACCESS_ONCE(ads->ds_ctl3) = 0;
49477+ ACCESS_ONCE_RW(ads->ds_ctl2) = 0;
49478+ ACCESS_ONCE_RW(ads->ds_ctl3) = 0;
49479 }
49480
49481 if (!i->is_first) {
49482- ACCESS_ONCE(ads->ds_ctl0) = 0;
49483- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49484- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49485+ ACCESS_ONCE_RW(ads->ds_ctl0) = 0;
49486+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49487+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49488 return;
49489 }
49490
49491@@ -279,7 +279,7 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49492 break;
49493 }
49494
49495- ACCESS_ONCE(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
49496+ ACCESS_ONCE_RW(ads->ds_ctl0) = (i->pkt_len & AR_FrameLen)
49497 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49498 | SM(i->txpower[0], AR_XmitPower0)
49499 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49500@@ -289,27 +289,27 @@ ar9002_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49501 | (i->flags & ATH9K_TXDESC_RTSENA ? AR_RTSEnable :
49502 (i->flags & ATH9K_TXDESC_CTSENA ? AR_CTSEnable : 0));
49503
49504- ACCESS_ONCE(ads->ds_ctl1) = ctl1;
49505- ACCESS_ONCE(ads->ds_ctl6) = ctl6;
49506+ ACCESS_ONCE_RW(ads->ds_ctl1) = ctl1;
49507+ ACCESS_ONCE_RW(ads->ds_ctl6) = ctl6;
49508
49509 if (i->aggr == AGGR_BUF_MIDDLE || i->aggr == AGGR_BUF_LAST)
49510 return;
49511
49512- ACCESS_ONCE(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
49513+ ACCESS_ONCE_RW(ads->ds_ctl4) = set11nPktDurRTSCTS(i->rates, 0)
49514 | set11nPktDurRTSCTS(i->rates, 1);
49515
49516- ACCESS_ONCE(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
49517+ ACCESS_ONCE_RW(ads->ds_ctl5) = set11nPktDurRTSCTS(i->rates, 2)
49518 | set11nPktDurRTSCTS(i->rates, 3);
49519
49520- ACCESS_ONCE(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49521+ ACCESS_ONCE_RW(ads->ds_ctl7) = set11nRateFlags(i->rates, 0)
49522 | set11nRateFlags(i->rates, 1)
49523 | set11nRateFlags(i->rates, 2)
49524 | set11nRateFlags(i->rates, 3)
49525 | SM(i->rtscts_rate, AR_RTSCTSRate);
49526
49527- ACCESS_ONCE(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
49528- ACCESS_ONCE(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
49529- ACCESS_ONCE(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
49530+ ACCESS_ONCE_RW(ads->ds_ctl9) = SM(i->txpower[1], AR_XmitPower1);
49531+ ACCESS_ONCE_RW(ads->ds_ctl10) = SM(i->txpower[2], AR_XmitPower2);
49532+ ACCESS_ONCE_RW(ads->ds_ctl11) = SM(i->txpower[3], AR_XmitPower3);
49533 }
49534
49535 static int ar9002_hw_proc_txdesc(struct ath_hw *ah, void *ds,
49536diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mac.c b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49537index da84b70..83e4978 100644
49538--- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49539+++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
49540@@ -39,47 +39,47 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49541 (i->qcu << AR_TxQcuNum_S) | desc_len;
49542
49543 checksum += val;
49544- ACCESS_ONCE(ads->info) = val;
49545+ ACCESS_ONCE_RW(ads->info) = val;
49546
49547 checksum += i->link;
49548- ACCESS_ONCE(ads->link) = i->link;
49549+ ACCESS_ONCE_RW(ads->link) = i->link;
49550
49551 checksum += i->buf_addr[0];
49552- ACCESS_ONCE(ads->data0) = i->buf_addr[0];
49553+ ACCESS_ONCE_RW(ads->data0) = i->buf_addr[0];
49554 checksum += i->buf_addr[1];
49555- ACCESS_ONCE(ads->data1) = i->buf_addr[1];
49556+ ACCESS_ONCE_RW(ads->data1) = i->buf_addr[1];
49557 checksum += i->buf_addr[2];
49558- ACCESS_ONCE(ads->data2) = i->buf_addr[2];
49559+ ACCESS_ONCE_RW(ads->data2) = i->buf_addr[2];
49560 checksum += i->buf_addr[3];
49561- ACCESS_ONCE(ads->data3) = i->buf_addr[3];
49562+ ACCESS_ONCE_RW(ads->data3) = i->buf_addr[3];
49563
49564 checksum += (val = (i->buf_len[0] << AR_BufLen_S) & AR_BufLen);
49565- ACCESS_ONCE(ads->ctl3) = val;
49566+ ACCESS_ONCE_RW(ads->ctl3) = val;
49567 checksum += (val = (i->buf_len[1] << AR_BufLen_S) & AR_BufLen);
49568- ACCESS_ONCE(ads->ctl5) = val;
49569+ ACCESS_ONCE_RW(ads->ctl5) = val;
49570 checksum += (val = (i->buf_len[2] << AR_BufLen_S) & AR_BufLen);
49571- ACCESS_ONCE(ads->ctl7) = val;
49572+ ACCESS_ONCE_RW(ads->ctl7) = val;
49573 checksum += (val = (i->buf_len[3] << AR_BufLen_S) & AR_BufLen);
49574- ACCESS_ONCE(ads->ctl9) = val;
49575+ ACCESS_ONCE_RW(ads->ctl9) = val;
49576
49577 checksum = (u16) (((checksum & 0xffff) + (checksum >> 16)) & 0xffff);
49578- ACCESS_ONCE(ads->ctl10) = checksum;
49579+ ACCESS_ONCE_RW(ads->ctl10) = checksum;
49580
49581 if (i->is_first || i->is_last) {
49582- ACCESS_ONCE(ads->ctl13) = set11nTries(i->rates, 0)
49583+ ACCESS_ONCE_RW(ads->ctl13) = set11nTries(i->rates, 0)
49584 | set11nTries(i->rates, 1)
49585 | set11nTries(i->rates, 2)
49586 | set11nTries(i->rates, 3)
49587 | (i->dur_update ? AR_DurUpdateEna : 0)
49588 | SM(0, AR_BurstDur);
49589
49590- ACCESS_ONCE(ads->ctl14) = set11nRate(i->rates, 0)
49591+ ACCESS_ONCE_RW(ads->ctl14) = set11nRate(i->rates, 0)
49592 | set11nRate(i->rates, 1)
49593 | set11nRate(i->rates, 2)
49594 | set11nRate(i->rates, 3);
49595 } else {
49596- ACCESS_ONCE(ads->ctl13) = 0;
49597- ACCESS_ONCE(ads->ctl14) = 0;
49598+ ACCESS_ONCE_RW(ads->ctl13) = 0;
49599+ ACCESS_ONCE_RW(ads->ctl14) = 0;
49600 }
49601
49602 ads->ctl20 = 0;
49603@@ -89,17 +89,17 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49604
49605 ctl17 = SM(i->keytype, AR_EncrType);
49606 if (!i->is_first) {
49607- ACCESS_ONCE(ads->ctl11) = 0;
49608- ACCESS_ONCE(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49609- ACCESS_ONCE(ads->ctl15) = 0;
49610- ACCESS_ONCE(ads->ctl16) = 0;
49611- ACCESS_ONCE(ads->ctl17) = ctl17;
49612- ACCESS_ONCE(ads->ctl18) = 0;
49613- ACCESS_ONCE(ads->ctl19) = 0;
49614+ ACCESS_ONCE_RW(ads->ctl11) = 0;
49615+ ACCESS_ONCE_RW(ads->ctl12) = i->is_last ? 0 : AR_TxMore;
49616+ ACCESS_ONCE_RW(ads->ctl15) = 0;
49617+ ACCESS_ONCE_RW(ads->ctl16) = 0;
49618+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49619+ ACCESS_ONCE_RW(ads->ctl18) = 0;
49620+ ACCESS_ONCE_RW(ads->ctl19) = 0;
49621 return;
49622 }
49623
49624- ACCESS_ONCE(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49625+ ACCESS_ONCE_RW(ads->ctl11) = (i->pkt_len & AR_FrameLen)
49626 | (i->flags & ATH9K_TXDESC_VMF ? AR_VirtMoreFrag : 0)
49627 | SM(i->txpower[0], AR_XmitPower0)
49628 | (i->flags & ATH9K_TXDESC_VEOL ? AR_VEOL : 0)
49629@@ -135,26 +135,26 @@ ar9003_set_txdesc(struct ath_hw *ah, void *ds, struct ath_tx_info *i)
49630 val = (i->flags & ATH9K_TXDESC_PAPRD) >> ATH9K_TXDESC_PAPRD_S;
49631 ctl12 |= SM(val, AR_PAPRDChainMask);
49632
49633- ACCESS_ONCE(ads->ctl12) = ctl12;
49634- ACCESS_ONCE(ads->ctl17) = ctl17;
49635+ ACCESS_ONCE_RW(ads->ctl12) = ctl12;
49636+ ACCESS_ONCE_RW(ads->ctl17) = ctl17;
49637
49638- ACCESS_ONCE(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49639+ ACCESS_ONCE_RW(ads->ctl15) = set11nPktDurRTSCTS(i->rates, 0)
49640 | set11nPktDurRTSCTS(i->rates, 1);
49641
49642- ACCESS_ONCE(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49643+ ACCESS_ONCE_RW(ads->ctl16) = set11nPktDurRTSCTS(i->rates, 2)
49644 | set11nPktDurRTSCTS(i->rates, 3);
49645
49646- ACCESS_ONCE(ads->ctl18) = set11nRateFlags(i->rates, 0)
49647+ ACCESS_ONCE_RW(ads->ctl18) = set11nRateFlags(i->rates, 0)
49648 | set11nRateFlags(i->rates, 1)
49649 | set11nRateFlags(i->rates, 2)
49650 | set11nRateFlags(i->rates, 3)
49651 | SM(i->rtscts_rate, AR_RTSCTSRate);
49652
49653- ACCESS_ONCE(ads->ctl19) = AR_Not_Sounding;
49654+ ACCESS_ONCE_RW(ads->ctl19) = AR_Not_Sounding;
49655
49656- ACCESS_ONCE(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
49657- ACCESS_ONCE(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
49658- ACCESS_ONCE(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
49659+ ACCESS_ONCE_RW(ads->ctl20) = SM(i->txpower[1], AR_XmitPower1);
49660+ ACCESS_ONCE_RW(ads->ctl21) = SM(i->txpower[2], AR_XmitPower2);
49661+ ACCESS_ONCE_RW(ads->ctl22) = SM(i->txpower[3], AR_XmitPower3);
49662 }
49663
49664 static u16 ar9003_calc_ptr_chksum(struct ar9003_txc *ads)
49665diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
49666index e82e570..8c3cf90 100644
49667--- a/drivers/net/wireless/ath/ath9k/hw.h
49668+++ b/drivers/net/wireless/ath/ath9k/hw.h
49669@@ -646,7 +646,7 @@ struct ath_hw_private_ops {
49670
49671 /* ANI */
49672 void (*ani_cache_ini_regs)(struct ath_hw *ah);
49673-};
49674+} __no_const;
49675
49676 /**
49677 * struct ath_spec_scan - parameters for Atheros spectral scan
49678@@ -722,7 +722,7 @@ struct ath_hw_ops {
49679 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
49680 void (*set_bt_ant_diversity)(struct ath_hw *hw, bool enable);
49681 #endif
49682-};
49683+} __no_const;
49684
49685 struct ath_nf_limits {
49686 s16 max;
49687diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
49688index 9ede991..a8f08fb 100644
49689--- a/drivers/net/wireless/ath/ath9k/main.c
49690+++ b/drivers/net/wireless/ath/ath9k/main.c
49691@@ -2537,16 +2537,18 @@ void ath9k_fill_chanctx_ops(void)
49692 if (!ath9k_is_chanctx_enabled())
49693 return;
49694
49695- ath9k_ops.hw_scan = ath9k_hw_scan;
49696- ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49697- ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49698- ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49699- ath9k_ops.add_chanctx = ath9k_add_chanctx;
49700- ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49701- ath9k_ops.change_chanctx = ath9k_change_chanctx;
49702- ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49703- ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49704- ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49705+ pax_open_kernel();
49706+ *(void **)&ath9k_ops.hw_scan = ath9k_hw_scan;
49707+ *(void **)&ath9k_ops.cancel_hw_scan = ath9k_cancel_hw_scan;
49708+ *(void **)&ath9k_ops.remain_on_channel = ath9k_remain_on_channel;
49709+ *(void **)&ath9k_ops.cancel_remain_on_channel = ath9k_cancel_remain_on_channel;
49710+ *(void **)&ath9k_ops.add_chanctx = ath9k_add_chanctx;
49711+ *(void **)&ath9k_ops.remove_chanctx = ath9k_remove_chanctx;
49712+ *(void **)&ath9k_ops.change_chanctx = ath9k_change_chanctx;
49713+ *(void **)&ath9k_ops.assign_vif_chanctx = ath9k_assign_vif_chanctx;
49714+ *(void **)&ath9k_ops.unassign_vif_chanctx = ath9k_unassign_vif_chanctx;
49715+ *(void **)&ath9k_ops.mgd_prepare_tx = ath9k_mgd_prepare_tx;
49716+ pax_close_kernel();
49717 }
49718
49719 #endif
49720diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c
49721index 058a9f2..d5cb1ba 100644
49722--- a/drivers/net/wireless/b43/phy_lp.c
49723+++ b/drivers/net/wireless/b43/phy_lp.c
49724@@ -2502,7 +2502,7 @@ static int lpphy_b2063_tune(struct b43_wldev *dev,
49725 {
49726 struct ssb_bus *bus = dev->dev->sdev->bus;
49727
49728- static const struct b206x_channel *chandata = NULL;
49729+ const struct b206x_channel *chandata = NULL;
49730 u32 crystal_freq = bus->chipco.pmu.crystalfreq * 1000;
49731 u32 freqref, vco_freq, val1, val2, val3, timeout, timeoutref, count;
49732 u16 old_comm15, scale;
49733diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
49734index e566580..2c218ca 100644
49735--- a/drivers/net/wireless/iwlegacy/3945-mac.c
49736+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
49737@@ -3631,7 +3631,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
49738 */
49739 if (il3945_mod_params.disable_hw_scan) {
49740 D_INFO("Disabling hw_scan\n");
49741- il3945_mac_ops.hw_scan = NULL;
49742+ pax_open_kernel();
49743+ *(void **)&il3945_mac_ops.hw_scan = NULL;
49744+ pax_close_kernel();
49745 }
49746
49747 D_INFO("*** LOAD DRIVER ***\n");
49748diff --git a/drivers/net/wireless/iwlwifi/dvm/debugfs.c b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49749index 0ffb6ff..c0b7f0e 100644
49750--- a/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49751+++ b/drivers/net/wireless/iwlwifi/dvm/debugfs.c
49752@@ -188,7 +188,7 @@ static ssize_t iwl_dbgfs_sram_write(struct file *file,
49753 {
49754 struct iwl_priv *priv = file->private_data;
49755 char buf[64];
49756- int buf_size;
49757+ size_t buf_size;
49758 u32 offset, len;
49759
49760 memset(buf, 0, sizeof(buf));
49761@@ -458,7 +458,7 @@ static ssize_t iwl_dbgfs_rx_handlers_write(struct file *file,
49762 struct iwl_priv *priv = file->private_data;
49763
49764 char buf[8];
49765- int buf_size;
49766+ size_t buf_size;
49767 u32 reset_flag;
49768
49769 memset(buf, 0, sizeof(buf));
49770@@ -539,7 +539,7 @@ static ssize_t iwl_dbgfs_disable_ht40_write(struct file *file,
49771 {
49772 struct iwl_priv *priv = file->private_data;
49773 char buf[8];
49774- int buf_size;
49775+ size_t buf_size;
49776 int ht40;
49777
49778 memset(buf, 0, sizeof(buf));
49779@@ -591,7 +591,7 @@ static ssize_t iwl_dbgfs_sleep_level_override_write(struct file *file,
49780 {
49781 struct iwl_priv *priv = file->private_data;
49782 char buf[8];
49783- int buf_size;
49784+ size_t buf_size;
49785 int value;
49786
49787 memset(buf, 0, sizeof(buf));
49788@@ -683,10 +683,10 @@ DEBUGFS_READ_FILE_OPS(temperature);
49789 DEBUGFS_READ_WRITE_FILE_OPS(sleep_level_override);
49790 DEBUGFS_READ_FILE_OPS(current_sleep_command);
49791
49792-static const char *fmt_value = " %-30s %10u\n";
49793-static const char *fmt_hex = " %-30s 0x%02X\n";
49794-static const char *fmt_table = " %-30s %10u %10u %10u %10u\n";
49795-static const char *fmt_header =
49796+static const char fmt_value[] = " %-30s %10u\n";
49797+static const char fmt_hex[] = " %-30s 0x%02X\n";
49798+static const char fmt_table[] = " %-30s %10u %10u %10u %10u\n";
49799+static const char fmt_header[] =
49800 "%-32s current cumulative delta max\n";
49801
49802 static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)
49803@@ -1856,7 +1856,7 @@ static ssize_t iwl_dbgfs_clear_ucode_statistics_write(struct file *file,
49804 {
49805 struct iwl_priv *priv = file->private_data;
49806 char buf[8];
49807- int buf_size;
49808+ size_t buf_size;
49809 int clear;
49810
49811 memset(buf, 0, sizeof(buf));
49812@@ -1901,7 +1901,7 @@ static ssize_t iwl_dbgfs_ucode_tracing_write(struct file *file,
49813 {
49814 struct iwl_priv *priv = file->private_data;
49815 char buf[8];
49816- int buf_size;
49817+ size_t buf_size;
49818 int trace;
49819
49820 memset(buf, 0, sizeof(buf));
49821@@ -1972,7 +1972,7 @@ static ssize_t iwl_dbgfs_missed_beacon_write(struct file *file,
49822 {
49823 struct iwl_priv *priv = file->private_data;
49824 char buf[8];
49825- int buf_size;
49826+ size_t buf_size;
49827 int missed;
49828
49829 memset(buf, 0, sizeof(buf));
49830@@ -2013,7 +2013,7 @@ static ssize_t iwl_dbgfs_plcp_delta_write(struct file *file,
49831
49832 struct iwl_priv *priv = file->private_data;
49833 char buf[8];
49834- int buf_size;
49835+ size_t buf_size;
49836 int plcp;
49837
49838 memset(buf, 0, sizeof(buf));
49839@@ -2073,7 +2073,7 @@ static ssize_t iwl_dbgfs_txfifo_flush_write(struct file *file,
49840
49841 struct iwl_priv *priv = file->private_data;
49842 char buf[8];
49843- int buf_size;
49844+ size_t buf_size;
49845 int flush;
49846
49847 memset(buf, 0, sizeof(buf));
49848@@ -2163,7 +2163,7 @@ static ssize_t iwl_dbgfs_protection_mode_write(struct file *file,
49849
49850 struct iwl_priv *priv = file->private_data;
49851 char buf[8];
49852- int buf_size;
49853+ size_t buf_size;
49854 int rts;
49855
49856 if (!priv->cfg->ht_params)
49857@@ -2204,7 +2204,7 @@ static ssize_t iwl_dbgfs_echo_test_write(struct file *file,
49858 {
49859 struct iwl_priv *priv = file->private_data;
49860 char buf[8];
49861- int buf_size;
49862+ size_t buf_size;
49863
49864 memset(buf, 0, sizeof(buf));
49865 buf_size = min(count, sizeof(buf) - 1);
49866@@ -2238,7 +2238,7 @@ static ssize_t iwl_dbgfs_log_event_write(struct file *file,
49867 struct iwl_priv *priv = file->private_data;
49868 u32 event_log_flag;
49869 char buf[8];
49870- int buf_size;
49871+ size_t buf_size;
49872
49873 /* check that the interface is up */
49874 if (!iwl_is_ready(priv))
49875@@ -2292,7 +2292,7 @@ static ssize_t iwl_dbgfs_calib_disabled_write(struct file *file,
49876 struct iwl_priv *priv = file->private_data;
49877 char buf[8];
49878 u32 calib_disabled;
49879- int buf_size;
49880+ size_t buf_size;
49881
49882 memset(buf, 0, sizeof(buf));
49883 buf_size = min(count, sizeof(buf) - 1);
49884diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c
49885index 69935aa..c1ca128 100644
49886--- a/drivers/net/wireless/iwlwifi/pcie/trans.c
49887+++ b/drivers/net/wireless/iwlwifi/pcie/trans.c
49888@@ -1836,7 +1836,7 @@ static ssize_t iwl_dbgfs_interrupt_write(struct file *file,
49889 struct isr_statistics *isr_stats = &trans_pcie->isr_stats;
49890
49891 char buf[8];
49892- int buf_size;
49893+ size_t buf_size;
49894 u32 reset_flag;
49895
49896 memset(buf, 0, sizeof(buf));
49897@@ -1857,7 +1857,7 @@ static ssize_t iwl_dbgfs_csr_write(struct file *file,
49898 {
49899 struct iwl_trans *trans = file->private_data;
49900 char buf[8];
49901- int buf_size;
49902+ size_t buf_size;
49903 int csr;
49904
49905 memset(buf, 0, sizeof(buf));
49906diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
49907index 8908be6..fe97ddd 100644
49908--- a/drivers/net/wireless/mac80211_hwsim.c
49909+++ b/drivers/net/wireless/mac80211_hwsim.c
49910@@ -3070,20 +3070,20 @@ static int __init init_mac80211_hwsim(void)
49911 if (channels < 1)
49912 return -EINVAL;
49913
49914- mac80211_hwsim_mchan_ops = mac80211_hwsim_ops;
49915- mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49916- mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49917- mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49918- mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49919- mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49920- mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49921- mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49922- mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49923- mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49924- mac80211_hwsim_mchan_ops.assign_vif_chanctx =
49925- mac80211_hwsim_assign_vif_chanctx;
49926- mac80211_hwsim_mchan_ops.unassign_vif_chanctx =
49927- mac80211_hwsim_unassign_vif_chanctx;
49928+ pax_open_kernel();
49929+ memcpy((void *)&mac80211_hwsim_mchan_ops, &mac80211_hwsim_ops, sizeof mac80211_hwsim_mchan_ops);
49930+ *(void **)&mac80211_hwsim_mchan_ops.hw_scan = mac80211_hwsim_hw_scan;
49931+ *(void **)&mac80211_hwsim_mchan_ops.cancel_hw_scan = mac80211_hwsim_cancel_hw_scan;
49932+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_start = NULL;
49933+ *(void **)&mac80211_hwsim_mchan_ops.sw_scan_complete = NULL;
49934+ *(void **)&mac80211_hwsim_mchan_ops.remain_on_channel = mac80211_hwsim_roc;
49935+ *(void **)&mac80211_hwsim_mchan_ops.cancel_remain_on_channel = mac80211_hwsim_croc;
49936+ *(void **)&mac80211_hwsim_mchan_ops.add_chanctx = mac80211_hwsim_add_chanctx;
49937+ *(void **)&mac80211_hwsim_mchan_ops.remove_chanctx = mac80211_hwsim_remove_chanctx;
49938+ *(void **)&mac80211_hwsim_mchan_ops.change_chanctx = mac80211_hwsim_change_chanctx;
49939+ *(void **)&mac80211_hwsim_mchan_ops.assign_vif_chanctx = mac80211_hwsim_assign_vif_chanctx;
49940+ *(void **)&mac80211_hwsim_mchan_ops.unassign_vif_chanctx = mac80211_hwsim_unassign_vif_chanctx;
49941+ pax_close_kernel();
49942
49943 spin_lock_init(&hwsim_radio_lock);
49944 INIT_LIST_HEAD(&hwsim_radios);
49945diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
49946index 60d44ce..884dd1c 100644
49947--- a/drivers/net/wireless/rndis_wlan.c
49948+++ b/drivers/net/wireless/rndis_wlan.c
49949@@ -1236,7 +1236,7 @@ static int set_rts_threshold(struct usbnet *usbdev, u32 rts_threshold)
49950
49951 netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
49952
49953- if (rts_threshold < 0 || rts_threshold > 2347)
49954+ if (rts_threshold > 2347)
49955 rts_threshold = 2347;
49956
49957 tmp = cpu_to_le32(rts_threshold);
49958diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
49959index 9bb398b..b0cc047 100644
49960--- a/drivers/net/wireless/rt2x00/rt2x00.h
49961+++ b/drivers/net/wireless/rt2x00/rt2x00.h
49962@@ -375,7 +375,7 @@ struct rt2x00_intf {
49963 * for hardware which doesn't support hardware
49964 * sequence counting.
49965 */
49966- atomic_t seqno;
49967+ atomic_unchecked_t seqno;
49968 };
49969
49970 static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
49971diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
49972index 68b620b..92ecd9e 100644
49973--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
49974+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
49975@@ -224,9 +224,9 @@ static void rt2x00queue_create_tx_descriptor_seq(struct rt2x00_dev *rt2x00dev,
49976 * sequence counter given by mac80211.
49977 */
49978 if (test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags))
49979- seqno = atomic_add_return(0x10, &intf->seqno);
49980+ seqno = atomic_add_return_unchecked(0x10, &intf->seqno);
49981 else
49982- seqno = atomic_read(&intf->seqno);
49983+ seqno = atomic_read_unchecked(&intf->seqno);
49984
49985 hdr->seq_ctrl &= cpu_to_le16(IEEE80211_SCTL_FRAG);
49986 hdr->seq_ctrl |= cpu_to_le16(seqno);
49987diff --git a/drivers/net/wireless/ti/wl1251/sdio.c b/drivers/net/wireless/ti/wl1251/sdio.c
49988index b661f896..ddf7d2b 100644
49989--- a/drivers/net/wireless/ti/wl1251/sdio.c
49990+++ b/drivers/net/wireless/ti/wl1251/sdio.c
49991@@ -282,13 +282,17 @@ static int wl1251_sdio_probe(struct sdio_func *func,
49992
49993 irq_set_irq_type(wl->irq, IRQ_TYPE_EDGE_RISING);
49994
49995- wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49996- wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
49997+ pax_open_kernel();
49998+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_enable_line_irq;
49999+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_disable_line_irq;
50000+ pax_close_kernel();
50001
50002 wl1251_info("using dedicated interrupt line");
50003 } else {
50004- wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50005- wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50006+ pax_open_kernel();
50007+ *(void **)&wl1251_sdio_ops.enable_irq = wl1251_sdio_enable_irq;
50008+ *(void **)&wl1251_sdio_ops.disable_irq = wl1251_sdio_disable_irq;
50009+ pax_close_kernel();
50010
50011 wl1251_info("using SDIO interrupt");
50012 }
50013diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c
50014index 144d1f8..7030936 100644
50015--- a/drivers/net/wireless/ti/wl12xx/main.c
50016+++ b/drivers/net/wireless/ti/wl12xx/main.c
50017@@ -657,7 +657,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50018 sizeof(wl->conf.mem));
50019
50020 /* read data preparation is only needed by wl127x */
50021- wl->ops->prepare_read = wl127x_prepare_read;
50022+ pax_open_kernel();
50023+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50024+ pax_close_kernel();
50025
50026 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50027 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50028@@ -682,7 +684,9 @@ static int wl12xx_identify_chip(struct wl1271 *wl)
50029 sizeof(wl->conf.mem));
50030
50031 /* read data preparation is only needed by wl127x */
50032- wl->ops->prepare_read = wl127x_prepare_read;
50033+ pax_open_kernel();
50034+ *(void **)&wl->ops->prepare_read = wl127x_prepare_read;
50035+ pax_close_kernel();
50036
50037 wlcore_set_min_fw_ver(wl, WL127X_CHIP_VER,
50038 WL127X_IFTYPE_SR_VER, WL127X_MAJOR_SR_VER,
50039diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
50040index 717c4f5..a813aeb 100644
50041--- a/drivers/net/wireless/ti/wl18xx/main.c
50042+++ b/drivers/net/wireless/ti/wl18xx/main.c
50043@@ -1923,8 +1923,10 @@ static int wl18xx_setup(struct wl1271 *wl)
50044 }
50045
50046 if (!checksum_param) {
50047- wl18xx_ops.set_rx_csum = NULL;
50048- wl18xx_ops.init_vif = NULL;
50049+ pax_open_kernel();
50050+ *(void **)&wl18xx_ops.set_rx_csum = NULL;
50051+ *(void **)&wl18xx_ops.init_vif = NULL;
50052+ pax_close_kernel();
50053 }
50054
50055 /* Enable 11a Band only if we have 5G antennas */
50056diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c
50057index a912dc0..a8225ba 100644
50058--- a/drivers/net/wireless/zd1211rw/zd_usb.c
50059+++ b/drivers/net/wireless/zd1211rw/zd_usb.c
50060@@ -385,7 +385,7 @@ static inline void handle_regs_int(struct urb *urb)
50061 {
50062 struct zd_usb *usb = urb->context;
50063 struct zd_usb_interrupt *intr = &usb->intr;
50064- int len;
50065+ unsigned int len;
50066 u16 int_num;
50067
50068 ZD_ASSERT(in_interrupt());
50069diff --git a/drivers/nfc/nfcwilink.c b/drivers/nfc/nfcwilink.c
50070index ce2e2cf..f81e500 100644
50071--- a/drivers/nfc/nfcwilink.c
50072+++ b/drivers/nfc/nfcwilink.c
50073@@ -497,7 +497,7 @@ static struct nci_ops nfcwilink_ops = {
50074
50075 static int nfcwilink_probe(struct platform_device *pdev)
50076 {
50077- static struct nfcwilink *drv;
50078+ struct nfcwilink *drv;
50079 int rc;
50080 __u32 protocols;
50081
50082diff --git a/drivers/nfc/st21nfca/st21nfca.c b/drivers/nfc/st21nfca/st21nfca.c
50083index 24d3d24..ff70d28 100644
50084--- a/drivers/nfc/st21nfca/st21nfca.c
50085+++ b/drivers/nfc/st21nfca/st21nfca.c
50086@@ -588,7 +588,7 @@ static int st21nfca_get_iso14443_3_uid(struct nfc_hci_dev *hdev, u8 *gate,
50087 goto exit;
50088 }
50089
50090- gate = uid_skb->data;
50091+ memcpy(gate, uid_skb->data, uid_skb->len);
50092 *len = uid_skb->len;
50093 exit:
50094 kfree_skb(uid_skb);
50095diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
50096index 3a896c9..ac7b1c8 100644
50097--- a/drivers/of/fdt.c
50098+++ b/drivers/of/fdt.c
50099@@ -1118,7 +1118,9 @@ static int __init of_fdt_raw_init(void)
50100 pr_warn("fdt: not creating '/sys/firmware/fdt': CRC check failed\n");
50101 return 0;
50102 }
50103- of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50104+ pax_open_kernel();
50105+ *(size_t *)&of_fdt_raw_attr.size = fdt_totalsize(initial_boot_params);
50106+ pax_close_kernel();
50107 return sysfs_create_bin_file(firmware_kobj, &of_fdt_raw_attr);
50108 }
50109 late_initcall(of_fdt_raw_init);
50110diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
50111index d93b2b6..ae50401 100644
50112--- a/drivers/oprofile/buffer_sync.c
50113+++ b/drivers/oprofile/buffer_sync.c
50114@@ -332,7 +332,7 @@ static void add_data(struct op_entry *entry, struct mm_struct *mm)
50115 if (cookie == NO_COOKIE)
50116 offset = pc;
50117 if (cookie == INVALID_COOKIE) {
50118- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50119+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50120 offset = pc;
50121 }
50122 if (cookie != last_cookie) {
50123@@ -376,14 +376,14 @@ add_sample(struct mm_struct *mm, struct op_sample *s, int in_kernel)
50124 /* add userspace sample */
50125
50126 if (!mm) {
50127- atomic_inc(&oprofile_stats.sample_lost_no_mm);
50128+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mm);
50129 return 0;
50130 }
50131
50132 cookie = lookup_dcookie(mm, s->eip, &offset);
50133
50134 if (cookie == INVALID_COOKIE) {
50135- atomic_inc(&oprofile_stats.sample_lost_no_mapping);
50136+ atomic_inc_unchecked(&oprofile_stats.sample_lost_no_mapping);
50137 return 0;
50138 }
50139
50140@@ -552,7 +552,7 @@ void sync_buffer(int cpu)
50141 /* ignore backtraces if failed to add a sample */
50142 if (state == sb_bt_start) {
50143 state = sb_bt_ignore;
50144- atomic_inc(&oprofile_stats.bt_lost_no_mapping);
50145+ atomic_inc_unchecked(&oprofile_stats.bt_lost_no_mapping);
50146 }
50147 }
50148 release_mm(mm);
50149diff --git a/drivers/oprofile/event_buffer.c b/drivers/oprofile/event_buffer.c
50150index c0cc4e7..44d4e54 100644
50151--- a/drivers/oprofile/event_buffer.c
50152+++ b/drivers/oprofile/event_buffer.c
50153@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value)
50154 }
50155
50156 if (buffer_pos == buffer_size) {
50157- atomic_inc(&oprofile_stats.event_lost_overflow);
50158+ atomic_inc_unchecked(&oprofile_stats.event_lost_overflow);
50159 return;
50160 }
50161
50162diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
50163index ed2c3ec..deda85a 100644
50164--- a/drivers/oprofile/oprof.c
50165+++ b/drivers/oprofile/oprof.c
50166@@ -110,7 +110,7 @@ static void switch_worker(struct work_struct *work)
50167 if (oprofile_ops.switch_events())
50168 return;
50169
50170- atomic_inc(&oprofile_stats.multiplex_counter);
50171+ atomic_inc_unchecked(&oprofile_stats.multiplex_counter);
50172 start_switch_worker();
50173 }
50174
50175diff --git a/drivers/oprofile/oprofile_files.c b/drivers/oprofile/oprofile_files.c
50176index ee2cfce..7f8f699 100644
50177--- a/drivers/oprofile/oprofile_files.c
50178+++ b/drivers/oprofile/oprofile_files.c
50179@@ -27,7 +27,7 @@ unsigned long oprofile_time_slice;
50180
50181 #ifdef CONFIG_OPROFILE_EVENT_MULTIPLEX
50182
50183-static ssize_t timeout_read(struct file *file, char __user *buf,
50184+static ssize_t __intentional_overflow(-1) timeout_read(struct file *file, char __user *buf,
50185 size_t count, loff_t *offset)
50186 {
50187 return oprofilefs_ulong_to_user(jiffies_to_msecs(oprofile_time_slice),
50188diff --git a/drivers/oprofile/oprofile_stats.c b/drivers/oprofile/oprofile_stats.c
50189index 59659ce..6c860a0 100644
50190--- a/drivers/oprofile/oprofile_stats.c
50191+++ b/drivers/oprofile/oprofile_stats.c
50192@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
50193 cpu_buf->sample_invalid_eip = 0;
50194 }
50195
50196- atomic_set(&oprofile_stats.sample_lost_no_mm, 0);
50197- atomic_set(&oprofile_stats.sample_lost_no_mapping, 0);
50198- atomic_set(&oprofile_stats.event_lost_overflow, 0);
50199- atomic_set(&oprofile_stats.bt_lost_no_mapping, 0);
50200- atomic_set(&oprofile_stats.multiplex_counter, 0);
50201+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mm, 0);
50202+ atomic_set_unchecked(&oprofile_stats.sample_lost_no_mapping, 0);
50203+ atomic_set_unchecked(&oprofile_stats.event_lost_overflow, 0);
50204+ atomic_set_unchecked(&oprofile_stats.bt_lost_no_mapping, 0);
50205+ atomic_set_unchecked(&oprofile_stats.multiplex_counter, 0);
50206 }
50207
50208
50209diff --git a/drivers/oprofile/oprofile_stats.h b/drivers/oprofile/oprofile_stats.h
50210index 1fc622b..8c48fc3 100644
50211--- a/drivers/oprofile/oprofile_stats.h
50212+++ b/drivers/oprofile/oprofile_stats.h
50213@@ -13,11 +13,11 @@
50214 #include <linux/atomic.h>
50215
50216 struct oprofile_stat_struct {
50217- atomic_t sample_lost_no_mm;
50218- atomic_t sample_lost_no_mapping;
50219- atomic_t bt_lost_no_mapping;
50220- atomic_t event_lost_overflow;
50221- atomic_t multiplex_counter;
50222+ atomic_unchecked_t sample_lost_no_mm;
50223+ atomic_unchecked_t sample_lost_no_mapping;
50224+ atomic_unchecked_t bt_lost_no_mapping;
50225+ atomic_unchecked_t event_lost_overflow;
50226+ atomic_unchecked_t multiplex_counter;
50227 };
50228
50229 extern struct oprofile_stat_struct oprofile_stats;
50230diff --git a/drivers/oprofile/oprofilefs.c b/drivers/oprofile/oprofilefs.c
50231index 3f49345..c750d0b 100644
50232--- a/drivers/oprofile/oprofilefs.c
50233+++ b/drivers/oprofile/oprofilefs.c
50234@@ -176,8 +176,8 @@ int oprofilefs_create_ro_ulong(struct dentry *root,
50235
50236 static ssize_t atomic_read_file(struct file *file, char __user *buf, size_t count, loff_t *offset)
50237 {
50238- atomic_t *val = file->private_data;
50239- return oprofilefs_ulong_to_user(atomic_read(val), buf, count, offset);
50240+ atomic_unchecked_t *val = file->private_data;
50241+ return oprofilefs_ulong_to_user(atomic_read_unchecked(val), buf, count, offset);
50242 }
50243
50244
50245@@ -189,7 +189,7 @@ static const struct file_operations atomic_ro_fops = {
50246
50247
50248 int oprofilefs_create_ro_atomic(struct dentry *root,
50249- char const *name, atomic_t *val)
50250+ char const *name, atomic_unchecked_t *val)
50251 {
50252 return __oprofilefs_create_file(root, name,
50253 &atomic_ro_fops, 0444, val);
50254diff --git a/drivers/oprofile/timer_int.c b/drivers/oprofile/timer_int.c
50255index bdef916..88c7dee 100644
50256--- a/drivers/oprofile/timer_int.c
50257+++ b/drivers/oprofile/timer_int.c
50258@@ -93,7 +93,7 @@ static int oprofile_cpu_notify(struct notifier_block *self,
50259 return NOTIFY_OK;
50260 }
50261
50262-static struct notifier_block __refdata oprofile_cpu_notifier = {
50263+static struct notifier_block oprofile_cpu_notifier = {
50264 .notifier_call = oprofile_cpu_notify,
50265 };
50266
50267diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
50268index 3b47080..6cd05dd 100644
50269--- a/drivers/parport/procfs.c
50270+++ b/drivers/parport/procfs.c
50271@@ -64,7 +64,7 @@ static int do_active_device(struct ctl_table *table, int write,
50272
50273 *ppos += len;
50274
50275- return copy_to_user(result, buffer, len) ? -EFAULT : 0;
50276+ return (len > sizeof buffer || copy_to_user(result, buffer, len)) ? -EFAULT : 0;
50277 }
50278
50279 #ifdef CONFIG_PARPORT_1284
50280@@ -106,7 +106,7 @@ static int do_autoprobe(struct ctl_table *table, int write,
50281
50282 *ppos += len;
50283
50284- return copy_to_user (result, buffer, len) ? -EFAULT : 0;
50285+ return (len > sizeof buffer || copy_to_user (result, buffer, len)) ? -EFAULT : 0;
50286 }
50287 #endif /* IEEE1284.3 support. */
50288
50289diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
50290index ba46e58..90cfc24 100644
50291--- a/drivers/pci/host/pci-host-generic.c
50292+++ b/drivers/pci/host/pci-host-generic.c
50293@@ -26,9 +26,9 @@
50294 #include <linux/platform_device.h>
50295
50296 struct gen_pci_cfg_bus_ops {
50297+ struct pci_ops ops;
50298 u32 bus_shift;
50299- void __iomem *(*map_bus)(struct pci_bus *, unsigned int, int);
50300-};
50301+} __do_const;
50302
50303 struct gen_pci_cfg_windows {
50304 struct resource res;
50305@@ -56,8 +56,12 @@ static void __iomem *gen_pci_map_cfg_bus_cam(struct pci_bus *bus,
50306 }
50307
50308 static struct gen_pci_cfg_bus_ops gen_pci_cfg_cam_bus_ops = {
50309+ .ops = {
50310+ .map_bus = gen_pci_map_cfg_bus_cam,
50311+ .read = pci_generic_config_read,
50312+ .write = pci_generic_config_write,
50313+ },
50314 .bus_shift = 16,
50315- .map_bus = gen_pci_map_cfg_bus_cam,
50316 };
50317
50318 static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50319@@ -72,13 +76,12 @@ static void __iomem *gen_pci_map_cfg_bus_ecam(struct pci_bus *bus,
50320 }
50321
50322 static struct gen_pci_cfg_bus_ops gen_pci_cfg_ecam_bus_ops = {
50323+ .ops = {
50324+ .map_bus = gen_pci_map_cfg_bus_ecam,
50325+ .read = pci_generic_config_read,
50326+ .write = pci_generic_config_write,
50327+ },
50328 .bus_shift = 20,
50329- .map_bus = gen_pci_map_cfg_bus_ecam,
50330-};
50331-
50332-static struct pci_ops gen_pci_ops = {
50333- .read = pci_generic_config_read,
50334- .write = pci_generic_config_write,
50335 };
50336
50337 static const struct of_device_id gen_pci_of_match[] = {
50338@@ -219,7 +222,6 @@ static int gen_pci_probe(struct platform_device *pdev)
50339 .private_data = (void **)&pci,
50340 .setup = gen_pci_setup,
50341 .map_irq = of_irq_parse_and_map_pci,
50342- .ops = &gen_pci_ops,
50343 };
50344
50345 if (!pci)
50346@@ -241,7 +243,7 @@ static int gen_pci_probe(struct platform_device *pdev)
50347
50348 of_id = of_match_node(gen_pci_of_match, np);
50349 pci->cfg.ops = of_id->data;
50350- gen_pci_ops.map_bus = pci->cfg.ops->map_bus;
50351+ hw.ops = &pci->cfg.ops->ops;
50352 pci->host.dev.parent = dev;
50353 INIT_LIST_HEAD(&pci->host.windows);
50354 INIT_LIST_HEAD(&pci->resources);
50355diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c
50356index 6ca2399..68d866b 100644
50357--- a/drivers/pci/hotplug/acpiphp_ibm.c
50358+++ b/drivers/pci/hotplug/acpiphp_ibm.c
50359@@ -452,7 +452,9 @@ static int __init ibm_acpiphp_init(void)
50360 goto init_cleanup;
50361 }
50362
50363- ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50364+ pax_open_kernel();
50365+ *(size_t *)&ibm_apci_table_attr.size = ibm_get_table_from_acpi(NULL);
50366+ pax_close_kernel();
50367 retval = sysfs_create_bin_file(sysdir, &ibm_apci_table_attr);
50368
50369 return retval;
50370diff --git a/drivers/pci/hotplug/cpcihp_generic.c b/drivers/pci/hotplug/cpcihp_generic.c
50371index 66b7bbe..26bee78 100644
50372--- a/drivers/pci/hotplug/cpcihp_generic.c
50373+++ b/drivers/pci/hotplug/cpcihp_generic.c
50374@@ -73,7 +73,6 @@ static u16 port;
50375 static unsigned int enum_bit;
50376 static u8 enum_mask;
50377
50378-static struct cpci_hp_controller_ops generic_hpc_ops;
50379 static struct cpci_hp_controller generic_hpc;
50380
50381 static int __init validate_parameters(void)
50382@@ -139,6 +138,10 @@ static int query_enum(void)
50383 return ((value & enum_mask) == enum_mask);
50384 }
50385
50386+static struct cpci_hp_controller_ops generic_hpc_ops = {
50387+ .query_enum = query_enum,
50388+};
50389+
50390 static int __init cpcihp_generic_init(void)
50391 {
50392 int status;
50393@@ -165,7 +168,6 @@ static int __init cpcihp_generic_init(void)
50394 pci_dev_put(dev);
50395
50396 memset(&generic_hpc, 0, sizeof (struct cpci_hp_controller));
50397- generic_hpc_ops.query_enum = query_enum;
50398 generic_hpc.ops = &generic_hpc_ops;
50399
50400 status = cpci_hp_register_controller(&generic_hpc);
50401diff --git a/drivers/pci/hotplug/cpcihp_zt5550.c b/drivers/pci/hotplug/cpcihp_zt5550.c
50402index 7ecf34e..effed62 100644
50403--- a/drivers/pci/hotplug/cpcihp_zt5550.c
50404+++ b/drivers/pci/hotplug/cpcihp_zt5550.c
50405@@ -59,7 +59,6 @@
50406 /* local variables */
50407 static bool debug;
50408 static bool poll;
50409-static struct cpci_hp_controller_ops zt5550_hpc_ops;
50410 static struct cpci_hp_controller zt5550_hpc;
50411
50412 /* Primary cPCI bus bridge device */
50413@@ -204,6 +203,10 @@ static int zt5550_hc_disable_irq(void)
50414 return 0;
50415 }
50416
50417+static struct cpci_hp_controller_ops zt5550_hpc_ops = {
50418+ .query_enum = zt5550_hc_query_enum,
50419+};
50420+
50421 static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
50422 {
50423 int status;
50424@@ -215,16 +218,17 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id
50425 dbg("returned from zt5550_hc_config");
50426
50427 memset(&zt5550_hpc, 0, sizeof (struct cpci_hp_controller));
50428- zt5550_hpc_ops.query_enum = zt5550_hc_query_enum;
50429 zt5550_hpc.ops = &zt5550_hpc_ops;
50430 if (!poll) {
50431 zt5550_hpc.irq = hc_dev->irq;
50432 zt5550_hpc.irq_flags = IRQF_SHARED;
50433 zt5550_hpc.dev_id = hc_dev;
50434
50435- zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
50436- zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
50437- zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
50438+ pax_open_kernel();
50439+ *(void **)&zt5550_hpc_ops.enable_irq = zt5550_hc_enable_irq;
50440+ *(void **)&zt5550_hpc_ops.disable_irq = zt5550_hc_disable_irq;
50441+ *(void **)&zt5550_hpc_ops.check_irq = zt5550_hc_check_irq;
50442+ pax_open_kernel();
50443 } else {
50444 info("using ENUM# polling mode");
50445 }
50446diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
50447index 1e08ff8c..3cd145f 100644
50448--- a/drivers/pci/hotplug/cpqphp_nvram.c
50449+++ b/drivers/pci/hotplug/cpqphp_nvram.c
50450@@ -425,8 +425,10 @@ static u32 store_HRT (void __iomem *rom_start)
50451
50452 void compaq_nvram_init (void __iomem *rom_start)
50453 {
50454+#ifndef CONFIG_PAX_KERNEXEC
50455 if (rom_start)
50456 compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
50457+#endif
50458
50459 dbg("int15 entry = %p\n", compaq_int15_entry_point);
50460
50461diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c
50462index 56d8486..f26113f 100644
50463--- a/drivers/pci/hotplug/pci_hotplug_core.c
50464+++ b/drivers/pci/hotplug/pci_hotplug_core.c
50465@@ -436,8 +436,10 @@ int __pci_hp_register(struct hotplug_slot *slot, struct pci_bus *bus,
50466 return -EINVAL;
50467 }
50468
50469- slot->ops->owner = owner;
50470- slot->ops->mod_name = mod_name;
50471+ pax_open_kernel();
50472+ *(struct module **)&slot->ops->owner = owner;
50473+ *(const char **)&slot->ops->mod_name = mod_name;
50474+ pax_close_kernel();
50475
50476 mutex_lock(&pci_hp_mutex);
50477 /*
50478diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c
50479index 07aa722..84514b4 100644
50480--- a/drivers/pci/hotplug/pciehp_core.c
50481+++ b/drivers/pci/hotplug/pciehp_core.c
50482@@ -92,7 +92,7 @@ static int init_slot(struct controller *ctrl)
50483 struct slot *slot = ctrl->slot;
50484 struct hotplug_slot *hotplug = NULL;
50485 struct hotplug_slot_info *info = NULL;
50486- struct hotplug_slot_ops *ops = NULL;
50487+ hotplug_slot_ops_no_const *ops = NULL;
50488 char name[SLOT_NAME_SIZE];
50489 int retval = -ENOMEM;
50490
50491diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
50492index c3e7dfc..cbd9625 100644
50493--- a/drivers/pci/msi.c
50494+++ b/drivers/pci/msi.c
50495@@ -513,8 +513,8 @@ static int populate_msi_sysfs(struct pci_dev *pdev)
50496 {
50497 struct attribute **msi_attrs;
50498 struct attribute *msi_attr;
50499- struct device_attribute *msi_dev_attr;
50500- struct attribute_group *msi_irq_group;
50501+ device_attribute_no_const *msi_dev_attr;
50502+ attribute_group_no_const *msi_irq_group;
50503 const struct attribute_group **msi_irq_groups;
50504 struct msi_desc *entry;
50505 int ret = -ENOMEM;
50506@@ -573,7 +573,7 @@ error_attrs:
50507 count = 0;
50508 msi_attr = msi_attrs[count];
50509 while (msi_attr) {
50510- msi_dev_attr = container_of(msi_attr, struct device_attribute, attr);
50511+ msi_dev_attr = container_of(msi_attr, device_attribute_no_const, attr);
50512 kfree(msi_attr->name);
50513 kfree(msi_dev_attr);
50514 ++count;
50515diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
50516index 312f23a..d21181c 100644
50517--- a/drivers/pci/pci-sysfs.c
50518+++ b/drivers/pci/pci-sysfs.c
50519@@ -1140,7 +1140,7 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine)
50520 {
50521 /* allocate attribute structure, piggyback attribute name */
50522 int name_len = write_combine ? 13 : 10;
50523- struct bin_attribute *res_attr;
50524+ bin_attribute_no_const *res_attr;
50525 int retval;
50526
50527 res_attr = kzalloc(sizeof(*res_attr) + name_len, GFP_ATOMIC);
50528@@ -1317,7 +1317,7 @@ static struct device_attribute reset_attr = __ATTR(reset, 0200, NULL, reset_stor
50529 static int pci_create_capabilities_sysfs(struct pci_dev *dev)
50530 {
50531 int retval;
50532- struct bin_attribute *attr;
50533+ bin_attribute_no_const *attr;
50534
50535 /* If the device has VPD, try to expose it in sysfs. */
50536 if (dev->vpd) {
50537@@ -1364,7 +1364,7 @@ int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev)
50538 {
50539 int retval;
50540 int rom_size = 0;
50541- struct bin_attribute *attr;
50542+ bin_attribute_no_const *attr;
50543
50544 if (!sysfs_initialized)
50545 return -EACCES;
50546diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
50547index 4091f82..7d98eef 100644
50548--- a/drivers/pci/pci.h
50549+++ b/drivers/pci/pci.h
50550@@ -99,7 +99,7 @@ struct pci_vpd_ops {
50551 struct pci_vpd {
50552 unsigned int len;
50553 const struct pci_vpd_ops *ops;
50554- struct bin_attribute *attr; /* descriptor for sysfs VPD entry */
50555+ bin_attribute_no_const *attr; /* descriptor for sysfs VPD entry */
50556 };
50557
50558 int pci_vpd_pci22_init(struct pci_dev *dev);
50559diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
50560index 820740a..8b1c673 100644
50561--- a/drivers/pci/pcie/aspm.c
50562+++ b/drivers/pci/pcie/aspm.c
50563@@ -27,9 +27,9 @@
50564 #define MODULE_PARAM_PREFIX "pcie_aspm."
50565
50566 /* Note: those are not register definitions */
50567-#define ASPM_STATE_L0S_UP (1) /* Upstream direction L0s state */
50568-#define ASPM_STATE_L0S_DW (2) /* Downstream direction L0s state */
50569-#define ASPM_STATE_L1 (4) /* L1 state */
50570+#define ASPM_STATE_L0S_UP (1U) /* Upstream direction L0s state */
50571+#define ASPM_STATE_L0S_DW (2U) /* Downstream direction L0s state */
50572+#define ASPM_STATE_L1 (4U) /* L1 state */
50573 #define ASPM_STATE_L0S (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
50574 #define ASPM_STATE_ALL (ASPM_STATE_L0S | ASPM_STATE_L1)
50575
50576diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
50577index be35da2..ec16cdb 100644
50578--- a/drivers/pci/pcie/portdrv_pci.c
50579+++ b/drivers/pci/pcie/portdrv_pci.c
50580@@ -324,7 +324,7 @@ static int __init dmi_pcie_pme_disable_msi(const struct dmi_system_id *d)
50581 return 0;
50582 }
50583
50584-static struct dmi_system_id __initdata pcie_portdrv_dmi_table[] = {
50585+static const struct dmi_system_id __initconst pcie_portdrv_dmi_table[] = {
50586 /*
50587 * Boxes that should not use MSI for PCIe PME signaling.
50588 */
50589diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
50590index 8d2f400..c97cc91 100644
50591--- a/drivers/pci/probe.c
50592+++ b/drivers/pci/probe.c
50593@@ -175,7 +175,7 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
50594 u16 orig_cmd;
50595 struct pci_bus_region region, inverted_region;
50596
50597- mask = type ? PCI_ROM_ADDRESS_MASK : ~0;
50598+ mask = type ? (u32)PCI_ROM_ADDRESS_MASK : ~0;
50599
50600 /* No printks while decoding is disabled! */
50601 if (!dev->mmio_always_on) {
50602diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
50603index 3f155e7..0f4b1f0 100644
50604--- a/drivers/pci/proc.c
50605+++ b/drivers/pci/proc.c
50606@@ -434,7 +434,16 @@ static const struct file_operations proc_bus_pci_dev_operations = {
50607 static int __init pci_proc_init(void)
50608 {
50609 struct pci_dev *dev = NULL;
50610+
50611+#ifdef CONFIG_GRKERNSEC_PROC_ADD
50612+#ifdef CONFIG_GRKERNSEC_PROC_USER
50613+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR, NULL);
50614+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
50615+ proc_bus_pci_dir = proc_mkdir_mode("bus/pci", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
50616+#endif
50617+#else
50618 proc_bus_pci_dir = proc_mkdir("bus/pci", NULL);
50619+#endif
50620 proc_create("devices", 0, proc_bus_pci_dir,
50621 &proc_bus_pci_dev_operations);
50622 proc_initialized = 1;
50623diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c
50624index b84fdd6..b89d829 100644
50625--- a/drivers/platform/chrome/chromeos_laptop.c
50626+++ b/drivers/platform/chrome/chromeos_laptop.c
50627@@ -479,7 +479,7 @@ static struct chromeos_laptop cr48 = {
50628 .callback = chromeos_laptop_dmi_matched, \
50629 .driver_data = (void *)&board_
50630
50631-static struct dmi_system_id chromeos_laptop_dmi_table[] __initdata = {
50632+static struct dmi_system_id chromeos_laptop_dmi_table[] __initconst = {
50633 {
50634 .ident = "Samsung Series 5 550",
50635 .matches = {
50636diff --git a/drivers/platform/chrome/chromeos_pstore.c b/drivers/platform/chrome/chromeos_pstore.c
50637index 3474920..acc9581 100644
50638--- a/drivers/platform/chrome/chromeos_pstore.c
50639+++ b/drivers/platform/chrome/chromeos_pstore.c
50640@@ -13,7 +13,7 @@
50641 #include <linux/platform_device.h>
50642 #include <linux/pstore_ram.h>
50643
50644-static struct dmi_system_id chromeos_pstore_dmi_table[] __initdata = {
50645+static const struct dmi_system_id chromeos_pstore_dmi_table[] __initconst = {
50646 {
50647 /*
50648 * Today all Chromebooks/boxes ship with Google_* as version and
50649diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c
50650index 1e1e594..8fe59c5 100644
50651--- a/drivers/platform/x86/alienware-wmi.c
50652+++ b/drivers/platform/x86/alienware-wmi.c
50653@@ -150,7 +150,7 @@ struct wmax_led_args {
50654 } __packed;
50655
50656 static struct platform_device *platform_device;
50657-static struct device_attribute *zone_dev_attrs;
50658+static device_attribute_no_const *zone_dev_attrs;
50659 static struct attribute **zone_attrs;
50660 static struct platform_zone *zone_data;
50661
50662@@ -160,7 +160,7 @@ static struct platform_driver platform_driver = {
50663 }
50664 };
50665
50666-static struct attribute_group zone_attribute_group = {
50667+static attribute_group_no_const zone_attribute_group = {
50668 .name = "rgb_zones",
50669 };
50670
50671diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c
50672index 7543a56..367ca8ed 100644
50673--- a/drivers/platform/x86/asus-wmi.c
50674+++ b/drivers/platform/x86/asus-wmi.c
50675@@ -1589,6 +1589,10 @@ static int show_dsts(struct seq_file *m, void *data)
50676 int err;
50677 u32 retval = -1;
50678
50679+#ifdef CONFIG_GRKERNSEC_KMEM
50680+ return -EPERM;
50681+#endif
50682+
50683 err = asus_wmi_get_devstate(asus, asus->debug.dev_id, &retval);
50684
50685 if (err < 0)
50686@@ -1605,6 +1609,10 @@ static int show_devs(struct seq_file *m, void *data)
50687 int err;
50688 u32 retval = -1;
50689
50690+#ifdef CONFIG_GRKERNSEC_KMEM
50691+ return -EPERM;
50692+#endif
50693+
50694 err = asus_wmi_set_devstate(asus->debug.dev_id, asus->debug.ctrl_param,
50695 &retval);
50696
50697@@ -1629,6 +1637,10 @@ static int show_call(struct seq_file *m, void *data)
50698 union acpi_object *obj;
50699 acpi_status status;
50700
50701+#ifdef CONFIG_GRKERNSEC_KMEM
50702+ return -EPERM;
50703+#endif
50704+
50705 status = wmi_evaluate_method(ASUS_WMI_MGMT_GUID,
50706 1, asus->debug.method_id,
50707 &input, &output);
50708diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
50709index bceb30b..bf063d4 100644
50710--- a/drivers/platform/x86/compal-laptop.c
50711+++ b/drivers/platform/x86/compal-laptop.c
50712@@ -766,7 +766,7 @@ static int dmi_check_cb_extra(const struct dmi_system_id *id)
50713 return 1;
50714 }
50715
50716-static struct dmi_system_id __initdata compal_dmi_table[] = {
50717+static const struct dmi_system_id __initconst compal_dmi_table[] = {
50718 {
50719 .ident = "FL90/IFL90",
50720 .matches = {
50721diff --git a/drivers/platform/x86/hdaps.c b/drivers/platform/x86/hdaps.c
50722index 458e6c9..089aee7 100644
50723--- a/drivers/platform/x86/hdaps.c
50724+++ b/drivers/platform/x86/hdaps.c
50725@@ -514,7 +514,7 @@ static int __init hdaps_dmi_match_invert(const struct dmi_system_id *id)
50726 "ThinkPad T42p", so the order of the entries matters.
50727 If your ThinkPad is not recognized, please update to latest
50728 BIOS. This is especially the case for some R52 ThinkPads. */
50729-static struct dmi_system_id __initdata hdaps_whitelist[] = {
50730+static const struct dmi_system_id __initconst hdaps_whitelist[] = {
50731 HDAPS_DMI_MATCH_INVERT("IBM", "ThinkPad R50p", HDAPS_BOTH_AXES),
50732 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R50"),
50733 HDAPS_DMI_MATCH_NORMAL("IBM", "ThinkPad R51"),
50734diff --git a/drivers/platform/x86/ibm_rtl.c b/drivers/platform/x86/ibm_rtl.c
50735index 97c2be1..2ee50ce 100644
50736--- a/drivers/platform/x86/ibm_rtl.c
50737+++ b/drivers/platform/x86/ibm_rtl.c
50738@@ -227,7 +227,7 @@ static void rtl_teardown_sysfs(void) {
50739 }
50740
50741
50742-static struct dmi_system_id __initdata ibm_rtl_dmi_table[] = {
50743+static const struct dmi_system_id __initconst ibm_rtl_dmi_table[] = {
50744 { \
50745 .matches = { \
50746 DMI_MATCH(DMI_SYS_VENDOR, "IBM"), \
50747diff --git a/drivers/platform/x86/intel_oaktrail.c b/drivers/platform/x86/intel_oaktrail.c
50748index a4a4258..a58a04c 100644
50749--- a/drivers/platform/x86/intel_oaktrail.c
50750+++ b/drivers/platform/x86/intel_oaktrail.c
50751@@ -298,7 +298,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
50752 return 0;
50753 }
50754
50755-static struct dmi_system_id __initdata oaktrail_dmi_table[] = {
50756+static const struct dmi_system_id __initconst oaktrail_dmi_table[] = {
50757 {
50758 .ident = "OakTrail platform",
50759 .matches = {
50760diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
50761index 0859877..59d596d 100644
50762--- a/drivers/platform/x86/msi-laptop.c
50763+++ b/drivers/platform/x86/msi-laptop.c
50764@@ -604,7 +604,7 @@ static int dmi_check_cb(const struct dmi_system_id *dmi)
50765 return 1;
50766 }
50767
50768-static struct dmi_system_id __initdata msi_dmi_table[] = {
50769+static const struct dmi_system_id __initconst msi_dmi_table[] = {
50770 {
50771 .ident = "MSI S270",
50772 .matches = {
50773@@ -999,12 +999,14 @@ static int __init load_scm_model_init(struct platform_device *sdev)
50774
50775 if (!quirks->ec_read_only) {
50776 /* allow userland write sysfs file */
50777- dev_attr_bluetooth.store = store_bluetooth;
50778- dev_attr_wlan.store = store_wlan;
50779- dev_attr_threeg.store = store_threeg;
50780- dev_attr_bluetooth.attr.mode |= S_IWUSR;
50781- dev_attr_wlan.attr.mode |= S_IWUSR;
50782- dev_attr_threeg.attr.mode |= S_IWUSR;
50783+ pax_open_kernel();
50784+ *(void **)&dev_attr_bluetooth.store = store_bluetooth;
50785+ *(void **)&dev_attr_wlan.store = store_wlan;
50786+ *(void **)&dev_attr_threeg.store = store_threeg;
50787+ *(umode_t *)&dev_attr_bluetooth.attr.mode |= S_IWUSR;
50788+ *(umode_t *)&dev_attr_wlan.attr.mode |= S_IWUSR;
50789+ *(umode_t *)&dev_attr_threeg.attr.mode |= S_IWUSR;
50790+ pax_close_kernel();
50791 }
50792
50793 /* disable hardware control by fn key */
50794diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c
50795index 6d2bac0..ec2b029 100644
50796--- a/drivers/platform/x86/msi-wmi.c
50797+++ b/drivers/platform/x86/msi-wmi.c
50798@@ -183,7 +183,7 @@ static const struct backlight_ops msi_backlight_ops = {
50799 static void msi_wmi_notify(u32 value, void *context)
50800 {
50801 struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
50802- static struct key_entry *key;
50803+ struct key_entry *key;
50804 union acpi_object *obj;
50805 acpi_status status;
50806
50807diff --git a/drivers/platform/x86/samsung-laptop.c b/drivers/platform/x86/samsung-laptop.c
50808index 9e701b2..c68a7b5 100644
50809--- a/drivers/platform/x86/samsung-laptop.c
50810+++ b/drivers/platform/x86/samsung-laptop.c
50811@@ -1567,7 +1567,7 @@ static int __init samsung_dmi_matched(const struct dmi_system_id *d)
50812 return 0;
50813 }
50814
50815-static struct dmi_system_id __initdata samsung_dmi_table[] = {
50816+static const struct dmi_system_id __initconst samsung_dmi_table[] = {
50817 {
50818 .matches = {
50819 DMI_MATCH(DMI_SYS_VENDOR,
50820diff --git a/drivers/platform/x86/samsung-q10.c b/drivers/platform/x86/samsung-q10.c
50821index e6aac72..e11ff24 100644
50822--- a/drivers/platform/x86/samsung-q10.c
50823+++ b/drivers/platform/x86/samsung-q10.c
50824@@ -95,7 +95,7 @@ static int __init dmi_check_callback(const struct dmi_system_id *id)
50825 return 1;
50826 }
50827
50828-static struct dmi_system_id __initdata samsungq10_dmi_table[] = {
50829+static const struct dmi_system_id __initconst samsungq10_dmi_table[] = {
50830 {
50831 .ident = "Samsung Q10",
50832 .matches = {
50833diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c
50834index e51c1e7..71bb385 100644
50835--- a/drivers/platform/x86/sony-laptop.c
50836+++ b/drivers/platform/x86/sony-laptop.c
50837@@ -2526,7 +2526,7 @@ static void sony_nc_gfx_switch_cleanup(struct platform_device *pd)
50838 }
50839
50840 /* High speed charging function */
50841-static struct device_attribute *hsc_handle;
50842+static device_attribute_no_const *hsc_handle;
50843
50844 static ssize_t sony_nc_highspeed_charging_store(struct device *dev,
50845 struct device_attribute *attr,
50846@@ -2600,7 +2600,7 @@ static void sony_nc_highspeed_charging_cleanup(struct platform_device *pd)
50847 }
50848
50849 /* low battery function */
50850-static struct device_attribute *lowbatt_handle;
50851+static device_attribute_no_const *lowbatt_handle;
50852
50853 static ssize_t sony_nc_lowbatt_store(struct device *dev,
50854 struct device_attribute *attr,
50855@@ -2666,7 +2666,7 @@ static void sony_nc_lowbatt_cleanup(struct platform_device *pd)
50856 }
50857
50858 /* fan speed function */
50859-static struct device_attribute *fan_handle, *hsf_handle;
50860+static device_attribute_no_const *fan_handle, *hsf_handle;
50861
50862 static ssize_t sony_nc_hsfan_store(struct device *dev,
50863 struct device_attribute *attr,
50864@@ -2773,7 +2773,7 @@ static void sony_nc_fanspeed_cleanup(struct platform_device *pd)
50865 }
50866
50867 /* USB charge function */
50868-static struct device_attribute *uc_handle;
50869+static device_attribute_no_const *uc_handle;
50870
50871 static ssize_t sony_nc_usb_charge_store(struct device *dev,
50872 struct device_attribute *attr,
50873@@ -2847,7 +2847,7 @@ static void sony_nc_usb_charge_cleanup(struct platform_device *pd)
50874 }
50875
50876 /* Panel ID function */
50877-static struct device_attribute *panel_handle;
50878+static device_attribute_no_const *panel_handle;
50879
50880 static ssize_t sony_nc_panelid_show(struct device *dev,
50881 struct device_attribute *attr, char *buffer)
50882@@ -2894,7 +2894,7 @@ static void sony_nc_panelid_cleanup(struct platform_device *pd)
50883 }
50884
50885 /* smart connect function */
50886-static struct device_attribute *sc_handle;
50887+static device_attribute_no_const *sc_handle;
50888
50889 static ssize_t sony_nc_smart_conn_store(struct device *dev,
50890 struct device_attribute *attr,
50891@@ -4854,7 +4854,7 @@ static struct acpi_driver sony_pic_driver = {
50892 .drv.pm = &sony_pic_pm,
50893 };
50894
50895-static struct dmi_system_id __initdata sonypi_dmi_table[] = {
50896+static const struct dmi_system_id __initconst sonypi_dmi_table[] = {
50897 {
50898 .ident = "Sony Vaio",
50899 .matches = {
50900diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c
50901index 3b8ceee..e18652c 100644
50902--- a/drivers/platform/x86/thinkpad_acpi.c
50903+++ b/drivers/platform/x86/thinkpad_acpi.c
50904@@ -2093,7 +2093,7 @@ static int hotkey_mask_get(void)
50905 return 0;
50906 }
50907
50908-void static hotkey_mask_warn_incomplete_mask(void)
50909+static void hotkey_mask_warn_incomplete_mask(void)
50910 {
50911 /* log only what the user can fix... */
50912 const u32 wantedmask = hotkey_driver_mask &
50913@@ -2437,10 +2437,10 @@ static void hotkey_compare_and_issue_event(struct tp_nvram_state *oldn,
50914 && !tp_features.bright_unkfw)
50915 TPACPI_MAY_SEND_KEY(TP_ACPI_HOTKEYSCAN_FNHOME);
50916 }
50917+}
50918
50919 #undef TPACPI_COMPARE_KEY
50920 #undef TPACPI_MAY_SEND_KEY
50921-}
50922
50923 /*
50924 * Polling driver
50925diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c
50926index 438d4c7..ca8a2fb 100644
50927--- a/drivers/pnp/pnpbios/bioscalls.c
50928+++ b/drivers/pnp/pnpbios/bioscalls.c
50929@@ -59,7 +59,7 @@ do { \
50930 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
50931 } while(0)
50932
50933-static struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4092,
50934+static const struct desc_struct bad_bios_desc = GDT_ENTRY_INIT(0x4093,
50935 (unsigned long)__va(0x400UL), PAGE_SIZE - 0x400 - 1);
50936
50937 /*
50938@@ -96,7 +96,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50939
50940 cpu = get_cpu();
50941 save_desc_40 = get_cpu_gdt_table(cpu)[0x40 / 8];
50942+
50943+ pax_open_kernel();
50944 get_cpu_gdt_table(cpu)[0x40 / 8] = bad_bios_desc;
50945+ pax_close_kernel();
50946
50947 /* On some boxes IRQ's during PnP BIOS calls are deadly. */
50948 spin_lock_irqsave(&pnp_bios_lock, flags);
50949@@ -134,7 +137,10 @@ static inline u16 call_pnp_bios(u16 func, u16 arg1, u16 arg2, u16 arg3,
50950 :"memory");
50951 spin_unlock_irqrestore(&pnp_bios_lock, flags);
50952
50953+ pax_open_kernel();
50954 get_cpu_gdt_table(cpu)[0x40 / 8] = save_desc_40;
50955+ pax_close_kernel();
50956+
50957 put_cpu();
50958
50959 /* If we get here and this is set then the PnP BIOS faulted on us. */
50960@@ -468,7 +474,7 @@ int pnp_bios_read_escd(char *data, u32 nvram_base)
50961 return status;
50962 }
50963
50964-void pnpbios_calls_init(union pnp_bios_install_struct *header)
50965+void __init pnpbios_calls_init(union pnp_bios_install_struct *header)
50966 {
50967 int i;
50968
50969@@ -476,6 +482,8 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50970 pnp_bios_callpoint.offset = header->fields.pm16offset;
50971 pnp_bios_callpoint.segment = PNP_CS16;
50972
50973+ pax_open_kernel();
50974+
50975 for_each_possible_cpu(i) {
50976 struct desc_struct *gdt = get_cpu_gdt_table(i);
50977 if (!gdt)
50978@@ -487,4 +495,6 @@ void pnpbios_calls_init(union pnp_bios_install_struct *header)
50979 set_desc_base(&gdt[GDT_ENTRY_PNPBIOS_DS],
50980 (unsigned long)__va(header->fields.pm16dseg));
50981 }
50982+
50983+ pax_close_kernel();
50984 }
50985diff --git a/drivers/pnp/pnpbios/core.c b/drivers/pnp/pnpbios/core.c
50986index facd43b..b291260 100644
50987--- a/drivers/pnp/pnpbios/core.c
50988+++ b/drivers/pnp/pnpbios/core.c
50989@@ -494,7 +494,7 @@ static int __init exploding_pnp_bios(const struct dmi_system_id *d)
50990 return 0;
50991 }
50992
50993-static struct dmi_system_id pnpbios_dmi_table[] __initdata = {
50994+static const struct dmi_system_id pnpbios_dmi_table[] __initconst = {
50995 { /* PnPBIOS GPF on boot */
50996 .callback = exploding_pnp_bios,
50997 .ident = "Higraded P14H",
50998diff --git a/drivers/power/pda_power.c b/drivers/power/pda_power.c
50999index 0c52e2a..3421ab7 100644
51000--- a/drivers/power/pda_power.c
51001+++ b/drivers/power/pda_power.c
51002@@ -37,7 +37,11 @@ static int polling;
51003
51004 #if IS_ENABLED(CONFIG_USB_PHY)
51005 static struct usb_phy *transceiver;
51006-static struct notifier_block otg_nb;
51007+static int otg_handle_notification(struct notifier_block *nb,
51008+ unsigned long event, void *unused);
51009+static struct notifier_block otg_nb = {
51010+ .notifier_call = otg_handle_notification
51011+};
51012 #endif
51013
51014 static struct regulator *ac_draw;
51015@@ -369,7 +373,6 @@ static int pda_power_probe(struct platform_device *pdev)
51016
51017 #if IS_ENABLED(CONFIG_USB_PHY)
51018 if (!IS_ERR_OR_NULL(transceiver) && pdata->use_otg_notifier) {
51019- otg_nb.notifier_call = otg_handle_notification;
51020 ret = usb_register_notifier(transceiver, &otg_nb);
51021 if (ret) {
51022 dev_err(dev, "failure to register otg notifier\n");
51023diff --git a/drivers/power/power_supply.h b/drivers/power/power_supply.h
51024index cc439fd..8fa30df 100644
51025--- a/drivers/power/power_supply.h
51026+++ b/drivers/power/power_supply.h
51027@@ -16,12 +16,12 @@ struct power_supply;
51028
51029 #ifdef CONFIG_SYSFS
51030
51031-extern void power_supply_init_attrs(struct device_type *dev_type);
51032+extern void power_supply_init_attrs(void);
51033 extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env);
51034
51035 #else
51036
51037-static inline void power_supply_init_attrs(struct device_type *dev_type) {}
51038+static inline void power_supply_init_attrs(void) {}
51039 #define power_supply_uevent NULL
51040
51041 #endif /* CONFIG_SYSFS */
51042diff --git a/drivers/power/power_supply_core.c b/drivers/power/power_supply_core.c
51043index 694e8cd..9f03483 100644
51044--- a/drivers/power/power_supply_core.c
51045+++ b/drivers/power/power_supply_core.c
51046@@ -28,7 +28,10 @@ EXPORT_SYMBOL_GPL(power_supply_class);
51047 ATOMIC_NOTIFIER_HEAD(power_supply_notifier);
51048 EXPORT_SYMBOL_GPL(power_supply_notifier);
51049
51050-static struct device_type power_supply_dev_type;
51051+extern const struct attribute_group *power_supply_attr_groups[];
51052+static struct device_type power_supply_dev_type = {
51053+ .groups = power_supply_attr_groups,
51054+};
51055
51056 static bool __power_supply_is_supplied_by(struct power_supply *supplier,
51057 struct power_supply *supply)
51058@@ -637,7 +640,7 @@ static int __init power_supply_class_init(void)
51059 return PTR_ERR(power_supply_class);
51060
51061 power_supply_class->dev_uevent = power_supply_uevent;
51062- power_supply_init_attrs(&power_supply_dev_type);
51063+ power_supply_init_attrs();
51064
51065 return 0;
51066 }
51067diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c
51068index 62653f5..d0bb485 100644
51069--- a/drivers/power/power_supply_sysfs.c
51070+++ b/drivers/power/power_supply_sysfs.c
51071@@ -238,17 +238,15 @@ static struct attribute_group power_supply_attr_group = {
51072 .is_visible = power_supply_attr_is_visible,
51073 };
51074
51075-static const struct attribute_group *power_supply_attr_groups[] = {
51076+const struct attribute_group *power_supply_attr_groups[] = {
51077 &power_supply_attr_group,
51078 NULL,
51079 };
51080
51081-void power_supply_init_attrs(struct device_type *dev_type)
51082+void power_supply_init_attrs(void)
51083 {
51084 int i;
51085
51086- dev_type->groups = power_supply_attr_groups;
51087-
51088 for (i = 0; i < ARRAY_SIZE(power_supply_attrs); i++)
51089 __power_supply_attrs[i] = &power_supply_attrs[i].attr;
51090 }
51091diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c
51092index 84419af..268ede8 100644
51093--- a/drivers/powercap/powercap_sys.c
51094+++ b/drivers/powercap/powercap_sys.c
51095@@ -154,8 +154,77 @@ struct powercap_constraint_attr {
51096 struct device_attribute name_attr;
51097 };
51098
51099+static ssize_t show_constraint_name(struct device *dev,
51100+ struct device_attribute *dev_attr,
51101+ char *buf);
51102+
51103 static struct powercap_constraint_attr
51104- constraint_attrs[MAX_CONSTRAINTS_PER_ZONE];
51105+ constraint_attrs[MAX_CONSTRAINTS_PER_ZONE] = {
51106+ [0 ... MAX_CONSTRAINTS_PER_ZONE - 1] = {
51107+ .power_limit_attr = {
51108+ .attr = {
51109+ .name = NULL,
51110+ .mode = S_IWUSR | S_IRUGO
51111+ },
51112+ .show = show_constraint_power_limit_uw,
51113+ .store = store_constraint_power_limit_uw
51114+ },
51115+
51116+ .time_window_attr = {
51117+ .attr = {
51118+ .name = NULL,
51119+ .mode = S_IWUSR | S_IRUGO
51120+ },
51121+ .show = show_constraint_time_window_us,
51122+ .store = store_constraint_time_window_us
51123+ },
51124+
51125+ .max_power_attr = {
51126+ .attr = {
51127+ .name = NULL,
51128+ .mode = S_IRUGO
51129+ },
51130+ .show = show_constraint_max_power_uw,
51131+ .store = NULL
51132+ },
51133+
51134+ .min_power_attr = {
51135+ .attr = {
51136+ .name = NULL,
51137+ .mode = S_IRUGO
51138+ },
51139+ .show = show_constraint_min_power_uw,
51140+ .store = NULL
51141+ },
51142+
51143+ .max_time_window_attr = {
51144+ .attr = {
51145+ .name = NULL,
51146+ .mode = S_IRUGO
51147+ },
51148+ .show = show_constraint_max_time_window_us,
51149+ .store = NULL
51150+ },
51151+
51152+ .min_time_window_attr = {
51153+ .attr = {
51154+ .name = NULL,
51155+ .mode = S_IRUGO
51156+ },
51157+ .show = show_constraint_min_time_window_us,
51158+ .store = NULL
51159+ },
51160+
51161+ .name_attr = {
51162+ .attr = {
51163+ .name = NULL,
51164+ .mode = S_IRUGO
51165+ },
51166+ .show = show_constraint_name,
51167+ .store = NULL
51168+ }
51169+ }
51170+};
51171
51172 /* A list of powercap control_types */
51173 static LIST_HEAD(powercap_cntrl_list);
51174@@ -193,23 +262,16 @@ static ssize_t show_constraint_name(struct device *dev,
51175 }
51176
51177 static int create_constraint_attribute(int id, const char *name,
51178- int mode,
51179- struct device_attribute *dev_attr,
51180- ssize_t (*show)(struct device *,
51181- struct device_attribute *, char *),
51182- ssize_t (*store)(struct device *,
51183- struct device_attribute *,
51184- const char *, size_t)
51185- )
51186+ struct device_attribute *dev_attr)
51187 {
51188+ name = kasprintf(GFP_KERNEL, "constraint_%d_%s", id, name);
51189
51190- dev_attr->attr.name = kasprintf(GFP_KERNEL, "constraint_%d_%s",
51191- id, name);
51192- if (!dev_attr->attr.name)
51193+ if (!name)
51194 return -ENOMEM;
51195- dev_attr->attr.mode = mode;
51196- dev_attr->show = show;
51197- dev_attr->store = store;
51198+
51199+ pax_open_kernel();
51200+ *(const char **)&dev_attr->attr.name = name;
51201+ pax_close_kernel();
51202
51203 return 0;
51204 }
51205@@ -236,49 +298,31 @@ static int seed_constraint_attributes(void)
51206
51207 for (i = 0; i < MAX_CONSTRAINTS_PER_ZONE; ++i) {
51208 ret = create_constraint_attribute(i, "power_limit_uw",
51209- S_IWUSR | S_IRUGO,
51210- &constraint_attrs[i].power_limit_attr,
51211- show_constraint_power_limit_uw,
51212- store_constraint_power_limit_uw);
51213+ &constraint_attrs[i].power_limit_attr);
51214 if (ret)
51215 goto err_alloc;
51216 ret = create_constraint_attribute(i, "time_window_us",
51217- S_IWUSR | S_IRUGO,
51218- &constraint_attrs[i].time_window_attr,
51219- show_constraint_time_window_us,
51220- store_constraint_time_window_us);
51221+ &constraint_attrs[i].time_window_attr);
51222 if (ret)
51223 goto err_alloc;
51224- ret = create_constraint_attribute(i, "name", S_IRUGO,
51225- &constraint_attrs[i].name_attr,
51226- show_constraint_name,
51227- NULL);
51228+ ret = create_constraint_attribute(i, "name",
51229+ &constraint_attrs[i].name_attr);
51230 if (ret)
51231 goto err_alloc;
51232- ret = create_constraint_attribute(i, "max_power_uw", S_IRUGO,
51233- &constraint_attrs[i].max_power_attr,
51234- show_constraint_max_power_uw,
51235- NULL);
51236+ ret = create_constraint_attribute(i, "max_power_uw",
51237+ &constraint_attrs[i].max_power_attr);
51238 if (ret)
51239 goto err_alloc;
51240- ret = create_constraint_attribute(i, "min_power_uw", S_IRUGO,
51241- &constraint_attrs[i].min_power_attr,
51242- show_constraint_min_power_uw,
51243- NULL);
51244+ ret = create_constraint_attribute(i, "min_power_uw",
51245+ &constraint_attrs[i].min_power_attr);
51246 if (ret)
51247 goto err_alloc;
51248 ret = create_constraint_attribute(i, "max_time_window_us",
51249- S_IRUGO,
51250- &constraint_attrs[i].max_time_window_attr,
51251- show_constraint_max_time_window_us,
51252- NULL);
51253+ &constraint_attrs[i].max_time_window_attr);
51254 if (ret)
51255 goto err_alloc;
51256 ret = create_constraint_attribute(i, "min_time_window_us",
51257- S_IRUGO,
51258- &constraint_attrs[i].min_time_window_attr,
51259- show_constraint_min_time_window_us,
51260- NULL);
51261+ &constraint_attrs[i].min_time_window_attr);
51262 if (ret)
51263 goto err_alloc;
51264
51265@@ -378,10 +422,12 @@ static void create_power_zone_common_attributes(
51266 power_zone->zone_dev_attrs[count++] =
51267 &dev_attr_max_energy_range_uj.attr;
51268 if (power_zone->ops->get_energy_uj) {
51269+ pax_open_kernel();
51270 if (power_zone->ops->reset_energy_uj)
51271- dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51272+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IWUSR | S_IRUGO;
51273 else
51274- dev_attr_energy_uj.attr.mode = S_IRUGO;
51275+ *(umode_t *)&dev_attr_energy_uj.attr.mode = S_IRUGO;
51276+ pax_close_kernel();
51277 power_zone->zone_dev_attrs[count++] =
51278 &dev_attr_energy_uj.attr;
51279 }
51280diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
51281index 9c5d414..c7900ce 100644
51282--- a/drivers/ptp/ptp_private.h
51283+++ b/drivers/ptp/ptp_private.h
51284@@ -51,7 +51,7 @@ struct ptp_clock {
51285 struct mutex pincfg_mux; /* protect concurrent info->pin_config access */
51286 wait_queue_head_t tsev_wq;
51287 int defunct; /* tells readers to go away when clock is being removed */
51288- struct device_attribute *pin_dev_attr;
51289+ device_attribute_no_const *pin_dev_attr;
51290 struct attribute **pin_attr;
51291 struct attribute_group pin_attr_group;
51292 };
51293diff --git a/drivers/ptp/ptp_sysfs.c b/drivers/ptp/ptp_sysfs.c
51294index 302e626..12579af 100644
51295--- a/drivers/ptp/ptp_sysfs.c
51296+++ b/drivers/ptp/ptp_sysfs.c
51297@@ -280,7 +280,7 @@ static int ptp_populate_pins(struct ptp_clock *ptp)
51298 goto no_pin_attr;
51299
51300 for (i = 0; i < n_pins; i++) {
51301- struct device_attribute *da = &ptp->pin_dev_attr[i];
51302+ device_attribute_no_const *da = &ptp->pin_dev_attr[i];
51303 sysfs_attr_init(&da->attr);
51304 da->attr.name = info->pin_config[i].name;
51305 da->attr.mode = 0644;
51306diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
51307index a4a8a6d..a3456f4 100644
51308--- a/drivers/regulator/core.c
51309+++ b/drivers/regulator/core.c
51310@@ -3529,7 +3529,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51311 const struct regulation_constraints *constraints = NULL;
51312 const struct regulator_init_data *init_data;
51313 struct regulator_config *config = NULL;
51314- static atomic_t regulator_no = ATOMIC_INIT(-1);
51315+ static atomic_unchecked_t regulator_no = ATOMIC_INIT(-1);
51316 struct regulator_dev *rdev;
51317 struct device *dev;
51318 int ret, i;
51319@@ -3613,7 +3613,7 @@ regulator_register(const struct regulator_desc *regulator_desc,
51320 rdev->dev.class = &regulator_class;
51321 rdev->dev.parent = dev;
51322 dev_set_name(&rdev->dev, "regulator.%lu",
51323- (unsigned long) atomic_inc_return(&regulator_no));
51324+ (unsigned long) atomic_inc_return_unchecked(&regulator_no));
51325 ret = device_register(&rdev->dev);
51326 if (ret != 0) {
51327 put_device(&rdev->dev);
51328diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c
51329index 7eee2ca..4024513 100644
51330--- a/drivers/regulator/max8660.c
51331+++ b/drivers/regulator/max8660.c
51332@@ -424,8 +424,10 @@ static int max8660_probe(struct i2c_client *client,
51333 max8660->shadow_regs[MAX8660_OVER1] = 5;
51334 } else {
51335 /* Otherwise devices can be toggled via software */
51336- max8660_dcdc_ops.enable = max8660_dcdc_enable;
51337- max8660_dcdc_ops.disable = max8660_dcdc_disable;
51338+ pax_open_kernel();
51339+ *(void **)&max8660_dcdc_ops.enable = max8660_dcdc_enable;
51340+ *(void **)&max8660_dcdc_ops.disable = max8660_dcdc_disable;
51341+ pax_close_kernel();
51342 }
51343
51344 /*
51345diff --git a/drivers/regulator/max8973-regulator.c b/drivers/regulator/max8973-regulator.c
51346index c3d55c2..0dddfe6 100644
51347--- a/drivers/regulator/max8973-regulator.c
51348+++ b/drivers/regulator/max8973-regulator.c
51349@@ -403,9 +403,11 @@ static int max8973_probe(struct i2c_client *client,
51350 if (!pdata || !pdata->enable_ext_control) {
51351 max->desc.enable_reg = MAX8973_VOUT;
51352 max->desc.enable_mask = MAX8973_VOUT_ENABLE;
51353- max->ops.enable = regulator_enable_regmap;
51354- max->ops.disable = regulator_disable_regmap;
51355- max->ops.is_enabled = regulator_is_enabled_regmap;
51356+ pax_open_kernel();
51357+ *(void **)&max->ops.enable = regulator_enable_regmap;
51358+ *(void **)&max->ops.disable = regulator_disable_regmap;
51359+ *(void **)&max->ops.is_enabled = regulator_is_enabled_regmap;
51360+ pax_close_kernel();
51361 }
51362
51363 if (pdata) {
51364diff --git a/drivers/regulator/mc13892-regulator.c b/drivers/regulator/mc13892-regulator.c
51365index 0d17c92..a29f627 100644
51366--- a/drivers/regulator/mc13892-regulator.c
51367+++ b/drivers/regulator/mc13892-regulator.c
51368@@ -584,10 +584,12 @@ static int mc13892_regulator_probe(struct platform_device *pdev)
51369 mc13xxx_unlock(mc13892);
51370
51371 /* update mc13892_vcam ops */
51372- memcpy(&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51373+ pax_open_kernel();
51374+ memcpy((void *)&mc13892_vcam_ops, mc13892_regulators[MC13892_VCAM].desc.ops,
51375 sizeof(struct regulator_ops));
51376- mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51377- mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51378+ *(void **)&mc13892_vcam_ops.set_mode = mc13892_vcam_set_mode,
51379+ *(void **)&mc13892_vcam_ops.get_mode = mc13892_vcam_get_mode,
51380+ pax_close_kernel();
51381 mc13892_regulators[MC13892_VCAM].desc.ops = &mc13892_vcam_ops;
51382
51383 mc13xxx_data = mc13xxx_parse_regulators_dt(pdev, mc13892_regulators,
51384diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
51385index 5b2e761..c8c8a4a 100644
51386--- a/drivers/rtc/rtc-cmos.c
51387+++ b/drivers/rtc/rtc-cmos.c
51388@@ -789,7 +789,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
51389 hpet_rtc_timer_init();
51390
51391 /* export at least the first block of NVRAM */
51392- nvram.size = address_space - NVRAM_OFFSET;
51393+ pax_open_kernel();
51394+ *(size_t *)&nvram.size = address_space - NVRAM_OFFSET;
51395+ pax_close_kernel();
51396 retval = sysfs_create_bin_file(&dev->kobj, &nvram);
51397 if (retval < 0) {
51398 dev_dbg(dev, "can't create nvram file? %d\n", retval);
51399diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
51400index 799c34b..8e9786a 100644
51401--- a/drivers/rtc/rtc-dev.c
51402+++ b/drivers/rtc/rtc-dev.c
51403@@ -16,6 +16,7 @@
51404 #include <linux/module.h>
51405 #include <linux/rtc.h>
51406 #include <linux/sched.h>
51407+#include <linux/grsecurity.h>
51408 #include "rtc-core.h"
51409
51410 static dev_t rtc_devt;
51411@@ -347,6 +348,8 @@ static long rtc_dev_ioctl(struct file *file,
51412 if (copy_from_user(&tm, uarg, sizeof(tm)))
51413 return -EFAULT;
51414
51415+ gr_log_timechange();
51416+
51417 return rtc_set_time(rtc, &tm);
51418
51419 case RTC_PIE_ON:
51420diff --git a/drivers/rtc/rtc-ds1307.c b/drivers/rtc/rtc-ds1307.c
51421index 4ffabb3..1f87fca 100644
51422--- a/drivers/rtc/rtc-ds1307.c
51423+++ b/drivers/rtc/rtc-ds1307.c
51424@@ -107,7 +107,7 @@ struct ds1307 {
51425 u8 offset; /* register's offset */
51426 u8 regs[11];
51427 u16 nvram_offset;
51428- struct bin_attribute *nvram;
51429+ bin_attribute_no_const *nvram;
51430 enum ds_type type;
51431 unsigned long flags;
51432 #define HAS_NVRAM 0 /* bit 0 == sysfs file active */
51433diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c
51434index 90abb5b..e0bf6dd 100644
51435--- a/drivers/rtc/rtc-m48t59.c
51436+++ b/drivers/rtc/rtc-m48t59.c
51437@@ -483,7 +483,9 @@ static int m48t59_rtc_probe(struct platform_device *pdev)
51438 if (IS_ERR(m48t59->rtc))
51439 return PTR_ERR(m48t59->rtc);
51440
51441- m48t59_nvram_attr.size = pdata->offset;
51442+ pax_open_kernel();
51443+ *(size_t *)&m48t59_nvram_attr.size = pdata->offset;
51444+ pax_close_kernel();
51445
51446 ret = sysfs_create_bin_file(&pdev->dev.kobj, &m48t59_nvram_attr);
51447 if (ret)
51448diff --git a/drivers/scsi/bfa/bfa_fcpim.h b/drivers/scsi/bfa/bfa_fcpim.h
51449index e693af6..2e525b6 100644
51450--- a/drivers/scsi/bfa/bfa_fcpim.h
51451+++ b/drivers/scsi/bfa/bfa_fcpim.h
51452@@ -36,7 +36,7 @@ struct bfa_iotag_s {
51453
51454 struct bfa_itn_s {
51455 bfa_isr_func_t isr;
51456-};
51457+} __no_const;
51458
51459 void bfa_itn_create(struct bfa_s *bfa, struct bfa_rport_s *rport,
51460 void (*isr)(struct bfa_s *bfa, struct bfi_msg_s *m));
51461diff --git a/drivers/scsi/bfa/bfa_fcs.c b/drivers/scsi/bfa/bfa_fcs.c
51462index 0f19455..ef7adb5 100644
51463--- a/drivers/scsi/bfa/bfa_fcs.c
51464+++ b/drivers/scsi/bfa/bfa_fcs.c
51465@@ -38,10 +38,21 @@ struct bfa_fcs_mod_s {
51466 #define BFA_FCS_MODULE(_mod) { _mod ## _modinit, _mod ## _modexit }
51467
51468 static struct bfa_fcs_mod_s fcs_modules[] = {
51469- { bfa_fcs_port_attach, NULL, NULL },
51470- { bfa_fcs_uf_attach, NULL, NULL },
51471- { bfa_fcs_fabric_attach, bfa_fcs_fabric_modinit,
51472- bfa_fcs_fabric_modexit },
51473+ {
51474+ .attach = bfa_fcs_port_attach,
51475+ .modinit = NULL,
51476+ .modexit = NULL
51477+ },
51478+ {
51479+ .attach = bfa_fcs_uf_attach,
51480+ .modinit = NULL,
51481+ .modexit = NULL
51482+ },
51483+ {
51484+ .attach = bfa_fcs_fabric_attach,
51485+ .modinit = bfa_fcs_fabric_modinit,
51486+ .modexit = bfa_fcs_fabric_modexit
51487+ },
51488 };
51489
51490 /*
51491diff --git a/drivers/scsi/bfa/bfa_fcs_lport.c b/drivers/scsi/bfa/bfa_fcs_lport.c
51492index ff75ef8..2dfe00a 100644
51493--- a/drivers/scsi/bfa/bfa_fcs_lport.c
51494+++ b/drivers/scsi/bfa/bfa_fcs_lport.c
51495@@ -89,15 +89,26 @@ static struct {
51496 void (*offline) (struct bfa_fcs_lport_s *port);
51497 } __port_action[] = {
51498 {
51499- bfa_fcs_lport_unknown_init, bfa_fcs_lport_unknown_online,
51500- bfa_fcs_lport_unknown_offline}, {
51501- bfa_fcs_lport_fab_init, bfa_fcs_lport_fab_online,
51502- bfa_fcs_lport_fab_offline}, {
51503- bfa_fcs_lport_n2n_init, bfa_fcs_lport_n2n_online,
51504- bfa_fcs_lport_n2n_offline}, {
51505- bfa_fcs_lport_loop_init, bfa_fcs_lport_loop_online,
51506- bfa_fcs_lport_loop_offline},
51507- };
51508+ .init = bfa_fcs_lport_unknown_init,
51509+ .online = bfa_fcs_lport_unknown_online,
51510+ .offline = bfa_fcs_lport_unknown_offline
51511+ },
51512+ {
51513+ .init = bfa_fcs_lport_fab_init,
51514+ .online = bfa_fcs_lport_fab_online,
51515+ .offline = bfa_fcs_lport_fab_offline
51516+ },
51517+ {
51518+ .init = bfa_fcs_lport_n2n_init,
51519+ .online = bfa_fcs_lport_n2n_online,
51520+ .offline = bfa_fcs_lport_n2n_offline
51521+ },
51522+ {
51523+ .init = bfa_fcs_lport_loop_init,
51524+ .online = bfa_fcs_lport_loop_online,
51525+ .offline = bfa_fcs_lport_loop_offline
51526+ },
51527+};
51528
51529 /*
51530 * fcs_port_sm FCS logical port state machine
51531diff --git a/drivers/scsi/bfa/bfa_ioc.h b/drivers/scsi/bfa/bfa_ioc.h
51532index a38aafa0..fe8f03b 100644
51533--- a/drivers/scsi/bfa/bfa_ioc.h
51534+++ b/drivers/scsi/bfa/bfa_ioc.h
51535@@ -258,7 +258,7 @@ struct bfa_ioc_cbfn_s {
51536 bfa_ioc_disable_cbfn_t disable_cbfn;
51537 bfa_ioc_hbfail_cbfn_t hbfail_cbfn;
51538 bfa_ioc_reset_cbfn_t reset_cbfn;
51539-};
51540+} __no_const;
51541
51542 /*
51543 * IOC event notification mechanism.
51544@@ -352,7 +352,7 @@ struct bfa_ioc_hwif_s {
51545 void (*ioc_set_alt_fwstate) (struct bfa_ioc_s *ioc,
51546 enum bfi_ioc_state fwstate);
51547 enum bfi_ioc_state (*ioc_get_alt_fwstate) (struct bfa_ioc_s *ioc);
51548-};
51549+} __no_const;
51550
51551 /*
51552 * Queue element to wait for room in request queue. FIFO order is
51553diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h
51554index a14c784..6de6790 100644
51555--- a/drivers/scsi/bfa/bfa_modules.h
51556+++ b/drivers/scsi/bfa/bfa_modules.h
51557@@ -78,12 +78,12 @@ enum {
51558 \
51559 extern struct bfa_module_s hal_mod_ ## __mod; \
51560 struct bfa_module_s hal_mod_ ## __mod = { \
51561- bfa_ ## __mod ## _meminfo, \
51562- bfa_ ## __mod ## _attach, \
51563- bfa_ ## __mod ## _detach, \
51564- bfa_ ## __mod ## _start, \
51565- bfa_ ## __mod ## _stop, \
51566- bfa_ ## __mod ## _iocdisable, \
51567+ .meminfo = bfa_ ## __mod ## _meminfo, \
51568+ .attach = bfa_ ## __mod ## _attach, \
51569+ .detach = bfa_ ## __mod ## _detach, \
51570+ .start = bfa_ ## __mod ## _start, \
51571+ .stop = bfa_ ## __mod ## _stop, \
51572+ .iocdisable = bfa_ ## __mod ## _iocdisable, \
51573 }
51574
51575 #define BFA_CACHELINE_SZ (256)
51576diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c
51577index 045c4e1..13de803 100644
51578--- a/drivers/scsi/fcoe/fcoe_sysfs.c
51579+++ b/drivers/scsi/fcoe/fcoe_sysfs.c
51580@@ -33,8 +33,8 @@
51581 */
51582 #include "libfcoe.h"
51583
51584-static atomic_t ctlr_num;
51585-static atomic_t fcf_num;
51586+static atomic_unchecked_t ctlr_num;
51587+static atomic_unchecked_t fcf_num;
51588
51589 /*
51590 * fcoe_fcf_dev_loss_tmo: the default number of seconds that fcoe sysfs
51591@@ -685,7 +685,7 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
51592 if (!ctlr)
51593 goto out;
51594
51595- ctlr->id = atomic_inc_return(&ctlr_num) - 1;
51596+ ctlr->id = atomic_inc_return_unchecked(&ctlr_num) - 1;
51597 ctlr->f = f;
51598 ctlr->mode = FIP_CONN_TYPE_FABRIC;
51599 INIT_LIST_HEAD(&ctlr->fcfs);
51600@@ -902,7 +902,7 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
51601 fcf->dev.parent = &ctlr->dev;
51602 fcf->dev.bus = &fcoe_bus_type;
51603 fcf->dev.type = &fcoe_fcf_device_type;
51604- fcf->id = atomic_inc_return(&fcf_num) - 1;
51605+ fcf->id = atomic_inc_return_unchecked(&fcf_num) - 1;
51606 fcf->state = FCOE_FCF_STATE_UNKNOWN;
51607
51608 fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
51609@@ -938,8 +938,8 @@ int __init fcoe_sysfs_setup(void)
51610 {
51611 int error;
51612
51613- atomic_set(&ctlr_num, 0);
51614- atomic_set(&fcf_num, 0);
51615+ atomic_set_unchecked(&ctlr_num, 0);
51616+ atomic_set_unchecked(&fcf_num, 0);
51617
51618 error = bus_register(&fcoe_bus_type);
51619 if (error)
51620diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
51621index 8bb173e..20236b4 100644
51622--- a/drivers/scsi/hosts.c
51623+++ b/drivers/scsi/hosts.c
51624@@ -42,7 +42,7 @@
51625 #include "scsi_logging.h"
51626
51627
51628-static atomic_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
51629+static atomic_unchecked_t scsi_host_next_hn = ATOMIC_INIT(0); /* host_no for next new host */
51630
51631
51632 static void scsi_host_cls_release(struct device *dev)
51633@@ -392,7 +392,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
51634 * subtract one because we increment first then return, but we need to
51635 * know what the next host number was before increment
51636 */
51637- shost->host_no = atomic_inc_return(&scsi_host_next_hn) - 1;
51638+ shost->host_no = atomic_inc_return_unchecked(&scsi_host_next_hn) - 1;
51639 shost->dma_channel = 0xff;
51640
51641 /* These three are default values which can be overridden */
51642diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
51643index a1cfbd3..d7f8ebc 100644
51644--- a/drivers/scsi/hpsa.c
51645+++ b/drivers/scsi/hpsa.c
51646@@ -697,10 +697,10 @@ static inline u32 next_command(struct ctlr_info *h, u8 q)
51647 struct reply_queue_buffer *rq = &h->reply_queue[q];
51648
51649 if (h->transMethod & CFGTBL_Trans_io_accel1)
51650- return h->access.command_completed(h, q);
51651+ return h->access->command_completed(h, q);
51652
51653 if (unlikely(!(h->transMethod & CFGTBL_Trans_Performant)))
51654- return h->access.command_completed(h, q);
51655+ return h->access->command_completed(h, q);
51656
51657 if ((rq->head[rq->current_entry] & 1) == rq->wraparound) {
51658 a = rq->head[rq->current_entry];
51659@@ -837,7 +837,7 @@ static void enqueue_cmd_and_start_io(struct ctlr_info *h,
51660 break;
51661 default:
51662 set_performant_mode(h, c);
51663- h->access.submit_command(h, c);
51664+ h->access->submit_command(h, c);
51665 }
51666 }
51667
51668@@ -5369,17 +5369,17 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
51669
51670 static inline unsigned long get_next_completion(struct ctlr_info *h, u8 q)
51671 {
51672- return h->access.command_completed(h, q);
51673+ return h->access->command_completed(h, q);
51674 }
51675
51676 static inline bool interrupt_pending(struct ctlr_info *h)
51677 {
51678- return h->access.intr_pending(h);
51679+ return h->access->intr_pending(h);
51680 }
51681
51682 static inline long interrupt_not_for_us(struct ctlr_info *h)
51683 {
51684- return (h->access.intr_pending(h) == 0) ||
51685+ return (h->access->intr_pending(h) == 0) ||
51686 (h->interrupts_enabled == 0);
51687 }
51688
51689@@ -6270,7 +6270,7 @@ static int hpsa_pci_init(struct ctlr_info *h)
51690 if (prod_index < 0)
51691 return prod_index;
51692 h->product_name = products[prod_index].product_name;
51693- h->access = *(products[prod_index].access);
51694+ h->access = products[prod_index].access;
51695
51696 pci_disable_link_state(h->pdev, PCIE_LINK_STATE_L0S |
51697 PCIE_LINK_STATE_L1 | PCIE_LINK_STATE_CLKPM);
51698@@ -6649,7 +6649,7 @@ static void controller_lockup_detected(struct ctlr_info *h)
51699 unsigned long flags;
51700 u32 lockup_detected;
51701
51702- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51703+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51704 spin_lock_irqsave(&h->lock, flags);
51705 lockup_detected = readl(h->vaddr + SA5_SCRATCHPAD_OFFSET);
51706 if (!lockup_detected) {
51707@@ -6924,7 +6924,7 @@ reinit_after_soft_reset:
51708 }
51709
51710 /* make sure the board interrupts are off */
51711- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51712+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51713
51714 if (hpsa_request_irqs(h, do_hpsa_intr_msi, do_hpsa_intr_intx))
51715 goto clean2;
51716@@ -6960,7 +6960,7 @@ reinit_after_soft_reset:
51717 * fake ones to scoop up any residual completions.
51718 */
51719 spin_lock_irqsave(&h->lock, flags);
51720- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51721+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51722 spin_unlock_irqrestore(&h->lock, flags);
51723 hpsa_free_irqs(h);
51724 rc = hpsa_request_irqs(h, hpsa_msix_discard_completions,
51725@@ -6979,9 +6979,9 @@ reinit_after_soft_reset:
51726 dev_info(&h->pdev->dev, "Board READY.\n");
51727 dev_info(&h->pdev->dev,
51728 "Waiting for stale completions to drain.\n");
51729- h->access.set_intr_mask(h, HPSA_INTR_ON);
51730+ h->access->set_intr_mask(h, HPSA_INTR_ON);
51731 msleep(10000);
51732- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51733+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51734
51735 rc = controller_reset_failed(h->cfgtable);
51736 if (rc)
51737@@ -7006,7 +7006,7 @@ reinit_after_soft_reset:
51738
51739
51740 /* Turn the interrupts on so we can service requests */
51741- h->access.set_intr_mask(h, HPSA_INTR_ON);
51742+ h->access->set_intr_mask(h, HPSA_INTR_ON);
51743
51744 hpsa_hba_inquiry(h);
51745 hpsa_register_scsi(h); /* hook ourselves into SCSI subsystem */
51746@@ -7079,7 +7079,7 @@ static void hpsa_shutdown(struct pci_dev *pdev)
51747 * To write all data in the battery backed cache to disks
51748 */
51749 hpsa_flush_cache(h);
51750- h->access.set_intr_mask(h, HPSA_INTR_OFF);
51751+ h->access->set_intr_mask(h, HPSA_INTR_OFF);
51752 hpsa_free_irqs_and_disable_msix(h);
51753 }
51754
51755@@ -7200,7 +7200,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51756 CFGTBL_Trans_enable_directed_msix |
51757 (trans_support & (CFGTBL_Trans_io_accel1 |
51758 CFGTBL_Trans_io_accel2));
51759- struct access_method access = SA5_performant_access;
51760+ struct access_method *access = &SA5_performant_access;
51761
51762 /* This is a bit complicated. There are 8 registers on
51763 * the controller which we write to to tell it 8 different
51764@@ -7242,7 +7242,7 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51765 * perform the superfluous readl() after each command submission.
51766 */
51767 if (trans_support & (CFGTBL_Trans_io_accel1 | CFGTBL_Trans_io_accel2))
51768- access = SA5_performant_access_no_read;
51769+ access = &SA5_performant_access_no_read;
51770
51771 /* Controller spec: zero out this buffer. */
51772 for (i = 0; i < h->nreply_queues; i++)
51773@@ -7272,12 +7272,12 @@ static int hpsa_enter_performant_mode(struct ctlr_info *h, u32 trans_support)
51774 * enable outbound interrupt coalescing in accelerator mode;
51775 */
51776 if (trans_support & CFGTBL_Trans_io_accel1) {
51777- access = SA5_ioaccel_mode1_access;
51778+ access = &SA5_ioaccel_mode1_access;
51779 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
51780 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
51781 } else {
51782 if (trans_support & CFGTBL_Trans_io_accel2) {
51783- access = SA5_ioaccel_mode2_access;
51784+ access = &SA5_ioaccel_mode2_access;
51785 writel(10, &h->cfgtable->HostWrite.CoalIntDelay);
51786 writel(4, &h->cfgtable->HostWrite.CoalIntCount);
51787 }
51788diff --git a/drivers/scsi/hpsa.h b/drivers/scsi/hpsa.h
51789index 6577130..955f9a4 100644
51790--- a/drivers/scsi/hpsa.h
51791+++ b/drivers/scsi/hpsa.h
51792@@ -143,7 +143,7 @@ struct ctlr_info {
51793 unsigned int msix_vector;
51794 unsigned int msi_vector;
51795 int intr_mode; /* either PERF_MODE_INT or SIMPLE_MODE_INT */
51796- struct access_method access;
51797+ struct access_method *access;
51798 char hba_mode_enabled;
51799
51800 /* queue and queue Info */
51801@@ -525,38 +525,38 @@ static unsigned long SA5_ioaccel_mode1_completed(struct ctlr_info *h, u8 q)
51802 }
51803
51804 static struct access_method SA5_access = {
51805- SA5_submit_command,
51806- SA5_intr_mask,
51807- SA5_intr_pending,
51808- SA5_completed,
51809+ .submit_command = SA5_submit_command,
51810+ .set_intr_mask = SA5_intr_mask,
51811+ .intr_pending = SA5_intr_pending,
51812+ .command_completed = SA5_completed,
51813 };
51814
51815 static struct access_method SA5_ioaccel_mode1_access = {
51816- SA5_submit_command,
51817- SA5_performant_intr_mask,
51818- SA5_ioaccel_mode1_intr_pending,
51819- SA5_ioaccel_mode1_completed,
51820+ .submit_command = SA5_submit_command,
51821+ .set_intr_mask = SA5_performant_intr_mask,
51822+ .intr_pending = SA5_ioaccel_mode1_intr_pending,
51823+ .command_completed = SA5_ioaccel_mode1_completed,
51824 };
51825
51826 static struct access_method SA5_ioaccel_mode2_access = {
51827- SA5_submit_command_ioaccel2,
51828- SA5_performant_intr_mask,
51829- SA5_performant_intr_pending,
51830- SA5_performant_completed,
51831+ .submit_command = SA5_submit_command_ioaccel2,
51832+ .set_intr_mask = SA5_performant_intr_mask,
51833+ .intr_pending = SA5_performant_intr_pending,
51834+ .command_completed = SA5_performant_completed,
51835 };
51836
51837 static struct access_method SA5_performant_access = {
51838- SA5_submit_command,
51839- SA5_performant_intr_mask,
51840- SA5_performant_intr_pending,
51841- SA5_performant_completed,
51842+ .submit_command = SA5_submit_command,
51843+ .set_intr_mask = SA5_performant_intr_mask,
51844+ .intr_pending = SA5_performant_intr_pending,
51845+ .command_completed = SA5_performant_completed,
51846 };
51847
51848 static struct access_method SA5_performant_access_no_read = {
51849- SA5_submit_command_no_read,
51850- SA5_performant_intr_mask,
51851- SA5_performant_intr_pending,
51852- SA5_performant_completed,
51853+ .submit_command = SA5_submit_command_no_read,
51854+ .set_intr_mask = SA5_performant_intr_mask,
51855+ .intr_pending = SA5_performant_intr_pending,
51856+ .command_completed = SA5_performant_completed,
51857 };
51858
51859 struct board_type {
51860diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
51861index 1b3a094..068e683 100644
51862--- a/drivers/scsi/libfc/fc_exch.c
51863+++ b/drivers/scsi/libfc/fc_exch.c
51864@@ -101,12 +101,12 @@ struct fc_exch_mgr {
51865 u16 pool_max_index;
51866
51867 struct {
51868- atomic_t no_free_exch;
51869- atomic_t no_free_exch_xid;
51870- atomic_t xid_not_found;
51871- atomic_t xid_busy;
51872- atomic_t seq_not_found;
51873- atomic_t non_bls_resp;
51874+ atomic_unchecked_t no_free_exch;
51875+ atomic_unchecked_t no_free_exch_xid;
51876+ atomic_unchecked_t xid_not_found;
51877+ atomic_unchecked_t xid_busy;
51878+ atomic_unchecked_t seq_not_found;
51879+ atomic_unchecked_t non_bls_resp;
51880 } stats;
51881 };
51882
51883@@ -811,7 +811,7 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
51884 /* allocate memory for exchange */
51885 ep = mempool_alloc(mp->ep_pool, GFP_ATOMIC);
51886 if (!ep) {
51887- atomic_inc(&mp->stats.no_free_exch);
51888+ atomic_inc_unchecked(&mp->stats.no_free_exch);
51889 goto out;
51890 }
51891 memset(ep, 0, sizeof(*ep));
51892@@ -874,7 +874,7 @@ out:
51893 return ep;
51894 err:
51895 spin_unlock_bh(&pool->lock);
51896- atomic_inc(&mp->stats.no_free_exch_xid);
51897+ atomic_inc_unchecked(&mp->stats.no_free_exch_xid);
51898 mempool_free(ep, mp->ep_pool);
51899 return NULL;
51900 }
51901@@ -1023,7 +1023,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51902 xid = ntohs(fh->fh_ox_id); /* we originated exch */
51903 ep = fc_exch_find(mp, xid);
51904 if (!ep) {
51905- atomic_inc(&mp->stats.xid_not_found);
51906+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51907 reject = FC_RJT_OX_ID;
51908 goto out;
51909 }
51910@@ -1053,7 +1053,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51911 ep = fc_exch_find(mp, xid);
51912 if ((f_ctl & FC_FC_FIRST_SEQ) && fc_sof_is_init(fr_sof(fp))) {
51913 if (ep) {
51914- atomic_inc(&mp->stats.xid_busy);
51915+ atomic_inc_unchecked(&mp->stats.xid_busy);
51916 reject = FC_RJT_RX_ID;
51917 goto rel;
51918 }
51919@@ -1064,7 +1064,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51920 }
51921 xid = ep->xid; /* get our XID */
51922 } else if (!ep) {
51923- atomic_inc(&mp->stats.xid_not_found);
51924+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51925 reject = FC_RJT_RX_ID; /* XID not found */
51926 goto out;
51927 }
51928@@ -1082,7 +1082,7 @@ static enum fc_pf_rjt_reason fc_seq_lookup_recip(struct fc_lport *lport,
51929 } else {
51930 sp = &ep->seq;
51931 if (sp->id != fh->fh_seq_id) {
51932- atomic_inc(&mp->stats.seq_not_found);
51933+ atomic_inc_unchecked(&mp->stats.seq_not_found);
51934 if (f_ctl & FC_FC_END_SEQ) {
51935 /*
51936 * Update sequence_id based on incoming last
51937@@ -1533,22 +1533,22 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51938
51939 ep = fc_exch_find(mp, ntohs(fh->fh_ox_id));
51940 if (!ep) {
51941- atomic_inc(&mp->stats.xid_not_found);
51942+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51943 goto out;
51944 }
51945 if (ep->esb_stat & ESB_ST_COMPLETE) {
51946- atomic_inc(&mp->stats.xid_not_found);
51947+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51948 goto rel;
51949 }
51950 if (ep->rxid == FC_XID_UNKNOWN)
51951 ep->rxid = ntohs(fh->fh_rx_id);
51952 if (ep->sid != 0 && ep->sid != ntoh24(fh->fh_d_id)) {
51953- atomic_inc(&mp->stats.xid_not_found);
51954+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51955 goto rel;
51956 }
51957 if (ep->did != ntoh24(fh->fh_s_id) &&
51958 ep->did != FC_FID_FLOGI) {
51959- atomic_inc(&mp->stats.xid_not_found);
51960+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51961 goto rel;
51962 }
51963 sof = fr_sof(fp);
51964@@ -1557,7 +1557,7 @@ static void fc_exch_recv_seq_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51965 sp->ssb_stat |= SSB_ST_RESP;
51966 sp->id = fh->fh_seq_id;
51967 } else if (sp->id != fh->fh_seq_id) {
51968- atomic_inc(&mp->stats.seq_not_found);
51969+ atomic_inc_unchecked(&mp->stats.seq_not_found);
51970 goto rel;
51971 }
51972
51973@@ -1619,9 +1619,9 @@ static void fc_exch_recv_resp(struct fc_exch_mgr *mp, struct fc_frame *fp)
51974 sp = fc_seq_lookup_orig(mp, fp); /* doesn't hold sequence */
51975
51976 if (!sp)
51977- atomic_inc(&mp->stats.xid_not_found);
51978+ atomic_inc_unchecked(&mp->stats.xid_not_found);
51979 else
51980- atomic_inc(&mp->stats.non_bls_resp);
51981+ atomic_inc_unchecked(&mp->stats.non_bls_resp);
51982
51983 fc_frame_free(fp);
51984 }
51985@@ -2261,13 +2261,13 @@ void fc_exch_update_stats(struct fc_lport *lport)
51986
51987 list_for_each_entry(ema, &lport->ema_list, ema_list) {
51988 mp = ema->mp;
51989- st->fc_no_free_exch += atomic_read(&mp->stats.no_free_exch);
51990+ st->fc_no_free_exch += atomic_read_unchecked(&mp->stats.no_free_exch);
51991 st->fc_no_free_exch_xid +=
51992- atomic_read(&mp->stats.no_free_exch_xid);
51993- st->fc_xid_not_found += atomic_read(&mp->stats.xid_not_found);
51994- st->fc_xid_busy += atomic_read(&mp->stats.xid_busy);
51995- st->fc_seq_not_found += atomic_read(&mp->stats.seq_not_found);
51996- st->fc_non_bls_resp += atomic_read(&mp->stats.non_bls_resp);
51997+ atomic_read_unchecked(&mp->stats.no_free_exch_xid);
51998+ st->fc_xid_not_found += atomic_read_unchecked(&mp->stats.xid_not_found);
51999+ st->fc_xid_busy += atomic_read_unchecked(&mp->stats.xid_busy);
52000+ st->fc_seq_not_found += atomic_read_unchecked(&mp->stats.seq_not_found);
52001+ st->fc_non_bls_resp += atomic_read_unchecked(&mp->stats.non_bls_resp);
52002 }
52003 }
52004 EXPORT_SYMBOL(fc_exch_update_stats);
52005diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
52006index 9c706d8..d3e3ed2 100644
52007--- a/drivers/scsi/libsas/sas_ata.c
52008+++ b/drivers/scsi/libsas/sas_ata.c
52009@@ -535,7 +535,7 @@ static struct ata_port_operations sas_sata_ops = {
52010 .postreset = ata_std_postreset,
52011 .error_handler = ata_std_error_handler,
52012 .post_internal_cmd = sas_ata_post_internal,
52013- .qc_defer = ata_std_qc_defer,
52014+ .qc_defer = ata_std_qc_defer,
52015 .qc_prep = ata_noop_qc_prep,
52016 .qc_issue = sas_ata_qc_issue,
52017 .qc_fill_rtf = sas_ata_qc_fill_rtf,
52018diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
52019index 434e903..5a4a79b 100644
52020--- a/drivers/scsi/lpfc/lpfc.h
52021+++ b/drivers/scsi/lpfc/lpfc.h
52022@@ -430,7 +430,7 @@ struct lpfc_vport {
52023 struct dentry *debug_nodelist;
52024 struct dentry *vport_debugfs_root;
52025 struct lpfc_debugfs_trc *disc_trc;
52026- atomic_t disc_trc_cnt;
52027+ atomic_unchecked_t disc_trc_cnt;
52028 #endif
52029 uint8_t stat_data_enabled;
52030 uint8_t stat_data_blocked;
52031@@ -880,8 +880,8 @@ struct lpfc_hba {
52032 struct timer_list fabric_block_timer;
52033 unsigned long bit_flags;
52034 #define FABRIC_COMANDS_BLOCKED 0
52035- atomic_t num_rsrc_err;
52036- atomic_t num_cmd_success;
52037+ atomic_unchecked_t num_rsrc_err;
52038+ atomic_unchecked_t num_cmd_success;
52039 unsigned long last_rsrc_error_time;
52040 unsigned long last_ramp_down_time;
52041 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
52042@@ -916,7 +916,7 @@ struct lpfc_hba {
52043
52044 struct dentry *debug_slow_ring_trc;
52045 struct lpfc_debugfs_trc *slow_ring_trc;
52046- atomic_t slow_ring_trc_cnt;
52047+ atomic_unchecked_t slow_ring_trc_cnt;
52048 /* iDiag debugfs sub-directory */
52049 struct dentry *idiag_root;
52050 struct dentry *idiag_pci_cfg;
52051diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c
52052index 5633e7d..8272114 100644
52053--- a/drivers/scsi/lpfc/lpfc_debugfs.c
52054+++ b/drivers/scsi/lpfc/lpfc_debugfs.c
52055@@ -106,7 +106,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_trc,
52056
52057 #include <linux/debugfs.h>
52058
52059-static atomic_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52060+static atomic_unchecked_t lpfc_debugfs_seq_trc_cnt = ATOMIC_INIT(0);
52061 static unsigned long lpfc_debugfs_start_time = 0L;
52062
52063 /* iDiag */
52064@@ -147,7 +147,7 @@ lpfc_debugfs_disc_trc_data(struct lpfc_vport *vport, char *buf, int size)
52065 lpfc_debugfs_enable = 0;
52066
52067 len = 0;
52068- index = (atomic_read(&vport->disc_trc_cnt) + 1) &
52069+ index = (atomic_read_unchecked(&vport->disc_trc_cnt) + 1) &
52070 (lpfc_debugfs_max_disc_trc - 1);
52071 for (i = index; i < lpfc_debugfs_max_disc_trc; i++) {
52072 dtp = vport->disc_trc + i;
52073@@ -213,7 +213,7 @@ lpfc_debugfs_slow_ring_trc_data(struct lpfc_hba *phba, char *buf, int size)
52074 lpfc_debugfs_enable = 0;
52075
52076 len = 0;
52077- index = (atomic_read(&phba->slow_ring_trc_cnt) + 1) &
52078+ index = (atomic_read_unchecked(&phba->slow_ring_trc_cnt) + 1) &
52079 (lpfc_debugfs_max_slow_ring_trc - 1);
52080 for (i = index; i < lpfc_debugfs_max_slow_ring_trc; i++) {
52081 dtp = phba->slow_ring_trc + i;
52082@@ -646,14 +646,14 @@ lpfc_debugfs_disc_trc(struct lpfc_vport *vport, int mask, char *fmt,
52083 !vport || !vport->disc_trc)
52084 return;
52085
52086- index = atomic_inc_return(&vport->disc_trc_cnt) &
52087+ index = atomic_inc_return_unchecked(&vport->disc_trc_cnt) &
52088 (lpfc_debugfs_max_disc_trc - 1);
52089 dtp = vport->disc_trc + index;
52090 dtp->fmt = fmt;
52091 dtp->data1 = data1;
52092 dtp->data2 = data2;
52093 dtp->data3 = data3;
52094- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52095+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52096 dtp->jif = jiffies;
52097 #endif
52098 return;
52099@@ -684,14 +684,14 @@ lpfc_debugfs_slow_ring_trc(struct lpfc_hba *phba, char *fmt,
52100 !phba || !phba->slow_ring_trc)
52101 return;
52102
52103- index = atomic_inc_return(&phba->slow_ring_trc_cnt) &
52104+ index = atomic_inc_return_unchecked(&phba->slow_ring_trc_cnt) &
52105 (lpfc_debugfs_max_slow_ring_trc - 1);
52106 dtp = phba->slow_ring_trc + index;
52107 dtp->fmt = fmt;
52108 dtp->data1 = data1;
52109 dtp->data2 = data2;
52110 dtp->data3 = data3;
52111- dtp->seq_cnt = atomic_inc_return(&lpfc_debugfs_seq_trc_cnt);
52112+ dtp->seq_cnt = atomic_inc_return_unchecked(&lpfc_debugfs_seq_trc_cnt);
52113 dtp->jif = jiffies;
52114 #endif
52115 return;
52116@@ -4268,7 +4268,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52117 "slow_ring buffer\n");
52118 goto debug_failed;
52119 }
52120- atomic_set(&phba->slow_ring_trc_cnt, 0);
52121+ atomic_set_unchecked(&phba->slow_ring_trc_cnt, 0);
52122 memset(phba->slow_ring_trc, 0,
52123 (sizeof(struct lpfc_debugfs_trc) *
52124 lpfc_debugfs_max_slow_ring_trc));
52125@@ -4314,7 +4314,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport)
52126 "buffer\n");
52127 goto debug_failed;
52128 }
52129- atomic_set(&vport->disc_trc_cnt, 0);
52130+ atomic_set_unchecked(&vport->disc_trc_cnt, 0);
52131
52132 snprintf(name, sizeof(name), "discovery_trace");
52133 vport->debug_disc_trc =
52134diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
52135index 0b2c53a..aec2b45 100644
52136--- a/drivers/scsi/lpfc/lpfc_init.c
52137+++ b/drivers/scsi/lpfc/lpfc_init.c
52138@@ -11290,8 +11290,10 @@ lpfc_init(void)
52139 "misc_register returned with status %d", error);
52140
52141 if (lpfc_enable_npiv) {
52142- lpfc_transport_functions.vport_create = lpfc_vport_create;
52143- lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52144+ pax_open_kernel();
52145+ *(void **)&lpfc_transport_functions.vport_create = lpfc_vport_create;
52146+ *(void **)&lpfc_transport_functions.vport_delete = lpfc_vport_delete;
52147+ pax_close_kernel();
52148 }
52149 lpfc_transport_template =
52150 fc_attach_transport(&lpfc_transport_functions);
52151diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
52152index 4f9222e..f1850e3 100644
52153--- a/drivers/scsi/lpfc/lpfc_scsi.c
52154+++ b/drivers/scsi/lpfc/lpfc_scsi.c
52155@@ -261,7 +261,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hba *phba)
52156 unsigned long expires;
52157
52158 spin_lock_irqsave(&phba->hbalock, flags);
52159- atomic_inc(&phba->num_rsrc_err);
52160+ atomic_inc_unchecked(&phba->num_rsrc_err);
52161 phba->last_rsrc_error_time = jiffies;
52162
52163 expires = phba->last_ramp_down_time + QUEUE_RAMP_DOWN_INTERVAL;
52164@@ -303,8 +303,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52165 unsigned long num_rsrc_err, num_cmd_success;
52166 int i;
52167
52168- num_rsrc_err = atomic_read(&phba->num_rsrc_err);
52169- num_cmd_success = atomic_read(&phba->num_cmd_success);
52170+ num_rsrc_err = atomic_read_unchecked(&phba->num_rsrc_err);
52171+ num_cmd_success = atomic_read_unchecked(&phba->num_cmd_success);
52172
52173 /*
52174 * The error and success command counters are global per
52175@@ -331,8 +331,8 @@ lpfc_ramp_down_queue_handler(struct lpfc_hba *phba)
52176 }
52177 }
52178 lpfc_destroy_vport_work_array(phba, vports);
52179- atomic_set(&phba->num_rsrc_err, 0);
52180- atomic_set(&phba->num_cmd_success, 0);
52181+ atomic_set_unchecked(&phba->num_rsrc_err, 0);
52182+ atomic_set_unchecked(&phba->num_cmd_success, 0);
52183 }
52184
52185 /**
52186diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52187index 3f26147..ee8efd1 100644
52188--- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52189+++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c
52190@@ -1509,7 +1509,7 @@ _scsih_get_resync(struct device *dev)
52191 {
52192 struct scsi_device *sdev = to_scsi_device(dev);
52193 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52194- static struct _raid_device *raid_device;
52195+ struct _raid_device *raid_device;
52196 unsigned long flags;
52197 Mpi2RaidVolPage0_t vol_pg0;
52198 Mpi2ConfigReply_t mpi_reply;
52199@@ -1561,7 +1561,7 @@ _scsih_get_state(struct device *dev)
52200 {
52201 struct scsi_device *sdev = to_scsi_device(dev);
52202 struct MPT2SAS_ADAPTER *ioc = shost_priv(sdev->host);
52203- static struct _raid_device *raid_device;
52204+ struct _raid_device *raid_device;
52205 unsigned long flags;
52206 Mpi2RaidVolPage0_t vol_pg0;
52207 Mpi2ConfigReply_t mpi_reply;
52208@@ -6641,7 +6641,7 @@ _scsih_sas_ir_operation_status_event(struct MPT2SAS_ADAPTER *ioc,
52209 Mpi2EventDataIrOperationStatus_t *event_data =
52210 (Mpi2EventDataIrOperationStatus_t *)
52211 fw_event->event_data;
52212- static struct _raid_device *raid_device;
52213+ struct _raid_device *raid_device;
52214 unsigned long flags;
52215 u16 handle;
52216
52217@@ -7112,7 +7112,7 @@ _scsih_scan_for_devices_after_reset(struct MPT2SAS_ADAPTER *ioc)
52218 u64 sas_address;
52219 struct _sas_device *sas_device;
52220 struct _sas_node *expander_device;
52221- static struct _raid_device *raid_device;
52222+ struct _raid_device *raid_device;
52223 u8 retry_count;
52224 unsigned long flags;
52225
52226diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
52227index ed31d8c..ab856b3 100644
52228--- a/drivers/scsi/pmcraid.c
52229+++ b/drivers/scsi/pmcraid.c
52230@@ -200,8 +200,8 @@ static int pmcraid_slave_alloc(struct scsi_device *scsi_dev)
52231 res->scsi_dev = scsi_dev;
52232 scsi_dev->hostdata = res;
52233 res->change_detected = 0;
52234- atomic_set(&res->read_failures, 0);
52235- atomic_set(&res->write_failures, 0);
52236+ atomic_set_unchecked(&res->read_failures, 0);
52237+ atomic_set_unchecked(&res->write_failures, 0);
52238 rc = 0;
52239 }
52240 spin_unlock_irqrestore(&pinstance->resource_lock, lock_flags);
52241@@ -2640,9 +2640,9 @@ static int pmcraid_error_handler(struct pmcraid_cmd *cmd)
52242
52243 /* If this was a SCSI read/write command keep count of errors */
52244 if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_READ_CMD)
52245- atomic_inc(&res->read_failures);
52246+ atomic_inc_unchecked(&res->read_failures);
52247 else if (SCSI_CMD_TYPE(scsi_cmd->cmnd[0]) == SCSI_WRITE_CMD)
52248- atomic_inc(&res->write_failures);
52249+ atomic_inc_unchecked(&res->write_failures);
52250
52251 if (!RES_IS_GSCSI(res->cfg_entry) &&
52252 masked_ioasc != PMCRAID_IOASC_HW_DEVICE_BUS_STATUS_ERROR) {
52253@@ -3468,7 +3468,7 @@ static int pmcraid_queuecommand_lck(
52254 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52255 * hrrq_id assigned here in queuecommand
52256 */
52257- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52258+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52259 pinstance->num_hrrq;
52260 cmd->cmd_done = pmcraid_io_done;
52261
52262@@ -3782,7 +3782,7 @@ static long pmcraid_ioctl_passthrough(
52263 * block of scsi_cmd which is re-used (e.g. cancel/abort), which uses
52264 * hrrq_id assigned here in queuecommand
52265 */
52266- ioarcb->hrrq_id = atomic_add_return(1, &(pinstance->last_message_id)) %
52267+ ioarcb->hrrq_id = atomic_add_return_unchecked(1, &(pinstance->last_message_id)) %
52268 pinstance->num_hrrq;
52269
52270 if (request_size) {
52271@@ -4420,7 +4420,7 @@ static void pmcraid_worker_function(struct work_struct *workp)
52272
52273 pinstance = container_of(workp, struct pmcraid_instance, worker_q);
52274 /* add resources only after host is added into system */
52275- if (!atomic_read(&pinstance->expose_resources))
52276+ if (!atomic_read_unchecked(&pinstance->expose_resources))
52277 return;
52278
52279 fw_version = be16_to_cpu(pinstance->inq_data->fw_version);
52280@@ -5237,8 +5237,8 @@ static int pmcraid_init_instance(struct pci_dev *pdev, struct Scsi_Host *host,
52281 init_waitqueue_head(&pinstance->reset_wait_q);
52282
52283 atomic_set(&pinstance->outstanding_cmds, 0);
52284- atomic_set(&pinstance->last_message_id, 0);
52285- atomic_set(&pinstance->expose_resources, 0);
52286+ atomic_set_unchecked(&pinstance->last_message_id, 0);
52287+ atomic_set_unchecked(&pinstance->expose_resources, 0);
52288
52289 INIT_LIST_HEAD(&pinstance->free_res_q);
52290 INIT_LIST_HEAD(&pinstance->used_res_q);
52291@@ -5951,7 +5951,7 @@ static int pmcraid_probe(struct pci_dev *pdev,
52292 /* Schedule worker thread to handle CCN and take care of adding and
52293 * removing devices to OS
52294 */
52295- atomic_set(&pinstance->expose_resources, 1);
52296+ atomic_set_unchecked(&pinstance->expose_resources, 1);
52297 schedule_work(&pinstance->worker_q);
52298 return rc;
52299
52300diff --git a/drivers/scsi/pmcraid.h b/drivers/scsi/pmcraid.h
52301index e1d150f..6c6df44 100644
52302--- a/drivers/scsi/pmcraid.h
52303+++ b/drivers/scsi/pmcraid.h
52304@@ -748,7 +748,7 @@ struct pmcraid_instance {
52305 struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
52306
52307 /* Message id as filled in last fired IOARCB, used to identify HRRQ */
52308- atomic_t last_message_id;
52309+ atomic_unchecked_t last_message_id;
52310
52311 /* configuration table */
52312 struct pmcraid_config_table *cfg_table;
52313@@ -777,7 +777,7 @@ struct pmcraid_instance {
52314 atomic_t outstanding_cmds;
52315
52316 /* should add/delete resources to mid-layer now ?*/
52317- atomic_t expose_resources;
52318+ atomic_unchecked_t expose_resources;
52319
52320
52321
52322@@ -813,8 +813,8 @@ struct pmcraid_resource_entry {
52323 struct pmcraid_config_table_entry_ext cfg_entry_ext;
52324 };
52325 struct scsi_device *scsi_dev; /* Link scsi_device structure */
52326- atomic_t read_failures; /* count of failed READ commands */
52327- atomic_t write_failures; /* count of failed WRITE commands */
52328+ atomic_unchecked_t read_failures; /* count of failed READ commands */
52329+ atomic_unchecked_t write_failures; /* count of failed WRITE commands */
52330
52331 /* To indicate add/delete/modify during CCN */
52332 u8 change_detected;
52333diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c
52334index 82b92c4..3178171 100644
52335--- a/drivers/scsi/qla2xxx/qla_attr.c
52336+++ b/drivers/scsi/qla2xxx/qla_attr.c
52337@@ -2192,7 +2192,7 @@ qla24xx_vport_disable(struct fc_vport *fc_vport, bool disable)
52338 return 0;
52339 }
52340
52341-struct fc_function_template qla2xxx_transport_functions = {
52342+fc_function_template_no_const qla2xxx_transport_functions = {
52343
52344 .show_host_node_name = 1,
52345 .show_host_port_name = 1,
52346@@ -2240,7 +2240,7 @@ struct fc_function_template qla2xxx_transport_functions = {
52347 .bsg_timeout = qla24xx_bsg_timeout,
52348 };
52349
52350-struct fc_function_template qla2xxx_transport_vport_functions = {
52351+fc_function_template_no_const qla2xxx_transport_vport_functions = {
52352
52353 .show_host_node_name = 1,
52354 .show_host_port_name = 1,
52355diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h
52356index 7686bfe..4710893 100644
52357--- a/drivers/scsi/qla2xxx/qla_gbl.h
52358+++ b/drivers/scsi/qla2xxx/qla_gbl.h
52359@@ -571,8 +571,8 @@ extern void qla2x00_get_sym_node_name(scsi_qla_host_t *, uint8_t *, size_t);
52360 struct device_attribute;
52361 extern struct device_attribute *qla2x00_host_attrs[];
52362 struct fc_function_template;
52363-extern struct fc_function_template qla2xxx_transport_functions;
52364-extern struct fc_function_template qla2xxx_transport_vport_functions;
52365+extern fc_function_template_no_const qla2xxx_transport_functions;
52366+extern fc_function_template_no_const qla2xxx_transport_vport_functions;
52367 extern void qla2x00_alloc_sysfs_attr(scsi_qla_host_t *);
52368 extern void qla2x00_free_sysfs_attr(scsi_qla_host_t *, bool);
52369 extern void qla2x00_init_host_attr(scsi_qla_host_t *);
52370diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
52371index cce1cbc..5b9f0fe 100644
52372--- a/drivers/scsi/qla2xxx/qla_os.c
52373+++ b/drivers/scsi/qla2xxx/qla_os.c
52374@@ -1435,8 +1435,10 @@ qla2x00_config_dma_addressing(struct qla_hw_data *ha)
52375 !pci_set_consistent_dma_mask(ha->pdev, DMA_BIT_MASK(64))) {
52376 /* Ok, a 64bit DMA mask is applicable. */
52377 ha->flags.enable_64bit_addressing = 1;
52378- ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52379- ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52380+ pax_open_kernel();
52381+ *(void **)&ha->isp_ops->calc_req_entries = qla2x00_calc_iocbs_64;
52382+ *(void **)&ha->isp_ops->build_iocbs = qla2x00_build_scsi_iocbs_64;
52383+ pax_close_kernel();
52384 return;
52385 }
52386 }
52387diff --git a/drivers/scsi/qla4xxx/ql4_def.h b/drivers/scsi/qla4xxx/ql4_def.h
52388index 8f6d0fb..1b21097 100644
52389--- a/drivers/scsi/qla4xxx/ql4_def.h
52390+++ b/drivers/scsi/qla4xxx/ql4_def.h
52391@@ -305,7 +305,7 @@ struct ddb_entry {
52392 * (4000 only) */
52393 atomic_t relogin_timer; /* Max Time to wait for
52394 * relogin to complete */
52395- atomic_t relogin_retry_count; /* Num of times relogin has been
52396+ atomic_unchecked_t relogin_retry_count; /* Num of times relogin has been
52397 * retried */
52398 uint32_t default_time2wait; /* Default Min time between
52399 * relogins (+aens) */
52400diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
52401index 6d25879..3031a9f 100644
52402--- a/drivers/scsi/qla4xxx/ql4_os.c
52403+++ b/drivers/scsi/qla4xxx/ql4_os.c
52404@@ -4491,12 +4491,12 @@ static void qla4xxx_check_relogin_flash_ddb(struct iscsi_cls_session *cls_sess)
52405 */
52406 if (!iscsi_is_session_online(cls_sess)) {
52407 /* Reset retry relogin timer */
52408- atomic_inc(&ddb_entry->relogin_retry_count);
52409+ atomic_inc_unchecked(&ddb_entry->relogin_retry_count);
52410 DEBUG2(ql4_printk(KERN_INFO, ha,
52411 "%s: index[%d] relogin timed out-retrying"
52412 " relogin (%d), retry (%d)\n", __func__,
52413 ddb_entry->fw_ddb_index,
52414- atomic_read(&ddb_entry->relogin_retry_count),
52415+ atomic_read_unchecked(&ddb_entry->relogin_retry_count),
52416 ddb_entry->default_time2wait + 4));
52417 set_bit(DPC_RELOGIN_DEVICE, &ha->dpc_flags);
52418 atomic_set(&ddb_entry->retry_relogin_timer,
52419@@ -6604,7 +6604,7 @@ static void qla4xxx_setup_flash_ddb_entry(struct scsi_qla_host *ha,
52420
52421 atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
52422 atomic_set(&ddb_entry->relogin_timer, 0);
52423- atomic_set(&ddb_entry->relogin_retry_count, 0);
52424+ atomic_set_unchecked(&ddb_entry->relogin_retry_count, 0);
52425 def_timeout = le16_to_cpu(ddb_entry->fw_ddb_entry.def_timeout);
52426 ddb_entry->default_relogin_timeout =
52427 (def_timeout > LOGIN_TOV) && (def_timeout < LOGIN_TOV * 10) ?
52428diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
52429index b1a2631..5bcd9c8 100644
52430--- a/drivers/scsi/scsi_lib.c
52431+++ b/drivers/scsi/scsi_lib.c
52432@@ -1597,7 +1597,7 @@ static void scsi_kill_request(struct request *req, struct request_queue *q)
52433 shost = sdev->host;
52434 scsi_init_cmd_errh(cmd);
52435 cmd->result = DID_NO_CONNECT << 16;
52436- atomic_inc(&cmd->device->iorequest_cnt);
52437+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
52438
52439 /*
52440 * SCSI request completion path will do scsi_device_unbusy(),
52441@@ -1620,9 +1620,9 @@ static void scsi_softirq_done(struct request *rq)
52442
52443 INIT_LIST_HEAD(&cmd->eh_entry);
52444
52445- atomic_inc(&cmd->device->iodone_cnt);
52446+ atomic_inc_unchecked(&cmd->device->iodone_cnt);
52447 if (cmd->result)
52448- atomic_inc(&cmd->device->ioerr_cnt);
52449+ atomic_inc_unchecked(&cmd->device->ioerr_cnt);
52450
52451 disposition = scsi_decide_disposition(cmd);
52452 if (disposition != SUCCESS &&
52453@@ -1663,7 +1663,7 @@ static int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
52454 struct Scsi_Host *host = cmd->device->host;
52455 int rtn = 0;
52456
52457- atomic_inc(&cmd->device->iorequest_cnt);
52458+ atomic_inc_unchecked(&cmd->device->iorequest_cnt);
52459
52460 /* check if the device is still usable */
52461 if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
52462diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
52463index 1ac38e7..6acc656 100644
52464--- a/drivers/scsi/scsi_sysfs.c
52465+++ b/drivers/scsi/scsi_sysfs.c
52466@@ -788,7 +788,7 @@ show_iostat_##field(struct device *dev, struct device_attribute *attr, \
52467 char *buf) \
52468 { \
52469 struct scsi_device *sdev = to_scsi_device(dev); \
52470- unsigned long long count = atomic_read(&sdev->field); \
52471+ unsigned long long count = atomic_read_unchecked(&sdev->field); \
52472 return snprintf(buf, 20, "0x%llx\n", count); \
52473 } \
52474 static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
52475diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
52476index 5d6f348..18778a6b 100644
52477--- a/drivers/scsi/scsi_transport_fc.c
52478+++ b/drivers/scsi/scsi_transport_fc.c
52479@@ -501,7 +501,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_class,
52480 * Netlink Infrastructure
52481 */
52482
52483-static atomic_t fc_event_seq;
52484+static atomic_unchecked_t fc_event_seq;
52485
52486 /**
52487 * fc_get_event_number - Obtain the next sequential FC event number
52488@@ -514,7 +514,7 @@ static atomic_t fc_event_seq;
52489 u32
52490 fc_get_event_number(void)
52491 {
52492- return atomic_add_return(1, &fc_event_seq);
52493+ return atomic_add_return_unchecked(1, &fc_event_seq);
52494 }
52495 EXPORT_SYMBOL(fc_get_event_number);
52496
52497@@ -658,7 +658,7 @@ static __init int fc_transport_init(void)
52498 {
52499 int error;
52500
52501- atomic_set(&fc_event_seq, 0);
52502+ atomic_set_unchecked(&fc_event_seq, 0);
52503
52504 error = transport_class_register(&fc_host_class);
52505 if (error)
52506@@ -848,7 +848,7 @@ static int fc_str_to_dev_loss(const char *buf, unsigned long *val)
52507 char *cp;
52508
52509 *val = simple_strtoul(buf, &cp, 0);
52510- if ((*cp && (*cp != '\n')) || (*val < 0))
52511+ if (*cp && (*cp != '\n'))
52512 return -EINVAL;
52513 /*
52514 * Check for overflow; dev_loss_tmo is u32
52515diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
52516index 67d43e3..8cee73c 100644
52517--- a/drivers/scsi/scsi_transport_iscsi.c
52518+++ b/drivers/scsi/scsi_transport_iscsi.c
52519@@ -79,7 +79,7 @@ struct iscsi_internal {
52520 struct transport_container session_cont;
52521 };
52522
52523-static atomic_t iscsi_session_nr; /* sysfs session id for next new session */
52524+static atomic_unchecked_t iscsi_session_nr; /* sysfs session id for next new session */
52525 static struct workqueue_struct *iscsi_eh_timer_workq;
52526
52527 static DEFINE_IDA(iscsi_sess_ida);
52528@@ -2071,7 +2071,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
52529 int err;
52530
52531 ihost = shost->shost_data;
52532- session->sid = atomic_add_return(1, &iscsi_session_nr);
52533+ session->sid = atomic_add_return_unchecked(1, &iscsi_session_nr);
52534
52535 if (target_id == ISCSI_MAX_TARGET) {
52536 id = ida_simple_get(&iscsi_sess_ida, 0, 0, GFP_KERNEL);
52537@@ -4515,7 +4515,7 @@ static __init int iscsi_transport_init(void)
52538 printk(KERN_INFO "Loading iSCSI transport class v%s.\n",
52539 ISCSI_TRANSPORT_VERSION);
52540
52541- atomic_set(&iscsi_session_nr, 0);
52542+ atomic_set_unchecked(&iscsi_session_nr, 0);
52543
52544 err = class_register(&iscsi_transport_class);
52545 if (err)
52546diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
52547index ae45bd9..c32a586 100644
52548--- a/drivers/scsi/scsi_transport_srp.c
52549+++ b/drivers/scsi/scsi_transport_srp.c
52550@@ -35,7 +35,7 @@
52551 #include "scsi_priv.h"
52552
52553 struct srp_host_attrs {
52554- atomic_t next_port_id;
52555+ atomic_unchecked_t next_port_id;
52556 };
52557 #define to_srp_host_attrs(host) ((struct srp_host_attrs *)(host)->shost_data)
52558
52559@@ -100,7 +100,7 @@ static int srp_host_setup(struct transport_container *tc, struct device *dev,
52560 struct Scsi_Host *shost = dev_to_shost(dev);
52561 struct srp_host_attrs *srp_host = to_srp_host_attrs(shost);
52562
52563- atomic_set(&srp_host->next_port_id, 0);
52564+ atomic_set_unchecked(&srp_host->next_port_id, 0);
52565 return 0;
52566 }
52567
52568@@ -734,7 +734,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
52569 rport_fast_io_fail_timedout);
52570 INIT_DELAYED_WORK(&rport->dev_loss_work, rport_dev_loss_timedout);
52571
52572- id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
52573+ id = atomic_inc_return_unchecked(&to_srp_host_attrs(shost)->next_port_id);
52574 dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
52575
52576 transport_setup_device(&rport->dev);
52577diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
52578index 3290a3e..d65ac1c 100644
52579--- a/drivers/scsi/sd.c
52580+++ b/drivers/scsi/sd.c
52581@@ -3006,7 +3006,7 @@ static int sd_probe(struct device *dev)
52582 sdkp->disk = gd;
52583 sdkp->index = index;
52584 atomic_set(&sdkp->openers, 0);
52585- atomic_set(&sdkp->device->ioerr_cnt, 0);
52586+ atomic_set_unchecked(&sdkp->device->ioerr_cnt, 0);
52587
52588 if (!sdp->request_queue->rq_timeout) {
52589 if (sdp->type != TYPE_MOD)
52590diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
52591index 2270bd5..98408a5 100644
52592--- a/drivers/scsi/sg.c
52593+++ b/drivers/scsi/sg.c
52594@@ -1083,7 +1083,7 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg)
52595 sdp->disk->disk_name,
52596 MKDEV(SCSI_GENERIC_MAJOR, sdp->index),
52597 NULL,
52598- (char *)arg);
52599+ (char __user *)arg);
52600 case BLKTRACESTART:
52601 return blk_trace_startstop(sdp->device->request_queue, 1);
52602 case BLKTRACESTOP:
52603diff --git a/drivers/soc/tegra/fuse/fuse-tegra.c b/drivers/soc/tegra/fuse/fuse-tegra.c
52604index c0d660f..24a5854 100644
52605--- a/drivers/soc/tegra/fuse/fuse-tegra.c
52606+++ b/drivers/soc/tegra/fuse/fuse-tegra.c
52607@@ -71,7 +71,7 @@ static ssize_t fuse_read(struct file *fd, struct kobject *kobj,
52608 return i;
52609 }
52610
52611-static struct bin_attribute fuse_bin_attr = {
52612+static bin_attribute_no_const fuse_bin_attr = {
52613 .attr = { .name = "fuse", .mode = S_IRUGO, },
52614 .read = fuse_read,
52615 };
52616diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
52617index 57a1950..ae54e21 100644
52618--- a/drivers/spi/spi.c
52619+++ b/drivers/spi/spi.c
52620@@ -2307,7 +2307,7 @@ int spi_bus_unlock(struct spi_master *master)
52621 EXPORT_SYMBOL_GPL(spi_bus_unlock);
52622
52623 /* portable code must never pass more than 32 bytes */
52624-#define SPI_BUFSIZ max(32, SMP_CACHE_BYTES)
52625+#define SPI_BUFSIZ max(32UL, SMP_CACHE_BYTES)
52626
52627 static u8 *buf;
52628
52629diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c
52630index b41429f..2de5373 100644
52631--- a/drivers/staging/android/timed_output.c
52632+++ b/drivers/staging/android/timed_output.c
52633@@ -25,7 +25,7 @@
52634 #include "timed_output.h"
52635
52636 static struct class *timed_output_class;
52637-static atomic_t device_count;
52638+static atomic_unchecked_t device_count;
52639
52640 static ssize_t enable_show(struct device *dev, struct device_attribute *attr,
52641 char *buf)
52642@@ -65,7 +65,7 @@ static int create_timed_output_class(void)
52643 timed_output_class = class_create(THIS_MODULE, "timed_output");
52644 if (IS_ERR(timed_output_class))
52645 return PTR_ERR(timed_output_class);
52646- atomic_set(&device_count, 0);
52647+ atomic_set_unchecked(&device_count, 0);
52648 timed_output_class->dev_groups = timed_output_groups;
52649 }
52650
52651@@ -83,7 +83,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev)
52652 if (ret < 0)
52653 return ret;
52654
52655- tdev->index = atomic_inc_return(&device_count);
52656+ tdev->index = atomic_inc_return_unchecked(&device_count);
52657 tdev->dev = device_create(timed_output_class, NULL,
52658 MKDEV(0, tdev->index), NULL, "%s", tdev->name);
52659 if (IS_ERR(tdev->dev))
52660diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
52661index 727640e..55bf61c 100644
52662--- a/drivers/staging/comedi/comedi_fops.c
52663+++ b/drivers/staging/comedi/comedi_fops.c
52664@@ -297,8 +297,8 @@ static void comedi_file_reset(struct file *file)
52665 }
52666 cfp->last_attached = dev->attached;
52667 cfp->last_detach_count = dev->detach_count;
52668- ACCESS_ONCE(cfp->read_subdev) = read_s;
52669- ACCESS_ONCE(cfp->write_subdev) = write_s;
52670+ ACCESS_ONCE_RW(cfp->read_subdev) = read_s;
52671+ ACCESS_ONCE_RW(cfp->write_subdev) = write_s;
52672 }
52673
52674 static void comedi_file_check(struct file *file)
52675@@ -1924,7 +1924,7 @@ static int do_setrsubd_ioctl(struct comedi_device *dev, unsigned long arg,
52676 !(s_old->async->cmd.flags & CMDF_WRITE))
52677 return -EBUSY;
52678
52679- ACCESS_ONCE(cfp->read_subdev) = s_new;
52680+ ACCESS_ONCE_RW(cfp->read_subdev) = s_new;
52681 return 0;
52682 }
52683
52684@@ -1966,7 +1966,7 @@ static int do_setwsubd_ioctl(struct comedi_device *dev, unsigned long arg,
52685 (s_old->async->cmd.flags & CMDF_WRITE))
52686 return -EBUSY;
52687
52688- ACCESS_ONCE(cfp->write_subdev) = s_new;
52689+ ACCESS_ONCE_RW(cfp->write_subdev) = s_new;
52690 return 0;
52691 }
52692
52693diff --git a/drivers/staging/fbtft/fbtft-core.c b/drivers/staging/fbtft/fbtft-core.c
52694index 37dcf7e..f3c2016 100644
52695--- a/drivers/staging/fbtft/fbtft-core.c
52696+++ b/drivers/staging/fbtft/fbtft-core.c
52697@@ -689,7 +689,7 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
52698 {
52699 struct fb_info *info;
52700 struct fbtft_par *par;
52701- struct fb_ops *fbops = NULL;
52702+ fb_ops_no_const *fbops = NULL;
52703 struct fb_deferred_io *fbdefio = NULL;
52704 struct fbtft_platform_data *pdata = dev->platform_data;
52705 u8 *vmem = NULL;
52706diff --git a/drivers/staging/fbtft/fbtft.h b/drivers/staging/fbtft/fbtft.h
52707index 0dbf3f9..fed0063 100644
52708--- a/drivers/staging/fbtft/fbtft.h
52709+++ b/drivers/staging/fbtft/fbtft.h
52710@@ -106,7 +106,7 @@ struct fbtft_ops {
52711
52712 int (*set_var)(struct fbtft_par *par);
52713 int (*set_gamma)(struct fbtft_par *par, unsigned long *curves);
52714-};
52715+} __no_const;
52716
52717 /**
52718 * struct fbtft_display - Describes the display properties
52719diff --git a/drivers/staging/gdm724x/gdm_tty.c b/drivers/staging/gdm724x/gdm_tty.c
52720index 001348c..cfaac8a 100644
52721--- a/drivers/staging/gdm724x/gdm_tty.c
52722+++ b/drivers/staging/gdm724x/gdm_tty.c
52723@@ -44,7 +44,7 @@
52724 #define gdm_tty_send_control(n, r, v, d, l) (\
52725 n->tty_dev->send_control(n->tty_dev->priv_dev, r, v, d, l))
52726
52727-#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && gdm->port.count)
52728+#define GDM_TTY_READY(gdm) (gdm && gdm->tty_dev && atomic_read(&gdm->port.count))
52729
52730 static struct tty_driver *gdm_driver[TTY_MAX_COUNT];
52731 static struct gdm *gdm_table[TTY_MAX_COUNT][GDM_TTY_MINOR];
52732diff --git a/drivers/staging/i2o/i2o.h b/drivers/staging/i2o/i2o.h
52733index d23c3c2..eb63c81 100644
52734--- a/drivers/staging/i2o/i2o.h
52735+++ b/drivers/staging/i2o/i2o.h
52736@@ -565,7 +565,7 @@ struct i2o_controller {
52737 struct i2o_device *exec; /* Executive */
52738 #if BITS_PER_LONG == 64
52739 spinlock_t context_list_lock; /* lock for context_list */
52740- atomic_t context_list_counter; /* needed for unique contexts */
52741+ atomic_unchecked_t context_list_counter; /* needed for unique contexts */
52742 struct list_head context_list; /* list of context id's
52743 and pointers */
52744 #endif
52745diff --git a/drivers/staging/i2o/i2o_proc.c b/drivers/staging/i2o/i2o_proc.c
52746index ad84f33..c5bdf65 100644
52747--- a/drivers/staging/i2o/i2o_proc.c
52748+++ b/drivers/staging/i2o/i2o_proc.c
52749@@ -255,12 +255,6 @@ static char *scsi_devices[] = {
52750 "Array Controller Device"
52751 };
52752
52753-static char *chtostr(char *tmp, u8 *chars, int n)
52754-{
52755- tmp[0] = 0;
52756- return strncat(tmp, (char *)chars, n);
52757-}
52758-
52759 static int i2o_report_query_status(struct seq_file *seq, int block_status,
52760 char *group)
52761 {
52762@@ -707,9 +701,9 @@ static int i2o_seq_show_status(struct seq_file *seq, void *v)
52763 static int i2o_seq_show_hw(struct seq_file *seq, void *v)
52764 {
52765 struct i2o_controller *c = (struct i2o_controller *)seq->private;
52766- static u32 work32[5];
52767- static u8 *work8 = (u8 *) work32;
52768- static u16 *work16 = (u16 *) work32;
52769+ u32 work32[5];
52770+ u8 *work8 = (u8 *) work32;
52771+ u16 *work16 = (u16 *) work32;
52772 int token;
52773 u32 hwcap;
52774
52775@@ -790,7 +784,6 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
52776 } *result;
52777
52778 i2o_exec_execute_ddm_table ddm_table;
52779- char tmp[28 + 1];
52780
52781 result = kmalloc(sizeof(*result), GFP_KERNEL);
52782 if (!result)
52783@@ -825,8 +818,7 @@ static int i2o_seq_show_ddm_table(struct seq_file *seq, void *v)
52784
52785 seq_printf(seq, "%-#7x", ddm_table.i2o_vendor_id);
52786 seq_printf(seq, "%-#8x", ddm_table.module_id);
52787- seq_printf(seq, "%-29s",
52788- chtostr(tmp, ddm_table.module_name_version, 28));
52789+ seq_printf(seq, "%-.28s", ddm_table.module_name_version);
52790 seq_printf(seq, "%9d ", ddm_table.data_size);
52791 seq_printf(seq, "%8d", ddm_table.code_size);
52792
52793@@ -893,7 +885,6 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
52794
52795 i2o_driver_result_table *result;
52796 i2o_driver_store_table *dst;
52797- char tmp[28 + 1];
52798
52799 result = kmalloc(sizeof(i2o_driver_result_table), GFP_KERNEL);
52800 if (result == NULL)
52801@@ -928,9 +919,8 @@ static int i2o_seq_show_drivers_stored(struct seq_file *seq, void *v)
52802
52803 seq_printf(seq, "%-#7x", dst->i2o_vendor_id);
52804 seq_printf(seq, "%-#8x", dst->module_id);
52805- seq_printf(seq, "%-29s",
52806- chtostr(tmp, dst->module_name_version, 28));
52807- seq_printf(seq, "%-9s", chtostr(tmp, dst->date, 8));
52808+ seq_printf(seq, "%-.28s", dst->module_name_version);
52809+ seq_printf(seq, "%-.8s", dst->date);
52810 seq_printf(seq, "%8d ", dst->module_size);
52811 seq_printf(seq, "%8d ", dst->mpb_size);
52812 seq_printf(seq, "0x%04x", dst->module_flags);
52813@@ -1246,11 +1236,10 @@ static int i2o_seq_show_authorized_users(struct seq_file *seq, void *v)
52814 static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
52815 {
52816 struct i2o_device *d = (struct i2o_device *)seq->private;
52817- static u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
52818+ u32 work32[128]; // allow for "stuff" + up to 256 byte (max) serial number
52819 // == (allow) 512d bytes (max)
52820- static u16 *work16 = (u16 *) work32;
52821+ u16 *work16 = (u16 *) work32;
52822 int token;
52823- char tmp[16 + 1];
52824
52825 token = i2o_parm_field_get(d, 0xF100, -1, &work32, sizeof(work32));
52826
52827@@ -1262,14 +1251,10 @@ static int i2o_seq_show_dev_identity(struct seq_file *seq, void *v)
52828 seq_printf(seq, "Device Class : %s\n", i2o_get_class_name(work16[0]));
52829 seq_printf(seq, "Owner TID : %0#5x\n", work16[2]);
52830 seq_printf(seq, "Parent TID : %0#5x\n", work16[3]);
52831- seq_printf(seq, "Vendor info : %s\n",
52832- chtostr(tmp, (u8 *) (work32 + 2), 16));
52833- seq_printf(seq, "Product info : %s\n",
52834- chtostr(tmp, (u8 *) (work32 + 6), 16));
52835- seq_printf(seq, "Description : %s\n",
52836- chtostr(tmp, (u8 *) (work32 + 10), 16));
52837- seq_printf(seq, "Product rev. : %s\n",
52838- chtostr(tmp, (u8 *) (work32 + 14), 8));
52839+ seq_printf(seq, "Vendor info : %.16s\n", (u8 *) (work32 + 2));
52840+ seq_printf(seq, "Product info : %.16s\n", (u8 *) (work32 + 6));
52841+ seq_printf(seq, "Description : %.16s\n", (u8 *) (work32 + 10));
52842+ seq_printf(seq, "Product rev. : %.8s\n", (u8 *) (work32 + 14));
52843
52844 seq_printf(seq, "Serial number : ");
52845 print_serial_number(seq, (u8 *) (work32 + 16),
52846@@ -1306,8 +1291,6 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
52847 u8 pad[256]; // allow up to 256 byte (max) serial number
52848 } result;
52849
52850- char tmp[24 + 1];
52851-
52852 token = i2o_parm_field_get(d, 0xF101, -1, &result, sizeof(result));
52853
52854 if (token < 0) {
52855@@ -1316,10 +1299,8 @@ static int i2o_seq_show_ddm_identity(struct seq_file *seq, void *v)
52856 }
52857
52858 seq_printf(seq, "Registering DDM TID : 0x%03x\n", result.ddm_tid);
52859- seq_printf(seq, "Module name : %s\n",
52860- chtostr(tmp, result.module_name, 24));
52861- seq_printf(seq, "Module revision : %s\n",
52862- chtostr(tmp, result.module_rev, 8));
52863+ seq_printf(seq, "Module name : %.24s\n", result.module_name);
52864+ seq_printf(seq, "Module revision : %.8s\n", result.module_rev);
52865
52866 seq_printf(seq, "Serial number : ");
52867 print_serial_number(seq, result.serial_number, sizeof(result) - 36);
52868@@ -1343,8 +1324,6 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
52869 u8 instance_number[4];
52870 } result;
52871
52872- char tmp[64 + 1];
52873-
52874 token = i2o_parm_field_get(d, 0xF102, -1, &result, sizeof(result));
52875
52876 if (token < 0) {
52877@@ -1352,14 +1331,10 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
52878 return 0;
52879 }
52880
52881- seq_printf(seq, "Device name : %s\n",
52882- chtostr(tmp, result.device_name, 64));
52883- seq_printf(seq, "Service name : %s\n",
52884- chtostr(tmp, result.service_name, 64));
52885- seq_printf(seq, "Physical name : %s\n",
52886- chtostr(tmp, result.physical_location, 64));
52887- seq_printf(seq, "Instance number : %s\n",
52888- chtostr(tmp, result.instance_number, 4));
52889+ seq_printf(seq, "Device name : %.64s\n", result.device_name);
52890+ seq_printf(seq, "Service name : %.64s\n", result.service_name);
52891+ seq_printf(seq, "Physical name : %.64s\n", result.physical_location);
52892+ seq_printf(seq, "Instance number : %.4s\n", result.instance_number);
52893
52894 return 0;
52895 }
52896@@ -1368,9 +1343,9 @@ static int i2o_seq_show_uinfo(struct seq_file *seq, void *v)
52897 static int i2o_seq_show_sgl_limits(struct seq_file *seq, void *v)
52898 {
52899 struct i2o_device *d = (struct i2o_device *)seq->private;
52900- static u32 work32[12];
52901- static u16 *work16 = (u16 *) work32;
52902- static u8 *work8 = (u8 *) work32;
52903+ u32 work32[12];
52904+ u16 *work16 = (u16 *) work32;
52905+ u8 *work8 = (u8 *) work32;
52906 int token;
52907
52908 token = i2o_parm_field_get(d, 0xF103, -1, &work32, sizeof(work32));
52909diff --git a/drivers/staging/i2o/iop.c b/drivers/staging/i2o/iop.c
52910index 52334fc..d7f40b3 100644
52911--- a/drivers/staging/i2o/iop.c
52912+++ b/drivers/staging/i2o/iop.c
52913@@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
52914
52915 spin_lock_irqsave(&c->context_list_lock, flags);
52916
52917- if (unlikely(atomic_inc_and_test(&c->context_list_counter)))
52918- atomic_inc(&c->context_list_counter);
52919+ if (unlikely(atomic_inc_and_test_unchecked(&c->context_list_counter)))
52920+ atomic_inc_unchecked(&c->context_list_counter);
52921
52922- entry->context = atomic_read(&c->context_list_counter);
52923+ entry->context = atomic_read_unchecked(&c->context_list_counter);
52924
52925 list_add(&entry->list, &c->context_list);
52926
52927@@ -1076,7 +1076,7 @@ struct i2o_controller *i2o_iop_alloc(void)
52928
52929 #if BITS_PER_LONG == 64
52930 spin_lock_init(&c->context_list_lock);
52931- atomic_set(&c->context_list_counter, 0);
52932+ atomic_set_unchecked(&c->context_list_counter, 0);
52933 INIT_LIST_HEAD(&c->context_list);
52934 #endif
52935
52936diff --git a/drivers/staging/lustre/lnet/selftest/brw_test.c b/drivers/staging/lustre/lnet/selftest/brw_test.c
52937index 463da07..e791ce9 100644
52938--- a/drivers/staging/lustre/lnet/selftest/brw_test.c
52939+++ b/drivers/staging/lustre/lnet/selftest/brw_test.c
52940@@ -488,13 +488,11 @@ brw_server_handle(struct srpc_server_rpc *rpc)
52941 return 0;
52942 }
52943
52944-sfw_test_client_ops_t brw_test_client;
52945-void brw_init_test_client(void)
52946-{
52947- brw_test_client.tso_init = brw_client_init;
52948- brw_test_client.tso_fini = brw_client_fini;
52949- brw_test_client.tso_prep_rpc = brw_client_prep_rpc;
52950- brw_test_client.tso_done_rpc = brw_client_done_rpc;
52951+sfw_test_client_ops_t brw_test_client = {
52952+ .tso_init = brw_client_init,
52953+ .tso_fini = brw_client_fini,
52954+ .tso_prep_rpc = brw_client_prep_rpc,
52955+ .tso_done_rpc = brw_client_done_rpc,
52956 };
52957
52958 srpc_service_t brw_test_service;
52959diff --git a/drivers/staging/lustre/lnet/selftest/framework.c b/drivers/staging/lustre/lnet/selftest/framework.c
52960index 5709148..ccd9e0d 100644
52961--- a/drivers/staging/lustre/lnet/selftest/framework.c
52962+++ b/drivers/staging/lustre/lnet/selftest/framework.c
52963@@ -1628,12 +1628,10 @@ static srpc_service_t sfw_services[] = {
52964
52965 extern sfw_test_client_ops_t ping_test_client;
52966 extern srpc_service_t ping_test_service;
52967-extern void ping_init_test_client(void);
52968 extern void ping_init_test_service(void);
52969
52970 extern sfw_test_client_ops_t brw_test_client;
52971 extern srpc_service_t brw_test_service;
52972-extern void brw_init_test_client(void);
52973 extern void brw_init_test_service(void);
52974
52975
52976@@ -1675,12 +1673,10 @@ sfw_startup (void)
52977 INIT_LIST_HEAD(&sfw_data.fw_zombie_rpcs);
52978 INIT_LIST_HEAD(&sfw_data.fw_zombie_sessions);
52979
52980- brw_init_test_client();
52981 brw_init_test_service();
52982 rc = sfw_register_test(&brw_test_service, &brw_test_client);
52983 LASSERT (rc == 0);
52984
52985- ping_init_test_client();
52986 ping_init_test_service();
52987 rc = sfw_register_test(&ping_test_service, &ping_test_client);
52988 LASSERT (rc == 0);
52989diff --git a/drivers/staging/lustre/lnet/selftest/ping_test.c b/drivers/staging/lustre/lnet/selftest/ping_test.c
52990index d8c0df6..5041cbb 100644
52991--- a/drivers/staging/lustre/lnet/selftest/ping_test.c
52992+++ b/drivers/staging/lustre/lnet/selftest/ping_test.c
52993@@ -211,14 +211,12 @@ ping_server_handle(struct srpc_server_rpc *rpc)
52994 return 0;
52995 }
52996
52997-sfw_test_client_ops_t ping_test_client;
52998-void ping_init_test_client(void)
52999-{
53000- ping_test_client.tso_init = ping_client_init;
53001- ping_test_client.tso_fini = ping_client_fini;
53002- ping_test_client.tso_prep_rpc = ping_client_prep_rpc;
53003- ping_test_client.tso_done_rpc = ping_client_done_rpc;
53004-}
53005+sfw_test_client_ops_t ping_test_client = {
53006+ .tso_init = ping_client_init,
53007+ .tso_fini = ping_client_fini,
53008+ .tso_prep_rpc = ping_client_prep_rpc,
53009+ .tso_done_rpc = ping_client_done_rpc,
53010+};
53011
53012 srpc_service_t ping_test_service;
53013 void ping_init_test_service(void)
53014diff --git a/drivers/staging/lustre/lustre/include/lustre_dlm.h b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53015index 83bc0a9..12ba00a 100644
53016--- a/drivers/staging/lustre/lustre/include/lustre_dlm.h
53017+++ b/drivers/staging/lustre/lustre/include/lustre_dlm.h
53018@@ -1139,7 +1139,7 @@ struct ldlm_callback_suite {
53019 ldlm_completion_callback lcs_completion;
53020 ldlm_blocking_callback lcs_blocking;
53021 ldlm_glimpse_callback lcs_glimpse;
53022-};
53023+} __no_const;
53024
53025 /* ldlm_lockd.c */
53026 int ldlm_del_waiting_lock(struct ldlm_lock *lock);
53027diff --git a/drivers/staging/lustre/lustre/include/obd.h b/drivers/staging/lustre/lustre/include/obd.h
53028index 2a88b80..62e7e5f 100644
53029--- a/drivers/staging/lustre/lustre/include/obd.h
53030+++ b/drivers/staging/lustre/lustre/include/obd.h
53031@@ -1362,7 +1362,7 @@ struct md_ops {
53032 * lprocfs_alloc_md_stats() in obdclass/lprocfs_status.c. Also, add a
53033 * wrapper function in include/linux/obd_class.h.
53034 */
53035-};
53036+} __no_const;
53037
53038 struct lsm_operations {
53039 void (*lsm_free)(struct lov_stripe_md *);
53040diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53041index a4c252f..b21acac 100644
53042--- a/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53043+++ b/drivers/staging/lustre/lustre/ldlm/ldlm_flock.c
53044@@ -258,7 +258,7 @@ ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags, int first_enq,
53045 int added = (mode == LCK_NL);
53046 int overlaps = 0;
53047 int splitted = 0;
53048- const struct ldlm_callback_suite null_cbs = { NULL };
53049+ const struct ldlm_callback_suite null_cbs = { };
53050
53051 CDEBUG(D_DLMTRACE,
53052 "flags %#llx owner %llu pid %u mode %u start %llu end %llu\n",
53053diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53054index c539e37..743b213 100644
53055--- a/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53056+++ b/drivers/staging/lustre/lustre/libcfs/linux/linux-proc.c
53057@@ -237,7 +237,7 @@ static int proc_console_max_delay_cs(struct ctl_table *table, int write,
53058 loff_t *ppos)
53059 {
53060 int rc, max_delay_cs;
53061- struct ctl_table dummy = *table;
53062+ ctl_table_no_const dummy = *table;
53063 long d;
53064
53065 dummy.data = &max_delay_cs;
53066@@ -270,7 +270,7 @@ static int proc_console_min_delay_cs(struct ctl_table *table, int write,
53067 loff_t *ppos)
53068 {
53069 int rc, min_delay_cs;
53070- struct ctl_table dummy = *table;
53071+ ctl_table_no_const dummy = *table;
53072 long d;
53073
53074 dummy.data = &min_delay_cs;
53075@@ -302,7 +302,7 @@ static int proc_console_backoff(struct ctl_table *table, int write,
53076 void __user *buffer, size_t *lenp, loff_t *ppos)
53077 {
53078 int rc, backoff;
53079- struct ctl_table dummy = *table;
53080+ ctl_table_no_const dummy = *table;
53081
53082 dummy.data = &backoff;
53083 dummy.proc_handler = &proc_dointvec;
53084diff --git a/drivers/staging/lustre/lustre/libcfs/module.c b/drivers/staging/lustre/lustre/libcfs/module.c
53085index 7dc77dd..289d03e 100644
53086--- a/drivers/staging/lustre/lustre/libcfs/module.c
53087+++ b/drivers/staging/lustre/lustre/libcfs/module.c
53088@@ -313,11 +313,11 @@ out:
53089
53090
53091 struct cfs_psdev_ops libcfs_psdev_ops = {
53092- libcfs_psdev_open,
53093- libcfs_psdev_release,
53094- NULL,
53095- NULL,
53096- libcfs_ioctl
53097+ .p_open = libcfs_psdev_open,
53098+ .p_close = libcfs_psdev_release,
53099+ .p_read = NULL,
53100+ .p_write = NULL,
53101+ .p_ioctl = libcfs_ioctl
53102 };
53103
53104 extern int insert_proc(void);
53105diff --git a/drivers/staging/octeon/ethernet-rx.c b/drivers/staging/octeon/ethernet-rx.c
53106index 22667db..8b703b6 100644
53107--- a/drivers/staging/octeon/ethernet-rx.c
53108+++ b/drivers/staging/octeon/ethernet-rx.c
53109@@ -354,14 +354,14 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53110 /* Increment RX stats for virtual ports */
53111 if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
53112 #ifdef CONFIG_64BIT
53113- atomic64_add(1,
53114+ atomic64_add_unchecked(1,
53115 (atomic64_t *)&priv->stats.rx_packets);
53116- atomic64_add(skb->len,
53117+ atomic64_add_unchecked(skb->len,
53118 (atomic64_t *)&priv->stats.rx_bytes);
53119 #else
53120- atomic_add(1,
53121+ atomic_add_unchecked(1,
53122 (atomic_t *)&priv->stats.rx_packets);
53123- atomic_add(skb->len,
53124+ atomic_add_unchecked(skb->len,
53125 (atomic_t *)&priv->stats.rx_bytes);
53126 #endif
53127 }
53128@@ -373,10 +373,10 @@ static int cvm_oct_napi_poll(struct napi_struct *napi, int budget)
53129 dev->name);
53130 */
53131 #ifdef CONFIG_64BIT
53132- atomic64_add(1,
53133+ atomic64_add_unchecked(1,
53134 (atomic64_t *)&priv->stats.rx_dropped);
53135 #else
53136- atomic_add(1,
53137+ atomic_add_unchecked(1,
53138 (atomic_t *)&priv->stats.rx_dropped);
53139 #endif
53140 dev_kfree_skb_irq(skb);
53141diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c
53142index 460e854..f926452 100644
53143--- a/drivers/staging/octeon/ethernet.c
53144+++ b/drivers/staging/octeon/ethernet.c
53145@@ -241,11 +241,11 @@ static struct net_device_stats *cvm_oct_common_get_stats(struct net_device *dev)
53146 * since the RX tasklet also increments it.
53147 */
53148 #ifdef CONFIG_64BIT
53149- atomic64_add(rx_status.dropped_packets,
53150- (atomic64_t *)&priv->stats.rx_dropped);
53151+ atomic64_add_unchecked(rx_status.dropped_packets,
53152+ (atomic64_unchecked_t *)&priv->stats.rx_dropped);
53153 #else
53154- atomic_add(rx_status.dropped_packets,
53155- (atomic_t *)&priv->stats.rx_dropped);
53156+ atomic_add_unchecked(rx_status.dropped_packets,
53157+ (atomic_unchecked_t *)&priv->stats.rx_dropped);
53158 #endif
53159 }
53160
53161diff --git a/drivers/staging/rtl8188eu/include/hal_intf.h b/drivers/staging/rtl8188eu/include/hal_intf.h
53162index 3b476d8..f522d68 100644
53163--- a/drivers/staging/rtl8188eu/include/hal_intf.h
53164+++ b/drivers/staging/rtl8188eu/include/hal_intf.h
53165@@ -225,7 +225,7 @@ struct hal_ops {
53166
53167 void (*hal_notch_filter)(struct adapter *adapter, bool enable);
53168 void (*hal_reset_security_engine)(struct adapter *adapter);
53169-};
53170+} __no_const;
53171
53172 enum rt_eeprom_type {
53173 EEPROM_93C46,
53174diff --git a/drivers/staging/rtl8712/rtl871x_io.h b/drivers/staging/rtl8712/rtl871x_io.h
53175index 070cc03..6806e37 100644
53176--- a/drivers/staging/rtl8712/rtl871x_io.h
53177+++ b/drivers/staging/rtl8712/rtl871x_io.h
53178@@ -108,7 +108,7 @@ struct _io_ops {
53179 u8 *pmem);
53180 u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
53181 u8 *pmem);
53182-};
53183+} __no_const;
53184
53185 struct io_req {
53186 struct list_head list;
53187diff --git a/drivers/staging/unisys/visorchipset/visorchipset.h b/drivers/staging/unisys/visorchipset/visorchipset.h
53188index 98f3ba4..c6a7fce 100644
53189--- a/drivers/staging/unisys/visorchipset/visorchipset.h
53190+++ b/drivers/staging/unisys/visorchipset/visorchipset.h
53191@@ -171,7 +171,7 @@ struct visorchipset_busdev_notifiers {
53192 void (*device_resume)(ulong bus_no, ulong dev_no);
53193 int (*get_channel_info)(uuid_le type_uuid, ulong *min_size,
53194 ulong *max_size);
53195-};
53196+} __no_const;
53197
53198 /* These functions live inside visorchipset, and will be called to indicate
53199 * responses to specific events (by code outside of visorchipset).
53200@@ -186,7 +186,7 @@ struct visorchipset_busdev_responders {
53201 void (*device_destroy)(ulong bus_no, ulong dev_no, int response);
53202 void (*device_pause)(ulong bus_no, ulong dev_no, int response);
53203 void (*device_resume)(ulong bus_no, ulong dev_no, int response);
53204-};
53205+} __no_const;
53206
53207 /** Register functions (in the bus driver) to get called by visorchipset
53208 * whenever a bus or device appears for which this service partition is
53209diff --git a/drivers/target/sbp/sbp_target.c b/drivers/target/sbp/sbp_target.c
53210index 9512af6..045bf5a 100644
53211--- a/drivers/target/sbp/sbp_target.c
53212+++ b/drivers/target/sbp/sbp_target.c
53213@@ -62,7 +62,7 @@ static const u32 sbp_unit_directory_template[] = {
53214
53215 #define SESSION_MAINTENANCE_INTERVAL HZ
53216
53217-static atomic_t login_id = ATOMIC_INIT(0);
53218+static atomic_unchecked_t login_id = ATOMIC_INIT(0);
53219
53220 static void session_maintenance_work(struct work_struct *);
53221 static int sbp_run_transaction(struct fw_card *, int, int, int, int,
53222@@ -444,7 +444,7 @@ static void sbp_management_request_login(
53223 login->lun = se_lun;
53224 login->status_fifo_addr = sbp2_pointer_to_addr(&req->orb.status_fifo);
53225 login->exclusive = LOGIN_ORB_EXCLUSIVE(be32_to_cpu(req->orb.misc));
53226- login->login_id = atomic_inc_return(&login_id);
53227+ login->login_id = atomic_inc_return_unchecked(&login_id);
53228
53229 login->tgt_agt = sbp_target_agent_register(login);
53230 if (IS_ERR(login->tgt_agt)) {
53231diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c
53232index 7faa6ae..ae6c410 100644
53233--- a/drivers/target/target_core_device.c
53234+++ b/drivers/target/target_core_device.c
53235@@ -1495,7 +1495,7 @@ struct se_device *target_alloc_device(struct se_hba *hba, const char *name)
53236 spin_lock_init(&dev->se_tmr_lock);
53237 spin_lock_init(&dev->qf_cmd_lock);
53238 sema_init(&dev->caw_sem, 1);
53239- atomic_set(&dev->dev_ordered_id, 0);
53240+ atomic_set_unchecked(&dev->dev_ordered_id, 0);
53241 INIT_LIST_HEAD(&dev->t10_wwn.t10_vpd_list);
53242 spin_lock_init(&dev->t10_wwn.t10_vpd_lock);
53243 INIT_LIST_HEAD(&dev->t10_pr.registration_list);
53244diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c
53245index f786de0..04b643e 100644
53246--- a/drivers/target/target_core_transport.c
53247+++ b/drivers/target/target_core_transport.c
53248@@ -1168,7 +1168,7 @@ transport_check_alloc_task_attr(struct se_cmd *cmd)
53249 * Used to determine when ORDERED commands should go from
53250 * Dormant to Active status.
53251 */
53252- cmd->se_ordered_id = atomic_inc_return(&dev->dev_ordered_id);
53253+ cmd->se_ordered_id = atomic_inc_return_unchecked(&dev->dev_ordered_id);
53254 pr_debug("Allocated se_ordered_id: %u for Task Attr: 0x%02x on %s\n",
53255 cmd->se_ordered_id, cmd->sam_task_attr,
53256 dev->transport->name);
53257diff --git a/drivers/thermal/int340x_thermal/int3400_thermal.c b/drivers/thermal/int340x_thermal/int3400_thermal.c
53258index 031018e..90981a1 100644
53259--- a/drivers/thermal/int340x_thermal/int3400_thermal.c
53260+++ b/drivers/thermal/int340x_thermal/int3400_thermal.c
53261@@ -272,8 +272,10 @@ static int int3400_thermal_probe(struct platform_device *pdev)
53262 platform_set_drvdata(pdev, priv);
53263
53264 if (priv->uuid_bitmap & 1 << INT3400_THERMAL_PASSIVE_1) {
53265- int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53266- int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53267+ pax_open_kernel();
53268+ *(void **)&int3400_thermal_ops.get_mode = int3400_thermal_get_mode;
53269+ *(void **)&int3400_thermal_ops.set_mode = int3400_thermal_set_mode;
53270+ pax_close_kernel();
53271 }
53272 priv->thermal = thermal_zone_device_register("INT3400 Thermal", 0, 0,
53273 priv, &int3400_thermal_ops,
53274diff --git a/drivers/thermal/of-thermal.c b/drivers/thermal/of-thermal.c
53275index 668fb1b..2737bbe 100644
53276--- a/drivers/thermal/of-thermal.c
53277+++ b/drivers/thermal/of-thermal.c
53278@@ -31,6 +31,7 @@
53279 #include <linux/export.h>
53280 #include <linux/string.h>
53281 #include <linux/thermal.h>
53282+#include <linux/mm.h>
53283
53284 #include "thermal_core.h"
53285
53286@@ -412,9 +413,11 @@ thermal_zone_of_add_sensor(struct device_node *zone,
53287 tz->ops = ops;
53288 tz->sensor_data = data;
53289
53290- tzd->ops->get_temp = of_thermal_get_temp;
53291- tzd->ops->get_trend = of_thermal_get_trend;
53292- tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53293+ pax_open_kernel();
53294+ *(void **)&tzd->ops->get_temp = of_thermal_get_temp;
53295+ *(void **)&tzd->ops->get_trend = of_thermal_get_trend;
53296+ *(void **)&tzd->ops->set_emul_temp = of_thermal_set_emul_temp;
53297+ pax_close_kernel();
53298 mutex_unlock(&tzd->lock);
53299
53300 return tzd;
53301@@ -544,9 +547,11 @@ void thermal_zone_of_sensor_unregister(struct device *dev,
53302 return;
53303
53304 mutex_lock(&tzd->lock);
53305- tzd->ops->get_temp = NULL;
53306- tzd->ops->get_trend = NULL;
53307- tzd->ops->set_emul_temp = NULL;
53308+ pax_open_kernel();
53309+ *(void **)&tzd->ops->get_temp = NULL;
53310+ *(void **)&tzd->ops->get_trend = NULL;
53311+ *(void **)&tzd->ops->set_emul_temp = NULL;
53312+ pax_close_kernel();
53313
53314 tz->ops = NULL;
53315 tz->sensor_data = NULL;
53316diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
53317index 9ea3d9d..53e8792 100644
53318--- a/drivers/thermal/x86_pkg_temp_thermal.c
53319+++ b/drivers/thermal/x86_pkg_temp_thermal.c
53320@@ -567,7 +567,7 @@ static int pkg_temp_thermal_cpu_callback(struct notifier_block *nfb,
53321 return NOTIFY_OK;
53322 }
53323
53324-static struct notifier_block pkg_temp_thermal_notifier __refdata = {
53325+static struct notifier_block pkg_temp_thermal_notifier __refconst = {
53326 .notifier_call = pkg_temp_thermal_cpu_callback,
53327 };
53328
53329diff --git a/drivers/tty/cyclades.c b/drivers/tty/cyclades.c
53330index fd66f57..48e6376 100644
53331--- a/drivers/tty/cyclades.c
53332+++ b/drivers/tty/cyclades.c
53333@@ -1570,10 +1570,10 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
53334 printk(KERN_DEBUG "cyc:cy_open ttyC%d, count = %d\n", info->line,
53335 info->port.count);
53336 #endif
53337- info->port.count++;
53338+ atomic_inc(&info->port.count);
53339 #ifdef CY_DEBUG_COUNT
53340 printk(KERN_DEBUG "cyc:cy_open (%d): incrementing count to %d\n",
53341- current->pid, info->port.count);
53342+ current->pid, atomic_read(&info->port.count));
53343 #endif
53344
53345 /*
53346@@ -3974,7 +3974,7 @@ static int cyclades_proc_show(struct seq_file *m, void *v)
53347 for (j = 0; j < cy_card[i].nports; j++) {
53348 info = &cy_card[i].ports[j];
53349
53350- if (info->port.count) {
53351+ if (atomic_read(&info->port.count)) {
53352 /* XXX is the ldisc num worth this? */
53353 struct tty_struct *tty;
53354 struct tty_ldisc *ld;
53355diff --git a/drivers/tty/hvc/hvc_console.c b/drivers/tty/hvc/hvc_console.c
53356index 4fcec1d..5a036f7 100644
53357--- a/drivers/tty/hvc/hvc_console.c
53358+++ b/drivers/tty/hvc/hvc_console.c
53359@@ -342,7 +342,7 @@ static int hvc_open(struct tty_struct *tty, struct file * filp)
53360
53361 spin_lock_irqsave(&hp->port.lock, flags);
53362 /* Check and then increment for fast path open. */
53363- if (hp->port.count++ > 0) {
53364+ if (atomic_inc_return(&hp->port.count) > 1) {
53365 spin_unlock_irqrestore(&hp->port.lock, flags);
53366 hvc_kick();
53367 return 0;
53368@@ -397,7 +397,7 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
53369
53370 spin_lock_irqsave(&hp->port.lock, flags);
53371
53372- if (--hp->port.count == 0) {
53373+ if (atomic_dec_return(&hp->port.count) == 0) {
53374 spin_unlock_irqrestore(&hp->port.lock, flags);
53375 /* We are done with the tty pointer now. */
53376 tty_port_tty_set(&hp->port, NULL);
53377@@ -419,9 +419,9 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
53378 */
53379 tty_wait_until_sent_from_close(tty, HVC_CLOSE_WAIT);
53380 } else {
53381- if (hp->port.count < 0)
53382+ if (atomic_read(&hp->port.count) < 0)
53383 printk(KERN_ERR "hvc_close %X: oops, count is %d\n",
53384- hp->vtermno, hp->port.count);
53385+ hp->vtermno, atomic_read(&hp->port.count));
53386 spin_unlock_irqrestore(&hp->port.lock, flags);
53387 }
53388 }
53389@@ -451,12 +451,12 @@ static void hvc_hangup(struct tty_struct *tty)
53390 * open->hangup case this can be called after the final close so prevent
53391 * that from happening for now.
53392 */
53393- if (hp->port.count <= 0) {
53394+ if (atomic_read(&hp->port.count) <= 0) {
53395 spin_unlock_irqrestore(&hp->port.lock, flags);
53396 return;
53397 }
53398
53399- hp->port.count = 0;
53400+ atomic_set(&hp->port.count, 0);
53401 spin_unlock_irqrestore(&hp->port.lock, flags);
53402 tty_port_tty_set(&hp->port, NULL);
53403
53404@@ -504,7 +504,7 @@ static int hvc_write(struct tty_struct *tty, const unsigned char *buf, int count
53405 return -EPIPE;
53406
53407 /* FIXME what's this (unprotected) check for? */
53408- if (hp->port.count <= 0)
53409+ if (atomic_read(&hp->port.count) <= 0)
53410 return -EIO;
53411
53412 spin_lock_irqsave(&hp->lock, flags);
53413diff --git a/drivers/tty/hvc/hvcs.c b/drivers/tty/hvc/hvcs.c
53414index 81ff7e1..dfb7b71 100644
53415--- a/drivers/tty/hvc/hvcs.c
53416+++ b/drivers/tty/hvc/hvcs.c
53417@@ -83,6 +83,7 @@
53418 #include <asm/hvcserver.h>
53419 #include <asm/uaccess.h>
53420 #include <asm/vio.h>
53421+#include <asm/local.h>
53422
53423 /*
53424 * 1.3.0 -> 1.3.1 In hvcs_open memset(..,0x00,..) instead of memset(..,0x3F,00).
53425@@ -416,7 +417,7 @@ static ssize_t hvcs_vterm_state_store(struct device *dev, struct device_attribut
53426
53427 spin_lock_irqsave(&hvcsd->lock, flags);
53428
53429- if (hvcsd->port.count > 0) {
53430+ if (atomic_read(&hvcsd->port.count) > 0) {
53431 spin_unlock_irqrestore(&hvcsd->lock, flags);
53432 printk(KERN_INFO "HVCS: vterm state unchanged. "
53433 "The hvcs device node is still in use.\n");
53434@@ -1127,7 +1128,7 @@ static int hvcs_install(struct tty_driver *driver, struct tty_struct *tty)
53435 }
53436 }
53437
53438- hvcsd->port.count = 0;
53439+ atomic_set(&hvcsd->port.count, 0);
53440 hvcsd->port.tty = tty;
53441 tty->driver_data = hvcsd;
53442
53443@@ -1180,7 +1181,7 @@ static int hvcs_open(struct tty_struct *tty, struct file *filp)
53444 unsigned long flags;
53445
53446 spin_lock_irqsave(&hvcsd->lock, flags);
53447- hvcsd->port.count++;
53448+ atomic_inc(&hvcsd->port.count);
53449 hvcsd->todo_mask |= HVCS_SCHED_READ;
53450 spin_unlock_irqrestore(&hvcsd->lock, flags);
53451
53452@@ -1216,7 +1217,7 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
53453 hvcsd = tty->driver_data;
53454
53455 spin_lock_irqsave(&hvcsd->lock, flags);
53456- if (--hvcsd->port.count == 0) {
53457+ if (atomic_dec_and_test(&hvcsd->port.count)) {
53458
53459 vio_disable_interrupts(hvcsd->vdev);
53460
53461@@ -1241,10 +1242,10 @@ static void hvcs_close(struct tty_struct *tty, struct file *filp)
53462
53463 free_irq(irq, hvcsd);
53464 return;
53465- } else if (hvcsd->port.count < 0) {
53466+ } else if (atomic_read(&hvcsd->port.count) < 0) {
53467 printk(KERN_ERR "HVCS: vty-server@%X open_count: %d"
53468 " is missmanaged.\n",
53469- hvcsd->vdev->unit_address, hvcsd->port.count);
53470+ hvcsd->vdev->unit_address, atomic_read(&hvcsd->port.count));
53471 }
53472
53473 spin_unlock_irqrestore(&hvcsd->lock, flags);
53474@@ -1266,7 +1267,7 @@ static void hvcs_hangup(struct tty_struct * tty)
53475
53476 spin_lock_irqsave(&hvcsd->lock, flags);
53477 /* Preserve this so that we know how many kref refs to put */
53478- temp_open_count = hvcsd->port.count;
53479+ temp_open_count = atomic_read(&hvcsd->port.count);
53480
53481 /*
53482 * Don't kref put inside the spinlock because the destruction
53483@@ -1281,7 +1282,7 @@ static void hvcs_hangup(struct tty_struct * tty)
53484 tty->driver_data = NULL;
53485 hvcsd->port.tty = NULL;
53486
53487- hvcsd->port.count = 0;
53488+ atomic_set(&hvcsd->port.count, 0);
53489
53490 /* This will drop any buffered data on the floor which is OK in a hangup
53491 * scenario. */
53492@@ -1352,7 +1353,7 @@ static int hvcs_write(struct tty_struct *tty,
53493 * the middle of a write operation? This is a crummy place to do this
53494 * but we want to keep it all in the spinlock.
53495 */
53496- if (hvcsd->port.count <= 0) {
53497+ if (atomic_read(&hvcsd->port.count) <= 0) {
53498 spin_unlock_irqrestore(&hvcsd->lock, flags);
53499 return -ENODEV;
53500 }
53501@@ -1426,7 +1427,7 @@ static int hvcs_write_room(struct tty_struct *tty)
53502 {
53503 struct hvcs_struct *hvcsd = tty->driver_data;
53504
53505- if (!hvcsd || hvcsd->port.count <= 0)
53506+ if (!hvcsd || atomic_read(&hvcsd->port.count) <= 0)
53507 return 0;
53508
53509 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
53510diff --git a/drivers/tty/hvc/hvsi.c b/drivers/tty/hvc/hvsi.c
53511index 4190199..06d5bfa 100644
53512--- a/drivers/tty/hvc/hvsi.c
53513+++ b/drivers/tty/hvc/hvsi.c
53514@@ -85,7 +85,7 @@ struct hvsi_struct {
53515 int n_outbuf;
53516 uint32_t vtermno;
53517 uint32_t virq;
53518- atomic_t seqno; /* HVSI packet sequence number */
53519+ atomic_unchecked_t seqno; /* HVSI packet sequence number */
53520 uint16_t mctrl;
53521 uint8_t state; /* HVSI protocol state */
53522 uint8_t flags;
53523@@ -295,7 +295,7 @@ static int hvsi_version_respond(struct hvsi_struct *hp, uint16_t query_seqno)
53524
53525 packet.hdr.type = VS_QUERY_RESPONSE_PACKET_HEADER;
53526 packet.hdr.len = sizeof(struct hvsi_query_response);
53527- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
53528+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
53529 packet.verb = VSV_SEND_VERSION_NUMBER;
53530 packet.u.version = HVSI_VERSION;
53531 packet.query_seqno = query_seqno+1;
53532@@ -555,7 +555,7 @@ static int hvsi_query(struct hvsi_struct *hp, uint16_t verb)
53533
53534 packet.hdr.type = VS_QUERY_PACKET_HEADER;
53535 packet.hdr.len = sizeof(struct hvsi_query);
53536- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
53537+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
53538 packet.verb = verb;
53539
53540 pr_debug("%s: sending %i bytes\n", __func__, packet.hdr.len);
53541@@ -597,7 +597,7 @@ static int hvsi_set_mctrl(struct hvsi_struct *hp, uint16_t mctrl)
53542 int wrote;
53543
53544 packet.hdr.type = VS_CONTROL_PACKET_HEADER,
53545- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
53546+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
53547 packet.hdr.len = sizeof(struct hvsi_control);
53548 packet.verb = VSV_SET_MODEM_CTL;
53549 packet.mask = HVSI_TSDTR;
53550@@ -680,7 +680,7 @@ static int hvsi_put_chars(struct hvsi_struct *hp, const char *buf, int count)
53551 BUG_ON(count > HVSI_MAX_OUTGOING_DATA);
53552
53553 packet.hdr.type = VS_DATA_PACKET_HEADER;
53554- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
53555+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
53556 packet.hdr.len = count + sizeof(struct hvsi_header);
53557 memcpy(&packet.data, buf, count);
53558
53559@@ -697,7 +697,7 @@ static void hvsi_close_protocol(struct hvsi_struct *hp)
53560 struct hvsi_control packet __ALIGNED__;
53561
53562 packet.hdr.type = VS_CONTROL_PACKET_HEADER;
53563- packet.hdr.seqno = atomic_inc_return(&hp->seqno);
53564+ packet.hdr.seqno = atomic_inc_return_unchecked(&hp->seqno);
53565 packet.hdr.len = 6;
53566 packet.verb = VSV_CLOSE_PROTOCOL;
53567
53568@@ -725,7 +725,7 @@ static int hvsi_open(struct tty_struct *tty, struct file *filp)
53569
53570 tty_port_tty_set(&hp->port, tty);
53571 spin_lock_irqsave(&hp->lock, flags);
53572- hp->port.count++;
53573+ atomic_inc(&hp->port.count);
53574 atomic_set(&hp->seqno, 0);
53575 h_vio_signal(hp->vtermno, VIO_IRQ_ENABLE);
53576 spin_unlock_irqrestore(&hp->lock, flags);
53577@@ -782,7 +782,7 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
53578
53579 spin_lock_irqsave(&hp->lock, flags);
53580
53581- if (--hp->port.count == 0) {
53582+ if (atomic_dec_return(&hp->port.count) == 0) {
53583 tty_port_tty_set(&hp->port, NULL);
53584 hp->inbuf_end = hp->inbuf; /* discard remaining partial packets */
53585
53586@@ -815,9 +815,9 @@ static void hvsi_close(struct tty_struct *tty, struct file *filp)
53587
53588 spin_lock_irqsave(&hp->lock, flags);
53589 }
53590- } else if (hp->port.count < 0)
53591+ } else if (atomic_read(&hp->port.count) < 0)
53592 printk(KERN_ERR "hvsi_close %lu: oops, count is %d\n",
53593- hp - hvsi_ports, hp->port.count);
53594+ hp - hvsi_ports, atomic_read(&hp->port.count));
53595
53596 spin_unlock_irqrestore(&hp->lock, flags);
53597 }
53598@@ -832,7 +832,7 @@ static void hvsi_hangup(struct tty_struct *tty)
53599 tty_port_tty_set(&hp->port, NULL);
53600
53601 spin_lock_irqsave(&hp->lock, flags);
53602- hp->port.count = 0;
53603+ atomic_set(&hp->port.count, 0);
53604 hp->n_outbuf = 0;
53605 spin_unlock_irqrestore(&hp->lock, flags);
53606 }
53607diff --git a/drivers/tty/hvc/hvsi_lib.c b/drivers/tty/hvc/hvsi_lib.c
53608index a270f04..7c77b5d 100644
53609--- a/drivers/tty/hvc/hvsi_lib.c
53610+++ b/drivers/tty/hvc/hvsi_lib.c
53611@@ -8,7 +8,7 @@
53612
53613 static int hvsi_send_packet(struct hvsi_priv *pv, struct hvsi_header *packet)
53614 {
53615- packet->seqno = cpu_to_be16(atomic_inc_return(&pv->seqno));
53616+ packet->seqno = cpu_to_be16(atomic_inc_return_unchecked(&pv->seqno));
53617
53618 /* Assumes that always succeeds, works in practice */
53619 return pv->put_chars(pv->termno, (char *)packet, packet->len);
53620@@ -20,7 +20,7 @@ static void hvsi_start_handshake(struct hvsi_priv *pv)
53621
53622 /* Reset state */
53623 pv->established = 0;
53624- atomic_set(&pv->seqno, 0);
53625+ atomic_set_unchecked(&pv->seqno, 0);
53626
53627 pr_devel("HVSI@%x: Handshaking started\n", pv->termno);
53628
53629diff --git a/drivers/tty/ipwireless/tty.c b/drivers/tty/ipwireless/tty.c
53630index 345cebb..d5a1e9e 100644
53631--- a/drivers/tty/ipwireless/tty.c
53632+++ b/drivers/tty/ipwireless/tty.c
53633@@ -28,6 +28,7 @@
53634 #include <linux/tty_driver.h>
53635 #include <linux/tty_flip.h>
53636 #include <linux/uaccess.h>
53637+#include <asm/local.h>
53638
53639 #include "tty.h"
53640 #include "network.h"
53641@@ -93,10 +94,10 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
53642 return -ENODEV;
53643
53644 mutex_lock(&tty->ipw_tty_mutex);
53645- if (tty->port.count == 0)
53646+ if (atomic_read(&tty->port.count) == 0)
53647 tty->tx_bytes_queued = 0;
53648
53649- tty->port.count++;
53650+ atomic_inc(&tty->port.count);
53651
53652 tty->port.tty = linux_tty;
53653 linux_tty->driver_data = tty;
53654@@ -112,9 +113,7 @@ static int ipw_open(struct tty_struct *linux_tty, struct file *filp)
53655
53656 static void do_ipw_close(struct ipw_tty *tty)
53657 {
53658- tty->port.count--;
53659-
53660- if (tty->port.count == 0) {
53661+ if (atomic_dec_return(&tty->port.count) == 0) {
53662 struct tty_struct *linux_tty = tty->port.tty;
53663
53664 if (linux_tty != NULL) {
53665@@ -135,7 +134,7 @@ static void ipw_hangup(struct tty_struct *linux_tty)
53666 return;
53667
53668 mutex_lock(&tty->ipw_tty_mutex);
53669- if (tty->port.count == 0) {
53670+ if (atomic_read(&tty->port.count) == 0) {
53671 mutex_unlock(&tty->ipw_tty_mutex);
53672 return;
53673 }
53674@@ -158,7 +157,7 @@ void ipwireless_tty_received(struct ipw_tty *tty, unsigned char *data,
53675
53676 mutex_lock(&tty->ipw_tty_mutex);
53677
53678- if (!tty->port.count) {
53679+ if (!atomic_read(&tty->port.count)) {
53680 mutex_unlock(&tty->ipw_tty_mutex);
53681 return;
53682 }
53683@@ -197,7 +196,7 @@ static int ipw_write(struct tty_struct *linux_tty,
53684 return -ENODEV;
53685
53686 mutex_lock(&tty->ipw_tty_mutex);
53687- if (!tty->port.count) {
53688+ if (!atomic_read(&tty->port.count)) {
53689 mutex_unlock(&tty->ipw_tty_mutex);
53690 return -EINVAL;
53691 }
53692@@ -237,7 +236,7 @@ static int ipw_write_room(struct tty_struct *linux_tty)
53693 if (!tty)
53694 return -ENODEV;
53695
53696- if (!tty->port.count)
53697+ if (!atomic_read(&tty->port.count))
53698 return -EINVAL;
53699
53700 room = IPWIRELESS_TX_QUEUE_SIZE - tty->tx_bytes_queued;
53701@@ -279,7 +278,7 @@ static int ipw_chars_in_buffer(struct tty_struct *linux_tty)
53702 if (!tty)
53703 return 0;
53704
53705- if (!tty->port.count)
53706+ if (!atomic_read(&tty->port.count))
53707 return 0;
53708
53709 return tty->tx_bytes_queued;
53710@@ -360,7 +359,7 @@ static int ipw_tiocmget(struct tty_struct *linux_tty)
53711 if (!tty)
53712 return -ENODEV;
53713
53714- if (!tty->port.count)
53715+ if (!atomic_read(&tty->port.count))
53716 return -EINVAL;
53717
53718 return get_control_lines(tty);
53719@@ -376,7 +375,7 @@ ipw_tiocmset(struct tty_struct *linux_tty,
53720 if (!tty)
53721 return -ENODEV;
53722
53723- if (!tty->port.count)
53724+ if (!atomic_read(&tty->port.count))
53725 return -EINVAL;
53726
53727 return set_control_lines(tty, set, clear);
53728@@ -390,7 +389,7 @@ static int ipw_ioctl(struct tty_struct *linux_tty,
53729 if (!tty)
53730 return -ENODEV;
53731
53732- if (!tty->port.count)
53733+ if (!atomic_read(&tty->port.count))
53734 return -EINVAL;
53735
53736 /* FIXME: Exactly how is the tty object locked here .. */
53737@@ -546,7 +545,7 @@ void ipwireless_tty_free(struct ipw_tty *tty)
53738 * are gone */
53739 mutex_lock(&ttyj->ipw_tty_mutex);
53740 }
53741- while (ttyj->port.count)
53742+ while (atomic_read(&ttyj->port.count))
53743 do_ipw_close(ttyj);
53744 ipwireless_disassociate_network_ttys(network,
53745 ttyj->channel_idx);
53746diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c
53747index 14c54e0..1efd4f2 100644
53748--- a/drivers/tty/moxa.c
53749+++ b/drivers/tty/moxa.c
53750@@ -1189,7 +1189,7 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
53751 }
53752
53753 ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
53754- ch->port.count++;
53755+ atomic_inc(&ch->port.count);
53756 tty->driver_data = ch;
53757 tty_port_tty_set(&ch->port, tty);
53758 mutex_lock(&ch->port.mutex);
53759diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c
53760index c434376..114ce13 100644
53761--- a/drivers/tty/n_gsm.c
53762+++ b/drivers/tty/n_gsm.c
53763@@ -1644,7 +1644,7 @@ static struct gsm_dlci *gsm_dlci_alloc(struct gsm_mux *gsm, int addr)
53764 spin_lock_init(&dlci->lock);
53765 mutex_init(&dlci->mutex);
53766 dlci->fifo = &dlci->_fifo;
53767- if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL) < 0) {
53768+ if (kfifo_alloc(&dlci->_fifo, 4096, GFP_KERNEL)) {
53769 kfree(dlci);
53770 return NULL;
53771 }
53772@@ -2958,7 +2958,7 @@ static int gsmtty_open(struct tty_struct *tty, struct file *filp)
53773 struct gsm_dlci *dlci = tty->driver_data;
53774 struct tty_port *port = &dlci->port;
53775
53776- port->count++;
53777+ atomic_inc(&port->count);
53778 tty_port_tty_set(port, tty);
53779
53780 dlci->modem_rx = 0;
53781diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
53782index cf6e0f2..4283167 100644
53783--- a/drivers/tty/n_tty.c
53784+++ b/drivers/tty/n_tty.c
53785@@ -116,7 +116,7 @@ struct n_tty_data {
53786 int minimum_to_wake;
53787
53788 /* consumer-published */
53789- size_t read_tail;
53790+ size_t read_tail __intentional_overflow(-1);
53791 size_t line_start;
53792
53793 /* protected by output lock */
53794@@ -2547,6 +2547,7 @@ void n_tty_inherit_ops(struct tty_ldisc_ops *ops)
53795 {
53796 *ops = tty_ldisc_N_TTY;
53797 ops->owner = NULL;
53798- ops->refcount = ops->flags = 0;
53799+ atomic_set(&ops->refcount, 0);
53800+ ops->flags = 0;
53801 }
53802 EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
53803diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
53804index e72ee62..d977ad9 100644
53805--- a/drivers/tty/pty.c
53806+++ b/drivers/tty/pty.c
53807@@ -848,8 +848,10 @@ static void __init unix98_pty_init(void)
53808 panic("Couldn't register Unix98 pts driver");
53809
53810 /* Now create the /dev/ptmx special device */
53811+ pax_open_kernel();
53812 tty_default_fops(&ptmx_fops);
53813- ptmx_fops.open = ptmx_open;
53814+ *(void **)&ptmx_fops.open = ptmx_open;
53815+ pax_close_kernel();
53816
53817 cdev_init(&ptmx_cdev, &ptmx_fops);
53818 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
53819diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c
53820index c8dd8dc..dca6cfd 100644
53821--- a/drivers/tty/rocket.c
53822+++ b/drivers/tty/rocket.c
53823@@ -914,7 +914,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
53824 tty->driver_data = info;
53825 tty_port_tty_set(port, tty);
53826
53827- if (port->count++ == 0) {
53828+ if (atomic_inc_return(&port->count) == 1) {
53829 atomic_inc(&rp_num_ports_open);
53830
53831 #ifdef ROCKET_DEBUG_OPEN
53832@@ -923,7 +923,7 @@ static int rp_open(struct tty_struct *tty, struct file *filp)
53833 #endif
53834 }
53835 #ifdef ROCKET_DEBUG_OPEN
53836- printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, info->port.count);
53837+ printk(KERN_INFO "rp_open ttyR%d, count=%d\n", info->line, atomic-read(&info->port.count));
53838 #endif
53839
53840 /*
53841@@ -1515,7 +1515,7 @@ static void rp_hangup(struct tty_struct *tty)
53842 spin_unlock_irqrestore(&info->port.lock, flags);
53843 return;
53844 }
53845- if (info->port.count)
53846+ if (atomic_read(&info->port.count))
53847 atomic_dec(&rp_num_ports_open);
53848 clear_bit((info->aiop * 8) + info->chan, (void *) &xmit_flags[info->board]);
53849 spin_unlock_irqrestore(&info->port.lock, flags);
53850diff --git a/drivers/tty/serial/ioc4_serial.c b/drivers/tty/serial/ioc4_serial.c
53851index aa28209..e08fb85 100644
53852--- a/drivers/tty/serial/ioc4_serial.c
53853+++ b/drivers/tty/serial/ioc4_serial.c
53854@@ -437,7 +437,7 @@ struct ioc4_soft {
53855 } is_intr_info[MAX_IOC4_INTR_ENTS];
53856
53857 /* Number of entries active in the above array */
53858- atomic_t is_num_intrs;
53859+ atomic_unchecked_t is_num_intrs;
53860 } is_intr_type[IOC4_NUM_INTR_TYPES];
53861
53862 /* is_ir_lock must be held while
53863@@ -974,7 +974,7 @@ intr_connect(struct ioc4_soft *soft, int type,
53864 BUG_ON(!((type == IOC4_SIO_INTR_TYPE)
53865 || (type == IOC4_OTHER_INTR_TYPE)));
53866
53867- i = atomic_inc_return(&soft-> is_intr_type[type].is_num_intrs) - 1;
53868+ i = atomic_inc_return_unchecked(&soft-> is_intr_type[type].is_num_intrs) - 1;
53869 BUG_ON(!(i < MAX_IOC4_INTR_ENTS || (printk("i %d\n", i), 0)));
53870
53871 /* Save off the lower level interrupt handler */
53872@@ -1001,7 +1001,7 @@ static irqreturn_t ioc4_intr(int irq, void *arg)
53873
53874 soft = arg;
53875 for (intr_type = 0; intr_type < IOC4_NUM_INTR_TYPES; intr_type++) {
53876- num_intrs = (int)atomic_read(
53877+ num_intrs = (int)atomic_read_unchecked(
53878 &soft->is_intr_type[intr_type].is_num_intrs);
53879
53880 this_mir = this_ir = pending_intrs(soft, intr_type);
53881diff --git a/drivers/tty/serial/kgdb_nmi.c b/drivers/tty/serial/kgdb_nmi.c
53882index 129dc5b..1da5bb8 100644
53883--- a/drivers/tty/serial/kgdb_nmi.c
53884+++ b/drivers/tty/serial/kgdb_nmi.c
53885@@ -53,7 +53,9 @@ static int kgdb_nmi_console_setup(struct console *co, char *options)
53886 * I/O utilities that messages sent to the console will automatically
53887 * be displayed on the dbg_io.
53888 */
53889- dbg_io_ops->is_console = true;
53890+ pax_open_kernel();
53891+ *(int *)&dbg_io_ops->is_console = true;
53892+ pax_close_kernel();
53893
53894 return 0;
53895 }
53896diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c
53897index a260cde..6b2b5ce 100644
53898--- a/drivers/tty/serial/kgdboc.c
53899+++ b/drivers/tty/serial/kgdboc.c
53900@@ -24,8 +24,9 @@
53901 #define MAX_CONFIG_LEN 40
53902
53903 static struct kgdb_io kgdboc_io_ops;
53904+static struct kgdb_io kgdboc_io_ops_console;
53905
53906-/* -1 = init not run yet, 0 = unconfigured, 1 = configured. */
53907+/* -1 = init not run yet, 0 = unconfigured, 1/2 = configured. */
53908 static int configured = -1;
53909
53910 static char config[MAX_CONFIG_LEN];
53911@@ -151,6 +152,8 @@ static void cleanup_kgdboc(void)
53912 kgdboc_unregister_kbd();
53913 if (configured == 1)
53914 kgdb_unregister_io_module(&kgdboc_io_ops);
53915+ else if (configured == 2)
53916+ kgdb_unregister_io_module(&kgdboc_io_ops_console);
53917 }
53918
53919 static int configure_kgdboc(void)
53920@@ -160,13 +163,13 @@ static int configure_kgdboc(void)
53921 int err;
53922 char *cptr = config;
53923 struct console *cons;
53924+ int is_console = 0;
53925
53926 err = kgdboc_option_setup(config);
53927 if (err || !strlen(config) || isspace(config[0]))
53928 goto noconfig;
53929
53930 err = -ENODEV;
53931- kgdboc_io_ops.is_console = 0;
53932 kgdb_tty_driver = NULL;
53933
53934 kgdboc_use_kms = 0;
53935@@ -187,7 +190,7 @@ static int configure_kgdboc(void)
53936 int idx;
53937 if (cons->device && cons->device(cons, &idx) == p &&
53938 idx == tty_line) {
53939- kgdboc_io_ops.is_console = 1;
53940+ is_console = 1;
53941 break;
53942 }
53943 cons = cons->next;
53944@@ -197,7 +200,13 @@ static int configure_kgdboc(void)
53945 kgdb_tty_line = tty_line;
53946
53947 do_register:
53948- err = kgdb_register_io_module(&kgdboc_io_ops);
53949+ if (is_console) {
53950+ err = kgdb_register_io_module(&kgdboc_io_ops_console);
53951+ configured = 2;
53952+ } else {
53953+ err = kgdb_register_io_module(&kgdboc_io_ops);
53954+ configured = 1;
53955+ }
53956 if (err)
53957 goto noconfig;
53958
53959@@ -205,8 +214,6 @@ do_register:
53960 if (err)
53961 goto nmi_con_failed;
53962
53963- configured = 1;
53964-
53965 return 0;
53966
53967 nmi_con_failed:
53968@@ -223,7 +230,7 @@ noconfig:
53969 static int __init init_kgdboc(void)
53970 {
53971 /* Already configured? */
53972- if (configured == 1)
53973+ if (configured >= 1)
53974 return 0;
53975
53976 return configure_kgdboc();
53977@@ -272,7 +279,7 @@ static int param_set_kgdboc_var(const char *kmessage, struct kernel_param *kp)
53978 if (config[len - 1] == '\n')
53979 config[len - 1] = '\0';
53980
53981- if (configured == 1)
53982+ if (configured >= 1)
53983 cleanup_kgdboc();
53984
53985 /* Go and configure with the new params. */
53986@@ -312,6 +319,15 @@ static struct kgdb_io kgdboc_io_ops = {
53987 .post_exception = kgdboc_post_exp_handler,
53988 };
53989
53990+static struct kgdb_io kgdboc_io_ops_console = {
53991+ .name = "kgdboc",
53992+ .read_char = kgdboc_get_char,
53993+ .write_char = kgdboc_put_char,
53994+ .pre_exception = kgdboc_pre_exp_handler,
53995+ .post_exception = kgdboc_post_exp_handler,
53996+ .is_console = 1
53997+};
53998+
53999 #ifdef CONFIG_KGDB_SERIAL_CONSOLE
54000 /* This is only available if kgdboc is a built in for early debugging */
54001 static int __init kgdboc_early_init(char *opt)
54002diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
54003index b73889c..9f74f0a 100644
54004--- a/drivers/tty/serial/msm_serial.c
54005+++ b/drivers/tty/serial/msm_serial.c
54006@@ -1012,7 +1012,7 @@ static struct uart_driver msm_uart_driver = {
54007 .cons = MSM_CONSOLE,
54008 };
54009
54010-static atomic_t msm_uart_next_id = ATOMIC_INIT(0);
54011+static atomic_unchecked_t msm_uart_next_id = ATOMIC_INIT(0);
54012
54013 static const struct of_device_id msm_uartdm_table[] = {
54014 { .compatible = "qcom,msm-uartdm-v1.1", .data = (void *)UARTDM_1P1 },
54015@@ -1036,7 +1036,7 @@ static int msm_serial_probe(struct platform_device *pdev)
54016 line = pdev->id;
54017
54018 if (line < 0)
54019- line = atomic_inc_return(&msm_uart_next_id) - 1;
54020+ line = atomic_inc_return_unchecked(&msm_uart_next_id) - 1;
54021
54022 if (unlikely(line < 0 || line >= UART_NR))
54023 return -ENXIO;
54024diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
54025index cf08876..711e0bf 100644
54026--- a/drivers/tty/serial/samsung.c
54027+++ b/drivers/tty/serial/samsung.c
54028@@ -987,11 +987,16 @@ static void s3c24xx_serial_shutdown(struct uart_port *port)
54029 ourport->tx_in_progress = 0;
54030 }
54031
54032+static int s3c64xx_serial_startup(struct uart_port *port);
54033 static int s3c24xx_serial_startup(struct uart_port *port)
54034 {
54035 struct s3c24xx_uart_port *ourport = to_ourport(port);
54036 int ret;
54037
54038+ /* Startup sequence is different for s3c64xx and higher SoC's */
54039+ if (s3c24xx_serial_has_interrupt_mask(port))
54040+ return s3c64xx_serial_startup(port);
54041+
54042 dbg("s3c24xx_serial_startup: port=%p (%08llx,%p)\n",
54043 port, (unsigned long long)port->mapbase, port->membase);
54044
54045@@ -1697,10 +1702,6 @@ static int s3c24xx_serial_init_port(struct s3c24xx_uart_port *ourport,
54046 /* setup info for port */
54047 port->dev = &platdev->dev;
54048
54049- /* Startup sequence is different for s3c64xx and higher SoC's */
54050- if (s3c24xx_serial_has_interrupt_mask(port))
54051- s3c24xx_serial_ops.startup = s3c64xx_serial_startup;
54052-
54053 port->uartclk = 1;
54054
54055 if (cfg->uart_flags & UPF_CONS_FLOW) {
54056diff --git a/drivers/tty/serial/serial_core.c b/drivers/tty/serial/serial_core.c
54057index 6a1055a..5ca9ad9 100644
54058--- a/drivers/tty/serial/serial_core.c
54059+++ b/drivers/tty/serial/serial_core.c
54060@@ -1377,7 +1377,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54061 state = drv->state + tty->index;
54062 port = &state->port;
54063 spin_lock_irq(&port->lock);
54064- --port->count;
54065+ atomic_dec(&port->count);
54066 spin_unlock_irq(&port->lock);
54067 return;
54068 }
54069@@ -1387,7 +1387,7 @@ static void uart_close(struct tty_struct *tty, struct file *filp)
54070
54071 pr_debug("uart_close(%d) called\n", uport ? uport->line : -1);
54072
54073- if (!port->count || tty_port_close_start(port, tty, filp) == 0)
54074+ if (!atomic_read(&port->count) || tty_port_close_start(port, tty, filp) == 0)
54075 return;
54076
54077 /*
54078@@ -1511,7 +1511,7 @@ static void uart_hangup(struct tty_struct *tty)
54079 uart_flush_buffer(tty);
54080 uart_shutdown(tty, state);
54081 spin_lock_irqsave(&port->lock, flags);
54082- port->count = 0;
54083+ atomic_set(&port->count, 0);
54084 clear_bit(ASYNCB_NORMAL_ACTIVE, &port->flags);
54085 spin_unlock_irqrestore(&port->lock, flags);
54086 tty_port_tty_set(port, NULL);
54087@@ -1598,7 +1598,7 @@ static int uart_open(struct tty_struct *tty, struct file *filp)
54088 pr_debug("uart_open(%d) called\n", line);
54089
54090 spin_lock_irq(&port->lock);
54091- ++port->count;
54092+ atomic_inc(&port->count);
54093 spin_unlock_irq(&port->lock);
54094
54095 /*
54096diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c
54097index b799170..87dafd5 100644
54098--- a/drivers/tty/synclink.c
54099+++ b/drivers/tty/synclink.c
54100@@ -3090,7 +3090,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54101
54102 if (debug_level >= DEBUG_LEVEL_INFO)
54103 printk("%s(%d):mgsl_close(%s) entry, count=%d\n",
54104- __FILE__,__LINE__, info->device_name, info->port.count);
54105+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
54106
54107 if (tty_port_close_start(&info->port, tty, filp) == 0)
54108 goto cleanup;
54109@@ -3108,7 +3108,7 @@ static void mgsl_close(struct tty_struct *tty, struct file * filp)
54110 cleanup:
54111 if (debug_level >= DEBUG_LEVEL_INFO)
54112 printk("%s(%d):mgsl_close(%s) exit, count=%d\n", __FILE__,__LINE__,
54113- tty->driver->name, info->port.count);
54114+ tty->driver->name, atomic_read(&info->port.count));
54115
54116 } /* end of mgsl_close() */
54117
54118@@ -3207,8 +3207,8 @@ static void mgsl_hangup(struct tty_struct *tty)
54119
54120 mgsl_flush_buffer(tty);
54121 shutdown(info);
54122-
54123- info->port.count = 0;
54124+
54125+ atomic_set(&info->port.count, 0);
54126 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54127 info->port.tty = NULL;
54128
54129@@ -3296,10 +3296,10 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54130
54131 if (debug_level >= DEBUG_LEVEL_INFO)
54132 printk("%s(%d):block_til_ready before block on %s count=%d\n",
54133- __FILE__,__LINE__, tty->driver->name, port->count );
54134+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54135
54136 spin_lock_irqsave(&info->irq_spinlock, flags);
54137- port->count--;
54138+ atomic_dec(&port->count);
54139 spin_unlock_irqrestore(&info->irq_spinlock, flags);
54140 port->blocked_open++;
54141
54142@@ -3327,7 +3327,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54143
54144 if (debug_level >= DEBUG_LEVEL_INFO)
54145 printk("%s(%d):block_til_ready blocking on %s count=%d\n",
54146- __FILE__,__LINE__, tty->driver->name, port->count );
54147+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54148
54149 tty_unlock(tty);
54150 schedule();
54151@@ -3339,12 +3339,12 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
54152
54153 /* FIXME: Racy on hangup during close wait */
54154 if (!tty_hung_up_p(filp))
54155- port->count++;
54156+ atomic_inc(&port->count);
54157 port->blocked_open--;
54158
54159 if (debug_level >= DEBUG_LEVEL_INFO)
54160 printk("%s(%d):block_til_ready after blocking on %s count=%d\n",
54161- __FILE__,__LINE__, tty->driver->name, port->count );
54162+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54163
54164 if (!retval)
54165 port->flags |= ASYNC_NORMAL_ACTIVE;
54166@@ -3396,7 +3396,7 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54167
54168 if (debug_level >= DEBUG_LEVEL_INFO)
54169 printk("%s(%d):mgsl_open(%s), old ref count = %d\n",
54170- __FILE__,__LINE__,tty->driver->name, info->port.count);
54171+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54172
54173 /* If port is closing, signal caller to try again */
54174 if (info->port.flags & ASYNC_CLOSING){
54175@@ -3415,10 +3415,10 @@ static int mgsl_open(struct tty_struct *tty, struct file * filp)
54176 spin_unlock_irqrestore(&info->netlock, flags);
54177 goto cleanup;
54178 }
54179- info->port.count++;
54180+ atomic_inc(&info->port.count);
54181 spin_unlock_irqrestore(&info->netlock, flags);
54182
54183- if (info->port.count == 1) {
54184+ if (atomic_read(&info->port.count) == 1) {
54185 /* 1st open on this device, init hardware */
54186 retval = startup(info);
54187 if (retval < 0)
54188@@ -3442,8 +3442,8 @@ cleanup:
54189 if (retval) {
54190 if (tty->count == 1)
54191 info->port.tty = NULL; /* tty layer will release tty struct */
54192- if(info->port.count)
54193- info->port.count--;
54194+ if (atomic_read(&info->port.count))
54195+ atomic_dec(&info->port.count);
54196 }
54197
54198 return retval;
54199@@ -7661,7 +7661,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54200 unsigned short new_crctype;
54201
54202 /* return error if TTY interface open */
54203- if (info->port.count)
54204+ if (atomic_read(&info->port.count))
54205 return -EBUSY;
54206
54207 switch (encoding)
54208@@ -7756,7 +7756,7 @@ static int hdlcdev_open(struct net_device *dev)
54209
54210 /* arbitrate between network and tty opens */
54211 spin_lock_irqsave(&info->netlock, flags);
54212- if (info->port.count != 0 || info->netcount != 0) {
54213+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54214 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
54215 spin_unlock_irqrestore(&info->netlock, flags);
54216 return -EBUSY;
54217@@ -7842,7 +7842,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54218 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
54219
54220 /* return error if TTY interface open */
54221- if (info->port.count)
54222+ if (atomic_read(&info->port.count))
54223 return -EBUSY;
54224
54225 if (cmd != SIOCWANDEV)
54226diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c
54227index 0e8c39b..e0cb171 100644
54228--- a/drivers/tty/synclink_gt.c
54229+++ b/drivers/tty/synclink_gt.c
54230@@ -670,7 +670,7 @@ static int open(struct tty_struct *tty, struct file *filp)
54231 tty->driver_data = info;
54232 info->port.tty = tty;
54233
54234- DBGINFO(("%s open, old ref count = %d\n", info->device_name, info->port.count));
54235+ DBGINFO(("%s open, old ref count = %d\n", info->device_name, atomic_read(&info->port.count)));
54236
54237 /* If port is closing, signal caller to try again */
54238 if (info->port.flags & ASYNC_CLOSING){
54239@@ -691,10 +691,10 @@ static int open(struct tty_struct *tty, struct file *filp)
54240 mutex_unlock(&info->port.mutex);
54241 goto cleanup;
54242 }
54243- info->port.count++;
54244+ atomic_inc(&info->port.count);
54245 spin_unlock_irqrestore(&info->netlock, flags);
54246
54247- if (info->port.count == 1) {
54248+ if (atomic_read(&info->port.count) == 1) {
54249 /* 1st open on this device, init hardware */
54250 retval = startup(info);
54251 if (retval < 0) {
54252@@ -715,8 +715,8 @@ cleanup:
54253 if (retval) {
54254 if (tty->count == 1)
54255 info->port.tty = NULL; /* tty layer will release tty struct */
54256- if(info->port.count)
54257- info->port.count--;
54258+ if(atomic_read(&info->port.count))
54259+ atomic_dec(&info->port.count);
54260 }
54261
54262 DBGINFO(("%s open rc=%d\n", info->device_name, retval));
54263@@ -729,7 +729,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54264
54265 if (sanity_check(info, tty->name, "close"))
54266 return;
54267- DBGINFO(("%s close entry, count=%d\n", info->device_name, info->port.count));
54268+ DBGINFO(("%s close entry, count=%d\n", info->device_name, atomic_read(&info->port.count)));
54269
54270 if (tty_port_close_start(&info->port, tty, filp) == 0)
54271 goto cleanup;
54272@@ -746,7 +746,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54273 tty_port_close_end(&info->port, tty);
54274 info->port.tty = NULL;
54275 cleanup:
54276- DBGINFO(("%s close exit, count=%d\n", tty->driver->name, info->port.count));
54277+ DBGINFO(("%s close exit, count=%d\n", tty->driver->name, atomic_read(&info->port.count)));
54278 }
54279
54280 static void hangup(struct tty_struct *tty)
54281@@ -764,7 +764,7 @@ static void hangup(struct tty_struct *tty)
54282 shutdown(info);
54283
54284 spin_lock_irqsave(&info->port.lock, flags);
54285- info->port.count = 0;
54286+ atomic_set(&info->port.count, 0);
54287 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54288 info->port.tty = NULL;
54289 spin_unlock_irqrestore(&info->port.lock, flags);
54290@@ -1449,7 +1449,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54291 unsigned short new_crctype;
54292
54293 /* return error if TTY interface open */
54294- if (info->port.count)
54295+ if (atomic_read(&info->port.count))
54296 return -EBUSY;
54297
54298 DBGINFO(("%s hdlcdev_attach\n", info->device_name));
54299@@ -1544,7 +1544,7 @@ static int hdlcdev_open(struct net_device *dev)
54300
54301 /* arbitrate between network and tty opens */
54302 spin_lock_irqsave(&info->netlock, flags);
54303- if (info->port.count != 0 || info->netcount != 0) {
54304+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54305 DBGINFO(("%s hdlc_open busy\n", dev->name));
54306 spin_unlock_irqrestore(&info->netlock, flags);
54307 return -EBUSY;
54308@@ -1629,7 +1629,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54309 DBGINFO(("%s hdlcdev_ioctl\n", dev->name));
54310
54311 /* return error if TTY interface open */
54312- if (info->port.count)
54313+ if (atomic_read(&info->port.count))
54314 return -EBUSY;
54315
54316 if (cmd != SIOCWANDEV)
54317@@ -2413,7 +2413,7 @@ static irqreturn_t slgt_interrupt(int dummy, void *dev_id)
54318 if (port == NULL)
54319 continue;
54320 spin_lock(&port->lock);
54321- if ((port->port.count || port->netcount) &&
54322+ if ((atomic_read(&port->port.count) || port->netcount) &&
54323 port->pending_bh && !port->bh_running &&
54324 !port->bh_requested) {
54325 DBGISR(("%s bh queued\n", port->device_name));
54326@@ -3299,7 +3299,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54327 add_wait_queue(&port->open_wait, &wait);
54328
54329 spin_lock_irqsave(&info->lock, flags);
54330- port->count--;
54331+ atomic_dec(&port->count);
54332 spin_unlock_irqrestore(&info->lock, flags);
54333 port->blocked_open++;
54334
54335@@ -3335,7 +3335,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54336 remove_wait_queue(&port->open_wait, &wait);
54337
54338 if (!tty_hung_up_p(filp))
54339- port->count++;
54340+ atomic_inc(&port->count);
54341 port->blocked_open--;
54342
54343 if (!retval)
54344diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c
54345index c3f9091..abe4601 100644
54346--- a/drivers/tty/synclinkmp.c
54347+++ b/drivers/tty/synclinkmp.c
54348@@ -750,7 +750,7 @@ static int open(struct tty_struct *tty, struct file *filp)
54349
54350 if (debug_level >= DEBUG_LEVEL_INFO)
54351 printk("%s(%d):%s open(), old ref count = %d\n",
54352- __FILE__,__LINE__,tty->driver->name, info->port.count);
54353+ __FILE__,__LINE__,tty->driver->name, atomic_read(&info->port.count));
54354
54355 /* If port is closing, signal caller to try again */
54356 if (info->port.flags & ASYNC_CLOSING){
54357@@ -769,10 +769,10 @@ static int open(struct tty_struct *tty, struct file *filp)
54358 spin_unlock_irqrestore(&info->netlock, flags);
54359 goto cleanup;
54360 }
54361- info->port.count++;
54362+ atomic_inc(&info->port.count);
54363 spin_unlock_irqrestore(&info->netlock, flags);
54364
54365- if (info->port.count == 1) {
54366+ if (atomic_read(&info->port.count) == 1) {
54367 /* 1st open on this device, init hardware */
54368 retval = startup(info);
54369 if (retval < 0)
54370@@ -796,8 +796,8 @@ cleanup:
54371 if (retval) {
54372 if (tty->count == 1)
54373 info->port.tty = NULL; /* tty layer will release tty struct */
54374- if(info->port.count)
54375- info->port.count--;
54376+ if(atomic_read(&info->port.count))
54377+ atomic_dec(&info->port.count);
54378 }
54379
54380 return retval;
54381@@ -815,7 +815,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54382
54383 if (debug_level >= DEBUG_LEVEL_INFO)
54384 printk("%s(%d):%s close() entry, count=%d\n",
54385- __FILE__,__LINE__, info->device_name, info->port.count);
54386+ __FILE__,__LINE__, info->device_name, atomic_read(&info->port.count));
54387
54388 if (tty_port_close_start(&info->port, tty, filp) == 0)
54389 goto cleanup;
54390@@ -834,7 +834,7 @@ static void close(struct tty_struct *tty, struct file *filp)
54391 cleanup:
54392 if (debug_level >= DEBUG_LEVEL_INFO)
54393 printk("%s(%d):%s close() exit, count=%d\n", __FILE__,__LINE__,
54394- tty->driver->name, info->port.count);
54395+ tty->driver->name, atomic_read(&info->port.count));
54396 }
54397
54398 /* Called by tty_hangup() when a hangup is signaled.
54399@@ -857,7 +857,7 @@ static void hangup(struct tty_struct *tty)
54400 shutdown(info);
54401
54402 spin_lock_irqsave(&info->port.lock, flags);
54403- info->port.count = 0;
54404+ atomic_set(&info->port.count, 0);
54405 info->port.flags &= ~ASYNC_NORMAL_ACTIVE;
54406 info->port.tty = NULL;
54407 spin_unlock_irqrestore(&info->port.lock, flags);
54408@@ -1565,7 +1565,7 @@ static int hdlcdev_attach(struct net_device *dev, unsigned short encoding,
54409 unsigned short new_crctype;
54410
54411 /* return error if TTY interface open */
54412- if (info->port.count)
54413+ if (atomic_read(&info->port.count))
54414 return -EBUSY;
54415
54416 switch (encoding)
54417@@ -1660,7 +1660,7 @@ static int hdlcdev_open(struct net_device *dev)
54418
54419 /* arbitrate between network and tty opens */
54420 spin_lock_irqsave(&info->netlock, flags);
54421- if (info->port.count != 0 || info->netcount != 0) {
54422+ if (atomic_read(&info->port.count) != 0 || info->netcount != 0) {
54423 printk(KERN_WARNING "%s: hdlc_open returning busy\n", dev->name);
54424 spin_unlock_irqrestore(&info->netlock, flags);
54425 return -EBUSY;
54426@@ -1746,7 +1746,7 @@ static int hdlcdev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
54427 printk("%s:hdlcdev_ioctl(%s)\n",__FILE__,dev->name);
54428
54429 /* return error if TTY interface open */
54430- if (info->port.count)
54431+ if (atomic_read(&info->port.count))
54432 return -EBUSY;
54433
54434 if (cmd != SIOCWANDEV)
54435@@ -2621,7 +2621,7 @@ static irqreturn_t synclinkmp_interrupt(int dummy, void *dev_id)
54436 * do not request bottom half processing if the
54437 * device is not open in a normal mode.
54438 */
54439- if ( port && (port->port.count || port->netcount) &&
54440+ if ( port && (atomic_read(&port->port.count) || port->netcount) &&
54441 port->pending_bh && !port->bh_running &&
54442 !port->bh_requested ) {
54443 if ( debug_level >= DEBUG_LEVEL_ISR )
54444@@ -3318,10 +3318,10 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54445
54446 if (debug_level >= DEBUG_LEVEL_INFO)
54447 printk("%s(%d):%s block_til_ready() before block, count=%d\n",
54448- __FILE__,__LINE__, tty->driver->name, port->count );
54449+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54450
54451 spin_lock_irqsave(&info->lock, flags);
54452- port->count--;
54453+ atomic_dec(&port->count);
54454 spin_unlock_irqrestore(&info->lock, flags);
54455 port->blocked_open++;
54456
54457@@ -3349,7 +3349,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54458
54459 if (debug_level >= DEBUG_LEVEL_INFO)
54460 printk("%s(%d):%s block_til_ready() count=%d\n",
54461- __FILE__,__LINE__, tty->driver->name, port->count );
54462+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54463
54464 tty_unlock(tty);
54465 schedule();
54466@@ -3359,12 +3359,12 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp,
54467 set_current_state(TASK_RUNNING);
54468 remove_wait_queue(&port->open_wait, &wait);
54469 if (!tty_hung_up_p(filp))
54470- port->count++;
54471+ atomic_inc(&port->count);
54472 port->blocked_open--;
54473
54474 if (debug_level >= DEBUG_LEVEL_INFO)
54475 printk("%s(%d):%s block_til_ready() after, count=%d\n",
54476- __FILE__,__LINE__, tty->driver->name, port->count );
54477+ __FILE__,__LINE__, tty->driver->name, atomic_read(&port->count));
54478
54479 if (!retval)
54480 port->flags |= ASYNC_NORMAL_ACTIVE;
54481diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
54482index 259a4d5..9b0c9e7 100644
54483--- a/drivers/tty/sysrq.c
54484+++ b/drivers/tty/sysrq.c
54485@@ -1085,7 +1085,7 @@ EXPORT_SYMBOL(unregister_sysrq_key);
54486 static ssize_t write_sysrq_trigger(struct file *file, const char __user *buf,
54487 size_t count, loff_t *ppos)
54488 {
54489- if (count) {
54490+ if (count && capable(CAP_SYS_ADMIN)) {
54491 char c;
54492
54493 if (get_user(c, buf))
54494diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
54495index 2bb4dfc..a7f6e86 100644
54496--- a/drivers/tty/tty_io.c
54497+++ b/drivers/tty/tty_io.c
54498@@ -3503,7 +3503,7 @@ EXPORT_SYMBOL(tty_devnum);
54499
54500 void tty_default_fops(struct file_operations *fops)
54501 {
54502- *fops = tty_fops;
54503+ memcpy((void *)fops, &tty_fops, sizeof(tty_fops));
54504 }
54505
54506 /*
54507diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
54508index 3737f55..7cef448 100644
54509--- a/drivers/tty/tty_ldisc.c
54510+++ b/drivers/tty/tty_ldisc.c
54511@@ -71,7 +71,7 @@ int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc)
54512 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
54513 tty_ldiscs[disc] = new_ldisc;
54514 new_ldisc->num = disc;
54515- new_ldisc->refcount = 0;
54516+ atomic_set(&new_ldisc->refcount, 0);
54517 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
54518
54519 return ret;
54520@@ -99,7 +99,7 @@ int tty_unregister_ldisc(int disc)
54521 return -EINVAL;
54522
54523 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
54524- if (tty_ldiscs[disc]->refcount)
54525+ if (atomic_read(&tty_ldiscs[disc]->refcount))
54526 ret = -EBUSY;
54527 else
54528 tty_ldiscs[disc] = NULL;
54529@@ -120,7 +120,7 @@ static struct tty_ldisc_ops *get_ldops(int disc)
54530 if (ldops) {
54531 ret = ERR_PTR(-EAGAIN);
54532 if (try_module_get(ldops->owner)) {
54533- ldops->refcount++;
54534+ atomic_inc(&ldops->refcount);
54535 ret = ldops;
54536 }
54537 }
54538@@ -133,7 +133,7 @@ static void put_ldops(struct tty_ldisc_ops *ldops)
54539 unsigned long flags;
54540
54541 raw_spin_lock_irqsave(&tty_ldiscs_lock, flags);
54542- ldops->refcount--;
54543+ atomic_dec(&ldops->refcount);
54544 module_put(ldops->owner);
54545 raw_spin_unlock_irqrestore(&tty_ldiscs_lock, flags);
54546 }
54547diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
54548index 40b31835..94d92ae 100644
54549--- a/drivers/tty/tty_port.c
54550+++ b/drivers/tty/tty_port.c
54551@@ -236,7 +236,7 @@ void tty_port_hangup(struct tty_port *port)
54552 unsigned long flags;
54553
54554 spin_lock_irqsave(&port->lock, flags);
54555- port->count = 0;
54556+ atomic_set(&port->count, 0);
54557 port->flags &= ~ASYNC_NORMAL_ACTIVE;
54558 tty = port->tty;
54559 if (tty)
54560@@ -398,7 +398,7 @@ int tty_port_block_til_ready(struct tty_port *port,
54561
54562 /* The port lock protects the port counts */
54563 spin_lock_irqsave(&port->lock, flags);
54564- port->count--;
54565+ atomic_dec(&port->count);
54566 port->blocked_open++;
54567 spin_unlock_irqrestore(&port->lock, flags);
54568
54569@@ -440,7 +440,7 @@ int tty_port_block_til_ready(struct tty_port *port,
54570 we must not mess that up further */
54571 spin_lock_irqsave(&port->lock, flags);
54572 if (!tty_hung_up_p(filp))
54573- port->count++;
54574+ atomic_inc(&port->count);
54575 port->blocked_open--;
54576 if (retval == 0)
54577 port->flags |= ASYNC_NORMAL_ACTIVE;
54578@@ -476,19 +476,19 @@ int tty_port_close_start(struct tty_port *port,
54579 return 0;
54580
54581 spin_lock_irqsave(&port->lock, flags);
54582- if (tty->count == 1 && port->count != 1) {
54583+ if (tty->count == 1 && atomic_read(&port->count) != 1) {
54584 printk(KERN_WARNING
54585 "tty_port_close_start: tty->count = 1 port count = %d.\n",
54586- port->count);
54587- port->count = 1;
54588+ atomic_read(&port->count));
54589+ atomic_set(&port->count, 1);
54590 }
54591- if (--port->count < 0) {
54592+ if (atomic_dec_return(&port->count) < 0) {
54593 printk(KERN_WARNING "tty_port_close_start: count = %d\n",
54594- port->count);
54595- port->count = 0;
54596+ atomic_read(&port->count));
54597+ atomic_set(&port->count, 0);
54598 }
54599
54600- if (port->count) {
54601+ if (atomic_read(&port->count)) {
54602 spin_unlock_irqrestore(&port->lock, flags);
54603 return 0;
54604 }
54605@@ -590,7 +590,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty,
54606 struct file *filp)
54607 {
54608 spin_lock_irq(&port->lock);
54609- ++port->count;
54610+ atomic_inc(&port->count);
54611 spin_unlock_irq(&port->lock);
54612 tty_port_tty_set(port, tty);
54613
54614diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
54615index 8a89f6e..50b32af 100644
54616--- a/drivers/tty/vt/keyboard.c
54617+++ b/drivers/tty/vt/keyboard.c
54618@@ -641,6 +641,16 @@ static void k_spec(struct vc_data *vc, unsigned char value, char up_flag)
54619 kbd->kbdmode == VC_OFF) &&
54620 value != KVAL(K_SAK))
54621 return; /* SAK is allowed even in raw mode */
54622+
54623+#if defined(CONFIG_GRKERNSEC_PROC) || defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
54624+ {
54625+ void *func = fn_handler[value];
54626+ if (func == fn_show_state || func == fn_show_ptregs ||
54627+ func == fn_show_mem)
54628+ return;
54629+ }
54630+#endif
54631+
54632 fn_handler[value](vc);
54633 }
54634
54635@@ -1776,9 +1786,6 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
54636 if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
54637 return -EFAULT;
54638
54639- if (!capable(CAP_SYS_TTY_CONFIG))
54640- perm = 0;
54641-
54642 switch (cmd) {
54643 case KDGKBENT:
54644 /* Ensure another thread doesn't free it under us */
54645@@ -1793,6 +1800,9 @@ int vt_do_kdsk_ioctl(int cmd, struct kbentry __user *user_kbe, int perm,
54646 spin_unlock_irqrestore(&kbd_event_lock, flags);
54647 return put_user(val, &user_kbe->kb_value);
54648 case KDSKBENT:
54649+ if (!capable(CAP_SYS_TTY_CONFIG))
54650+ perm = 0;
54651+
54652 if (!perm)
54653 return -EPERM;
54654 if (!i && v == K_NOSUCHMAP) {
54655@@ -1883,9 +1893,6 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
54656 int i, j, k;
54657 int ret;
54658
54659- if (!capable(CAP_SYS_TTY_CONFIG))
54660- perm = 0;
54661-
54662 kbs = kmalloc(sizeof(*kbs), GFP_KERNEL);
54663 if (!kbs) {
54664 ret = -ENOMEM;
54665@@ -1919,6 +1926,9 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
54666 kfree(kbs);
54667 return ((p && *p) ? -EOVERFLOW : 0);
54668 case KDSKBSENT:
54669+ if (!capable(CAP_SYS_TTY_CONFIG))
54670+ perm = 0;
54671+
54672 if (!perm) {
54673 ret = -EPERM;
54674 goto reterr;
54675diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c
54676index 6276f13..84f2449 100644
54677--- a/drivers/uio/uio.c
54678+++ b/drivers/uio/uio.c
54679@@ -25,6 +25,7 @@
54680 #include <linux/kobject.h>
54681 #include <linux/cdev.h>
54682 #include <linux/uio_driver.h>
54683+#include <asm/local.h>
54684
54685 #define UIO_MAX_DEVICES (1U << MINORBITS)
54686
54687@@ -231,7 +232,7 @@ static ssize_t event_show(struct device *dev,
54688 struct device_attribute *attr, char *buf)
54689 {
54690 struct uio_device *idev = dev_get_drvdata(dev);
54691- return sprintf(buf, "%u\n", (unsigned int)atomic_read(&idev->event));
54692+ return sprintf(buf, "%u\n", (unsigned int)atomic_read_unchecked(&idev->event));
54693 }
54694 static DEVICE_ATTR_RO(event);
54695
54696@@ -393,7 +394,7 @@ void uio_event_notify(struct uio_info *info)
54697 {
54698 struct uio_device *idev = info->uio_dev;
54699
54700- atomic_inc(&idev->event);
54701+ atomic_inc_unchecked(&idev->event);
54702 wake_up_interruptible(&idev->wait);
54703 kill_fasync(&idev->async_queue, SIGIO, POLL_IN);
54704 }
54705@@ -446,7 +447,7 @@ static int uio_open(struct inode *inode, struct file *filep)
54706 }
54707
54708 listener->dev = idev;
54709- listener->event_count = atomic_read(&idev->event);
54710+ listener->event_count = atomic_read_unchecked(&idev->event);
54711 filep->private_data = listener;
54712
54713 if (idev->info->open) {
54714@@ -497,7 +498,7 @@ static unsigned int uio_poll(struct file *filep, poll_table *wait)
54715 return -EIO;
54716
54717 poll_wait(filep, &idev->wait, wait);
54718- if (listener->event_count != atomic_read(&idev->event))
54719+ if (listener->event_count != atomic_read_unchecked(&idev->event))
54720 return POLLIN | POLLRDNORM;
54721 return 0;
54722 }
54723@@ -522,7 +523,7 @@ static ssize_t uio_read(struct file *filep, char __user *buf,
54724 do {
54725 set_current_state(TASK_INTERRUPTIBLE);
54726
54727- event_count = atomic_read(&idev->event);
54728+ event_count = atomic_read_unchecked(&idev->event);
54729 if (event_count != listener->event_count) {
54730 if (copy_to_user(buf, &event_count, count))
54731 retval = -EFAULT;
54732@@ -579,9 +580,13 @@ static ssize_t uio_write(struct file *filep, const char __user *buf,
54733 static int uio_find_mem_index(struct vm_area_struct *vma)
54734 {
54735 struct uio_device *idev = vma->vm_private_data;
54736+ unsigned long size;
54737
54738 if (vma->vm_pgoff < MAX_UIO_MAPS) {
54739- if (idev->info->mem[vma->vm_pgoff].size == 0)
54740+ size = idev->info->mem[vma->vm_pgoff].size;
54741+ if (size == 0)
54742+ return -1;
54743+ if (vma->vm_end - vma->vm_start > size)
54744 return -1;
54745 return (int)vma->vm_pgoff;
54746 }
54747@@ -813,7 +818,7 @@ int __uio_register_device(struct module *owner,
54748 idev->owner = owner;
54749 idev->info = info;
54750 init_waitqueue_head(&idev->wait);
54751- atomic_set(&idev->event, 0);
54752+ atomic_set_unchecked(&idev->event, 0);
54753
54754 ret = uio_get_minor(idev);
54755 if (ret)
54756diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
54757index 813d4d3..a71934f 100644
54758--- a/drivers/usb/atm/cxacru.c
54759+++ b/drivers/usb/atm/cxacru.c
54760@@ -472,7 +472,7 @@ static ssize_t cxacru_sysfs_store_adsl_config(struct device *dev,
54761 ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
54762 if (ret < 2)
54763 return -EINVAL;
54764- if (index < 0 || index > 0x7f)
54765+ if (index > 0x7f)
54766 return -EINVAL;
54767 pos += tmp;
54768
54769diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
54770index dada014..1d0d517 100644
54771--- a/drivers/usb/atm/usbatm.c
54772+++ b/drivers/usb/atm/usbatm.c
54773@@ -331,7 +331,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54774 if (printk_ratelimit())
54775 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
54776 __func__, vpi, vci);
54777- atomic_inc(&vcc->stats->rx_err);
54778+ atomic_inc_unchecked(&vcc->stats->rx_err);
54779 return;
54780 }
54781
54782@@ -358,7 +358,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54783 if (length > ATM_MAX_AAL5_PDU) {
54784 atm_rldbg(instance, "%s: bogus length %u (vcc: 0x%p)!\n",
54785 __func__, length, vcc);
54786- atomic_inc(&vcc->stats->rx_err);
54787+ atomic_inc_unchecked(&vcc->stats->rx_err);
54788 goto out;
54789 }
54790
54791@@ -367,14 +367,14 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54792 if (sarb->len < pdu_length) {
54793 atm_rldbg(instance, "%s: bogus pdu_length %u (sarb->len: %u, vcc: 0x%p)!\n",
54794 __func__, pdu_length, sarb->len, vcc);
54795- atomic_inc(&vcc->stats->rx_err);
54796+ atomic_inc_unchecked(&vcc->stats->rx_err);
54797 goto out;
54798 }
54799
54800 if (crc32_be(~0, skb_tail_pointer(sarb) - pdu_length, pdu_length) != 0xc704dd7b) {
54801 atm_rldbg(instance, "%s: packet failed crc check (vcc: 0x%p)!\n",
54802 __func__, vcc);
54803- atomic_inc(&vcc->stats->rx_err);
54804+ atomic_inc_unchecked(&vcc->stats->rx_err);
54805 goto out;
54806 }
54807
54808@@ -386,7 +386,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54809 if (printk_ratelimit())
54810 atm_err(instance, "%s: no memory for skb (length: %u)!\n",
54811 __func__, length);
54812- atomic_inc(&vcc->stats->rx_drop);
54813+ atomic_inc_unchecked(&vcc->stats->rx_drop);
54814 goto out;
54815 }
54816
54817@@ -414,7 +414,7 @@ static void usbatm_extract_one_cell(struct usbatm_data *instance, unsigned char
54818
54819 vcc->push(vcc, skb);
54820
54821- atomic_inc(&vcc->stats->rx);
54822+ atomic_inc_unchecked(&vcc->stats->rx);
54823 out:
54824 skb_trim(sarb, 0);
54825 }
54826@@ -612,7 +612,7 @@ static void usbatm_tx_process(unsigned long data)
54827 struct atm_vcc *vcc = UDSL_SKB(skb)->atm.vcc;
54828
54829 usbatm_pop(vcc, skb);
54830- atomic_inc(&vcc->stats->tx);
54831+ atomic_inc_unchecked(&vcc->stats->tx);
54832
54833 skb = skb_dequeue(&instance->sndqueue);
54834 }
54835@@ -756,11 +756,11 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t *pos, char *page
54836 if (!left--)
54837 return sprintf(page,
54838 "AAL5: tx %d ( %d err ), rx %d ( %d err, %d drop )\n",
54839- atomic_read(&atm_dev->stats.aal5.tx),
54840- atomic_read(&atm_dev->stats.aal5.tx_err),
54841- atomic_read(&atm_dev->stats.aal5.rx),
54842- atomic_read(&atm_dev->stats.aal5.rx_err),
54843- atomic_read(&atm_dev->stats.aal5.rx_drop));
54844+ atomic_read_unchecked(&atm_dev->stats.aal5.tx),
54845+ atomic_read_unchecked(&atm_dev->stats.aal5.tx_err),
54846+ atomic_read_unchecked(&atm_dev->stats.aal5.rx),
54847+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_err),
54848+ atomic_read_unchecked(&atm_dev->stats.aal5.rx_drop));
54849
54850 if (!left--) {
54851 if (instance->disconnected)
54852diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c
54853index 2a3bbdf..91d72cf 100644
54854--- a/drivers/usb/core/devices.c
54855+++ b/drivers/usb/core/devices.c
54856@@ -126,7 +126,7 @@ static const char format_endpt[] =
54857 * time it gets called.
54858 */
54859 static struct device_connect_event {
54860- atomic_t count;
54861+ atomic_unchecked_t count;
54862 wait_queue_head_t wait;
54863 } device_event = {
54864 .count = ATOMIC_INIT(1),
54865@@ -164,7 +164,7 @@ static const struct class_info clas_info[] = {
54866
54867 void usbfs_conn_disc_event(void)
54868 {
54869- atomic_add(2, &device_event.count);
54870+ atomic_add_unchecked(2, &device_event.count);
54871 wake_up(&device_event.wait);
54872 }
54873
54874@@ -652,7 +652,7 @@ static unsigned int usb_device_poll(struct file *file,
54875
54876 poll_wait(file, &device_event.wait, wait);
54877
54878- event_count = atomic_read(&device_event.count);
54879+ event_count = atomic_read_unchecked(&device_event.count);
54880 if (file->f_version != event_count) {
54881 file->f_version = event_count;
54882 return POLLIN | POLLRDNORM;
54883diff --git a/drivers/usb/core/devio.c b/drivers/usb/core/devio.c
54884index 1163553..f292679 100644
54885--- a/drivers/usb/core/devio.c
54886+++ b/drivers/usb/core/devio.c
54887@@ -187,7 +187,7 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
54888 struct usb_dev_state *ps = file->private_data;
54889 struct usb_device *dev = ps->dev;
54890 ssize_t ret = 0;
54891- unsigned len;
54892+ size_t len;
54893 loff_t pos;
54894 int i;
54895
54896@@ -229,22 +229,22 @@ static ssize_t usbdev_read(struct file *file, char __user *buf, size_t nbytes,
54897 for (i = 0; nbytes && i < dev->descriptor.bNumConfigurations; i++) {
54898 struct usb_config_descriptor *config =
54899 (struct usb_config_descriptor *)dev->rawdescriptors[i];
54900- unsigned int length = le16_to_cpu(config->wTotalLength);
54901+ size_t length = le16_to_cpu(config->wTotalLength);
54902
54903 if (*ppos < pos + length) {
54904
54905 /* The descriptor may claim to be longer than it
54906 * really is. Here is the actual allocated length. */
54907- unsigned alloclen =
54908+ size_t alloclen =
54909 le16_to_cpu(dev->config[i].desc.wTotalLength);
54910
54911- len = length - (*ppos - pos);
54912+ len = length + pos - *ppos;
54913 if (len > nbytes)
54914 len = nbytes;
54915
54916 /* Simply don't write (skip over) unallocated parts */
54917 if (alloclen > (*ppos - pos)) {
54918- alloclen -= (*ppos - pos);
54919+ alloclen = alloclen + pos - *ppos;
54920 if (copy_to_user(buf,
54921 dev->rawdescriptors[i] + (*ppos - pos),
54922 min(len, alloclen))) {
54923diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
54924index 45a915c..09f9735 100644
54925--- a/drivers/usb/core/hcd.c
54926+++ b/drivers/usb/core/hcd.c
54927@@ -1551,7 +1551,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
54928 */
54929 usb_get_urb(urb);
54930 atomic_inc(&urb->use_count);
54931- atomic_inc(&urb->dev->urbnum);
54932+ atomic_inc_unchecked(&urb->dev->urbnum);
54933 usbmon_urb_submit(&hcd->self, urb);
54934
54935 /* NOTE requirements on root-hub callers (usbfs and the hub
54936@@ -1578,7 +1578,7 @@ int usb_hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
54937 urb->hcpriv = NULL;
54938 INIT_LIST_HEAD(&urb->urb_list);
54939 atomic_dec(&urb->use_count);
54940- atomic_dec(&urb->dev->urbnum);
54941+ atomic_dec_unchecked(&urb->dev->urbnum);
54942 if (atomic_read(&urb->reject))
54943 wake_up(&usb_kill_urb_queue);
54944 usb_put_urb(urb);
54945diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
54946index 3b71516..1f26579 100644
54947--- a/drivers/usb/core/hub.c
54948+++ b/drivers/usb/core/hub.c
54949@@ -26,6 +26,7 @@
54950 #include <linux/mutex.h>
54951 #include <linux/random.h>
54952 #include <linux/pm_qos.h>
54953+#include <linux/grsecurity.h>
54954
54955 #include <asm/uaccess.h>
54956 #include <asm/byteorder.h>
54957@@ -4665,6 +4666,10 @@ static void hub_port_connect(struct usb_hub *hub, int port1, u16 portstatus,
54958 goto done;
54959 return;
54960 }
54961+
54962+ if (gr_handle_new_usb())
54963+ goto done;
54964+
54965 if (hub_is_superspeed(hub->hdev))
54966 unit_load = 150;
54967 else
54968diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
54969index f368d20..0c30ac5 100644
54970--- a/drivers/usb/core/message.c
54971+++ b/drivers/usb/core/message.c
54972@@ -128,7 +128,7 @@ static int usb_internal_control_msg(struct usb_device *usb_dev,
54973 * Return: If successful, the number of bytes transferred. Otherwise, a negative
54974 * error number.
54975 */
54976-int usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54977+int __intentional_overflow(-1) usb_control_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
54978 __u8 requesttype, __u16 value, __u16 index, void *data,
54979 __u16 size, int timeout)
54980 {
54981@@ -180,7 +180,7 @@ EXPORT_SYMBOL_GPL(usb_control_msg);
54982 * If successful, 0. Otherwise a negative error number. The number of actual
54983 * bytes transferred will be stored in the @actual_length parameter.
54984 */
54985-int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54986+int __intentional_overflow(-1) usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
54987 void *data, int len, int *actual_length, int timeout)
54988 {
54989 return usb_bulk_msg(usb_dev, pipe, data, len, actual_length, timeout);
54990@@ -220,7 +220,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
54991 * bytes transferred will be stored in the @actual_length parameter.
54992 *
54993 */
54994-int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54995+int __intentional_overflow(-1) usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
54996 void *data, int len, int *actual_length, int timeout)
54997 {
54998 struct urb *urb;
54999diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
55000index d269738..7340cd7 100644
55001--- a/drivers/usb/core/sysfs.c
55002+++ b/drivers/usb/core/sysfs.c
55003@@ -244,7 +244,7 @@ static ssize_t urbnum_show(struct device *dev, struct device_attribute *attr,
55004 struct usb_device *udev;
55005
55006 udev = to_usb_device(dev);
55007- return sprintf(buf, "%d\n", atomic_read(&udev->urbnum));
55008+ return sprintf(buf, "%d\n", atomic_read_unchecked(&udev->urbnum));
55009 }
55010 static DEVICE_ATTR_RO(urbnum);
55011
55012diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
55013index b1fb9ae..4224885 100644
55014--- a/drivers/usb/core/usb.c
55015+++ b/drivers/usb/core/usb.c
55016@@ -431,7 +431,7 @@ struct usb_device *usb_alloc_dev(struct usb_device *parent,
55017 set_dev_node(&dev->dev, dev_to_node(bus->controller));
55018 dev->state = USB_STATE_ATTACHED;
55019 dev->lpm_disable_count = 1;
55020- atomic_set(&dev->urbnum, 0);
55021+ atomic_set_unchecked(&dev->urbnum, 0);
55022
55023 INIT_LIST_HEAD(&dev->ep0.urb_list);
55024 dev->ep0.desc.bLength = USB_DT_ENDPOINT_SIZE;
55025diff --git a/drivers/usb/early/ehci-dbgp.c b/drivers/usb/early/ehci-dbgp.c
55026index 8cfc319..4868255 100644
55027--- a/drivers/usb/early/ehci-dbgp.c
55028+++ b/drivers/usb/early/ehci-dbgp.c
55029@@ -98,7 +98,8 @@ static inline u32 dbgp_len_update(u32 x, u32 len)
55030
55031 #ifdef CONFIG_KGDB
55032 static struct kgdb_io kgdbdbgp_io_ops;
55033-#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops)
55034+static struct kgdb_io kgdbdbgp_io_ops_console;
55035+#define dbgp_kgdb_mode (dbg_io_ops == &kgdbdbgp_io_ops || dbg_io_ops == &kgdbdbgp_io_ops_console)
55036 #else
55037 #define dbgp_kgdb_mode (0)
55038 #endif
55039@@ -1043,6 +1044,13 @@ static struct kgdb_io kgdbdbgp_io_ops = {
55040 .write_char = kgdbdbgp_write_char,
55041 };
55042
55043+static struct kgdb_io kgdbdbgp_io_ops_console = {
55044+ .name = "kgdbdbgp",
55045+ .read_char = kgdbdbgp_read_char,
55046+ .write_char = kgdbdbgp_write_char,
55047+ .is_console = 1
55048+};
55049+
55050 static int kgdbdbgp_wait_time;
55051
55052 static int __init kgdbdbgp_parse_config(char *str)
55053@@ -1058,8 +1066,10 @@ static int __init kgdbdbgp_parse_config(char *str)
55054 ptr++;
55055 kgdbdbgp_wait_time = simple_strtoul(ptr, &ptr, 10);
55056 }
55057- kgdb_register_io_module(&kgdbdbgp_io_ops);
55058- kgdbdbgp_io_ops.is_console = early_dbgp_console.index != -1;
55059+ if (early_dbgp_console.index != -1)
55060+ kgdb_register_io_module(&kgdbdbgp_io_ops_console);
55061+ else
55062+ kgdb_register_io_module(&kgdbdbgp_io_ops);
55063
55064 return 0;
55065 }
55066diff --git a/drivers/usb/gadget/function/f_uac1.c b/drivers/usb/gadget/function/f_uac1.c
55067index 9719abf..789d5d9 100644
55068--- a/drivers/usb/gadget/function/f_uac1.c
55069+++ b/drivers/usb/gadget/function/f_uac1.c
55070@@ -14,6 +14,7 @@
55071 #include <linux/module.h>
55072 #include <linux/device.h>
55073 #include <linux/atomic.h>
55074+#include <linux/module.h>
55075
55076 #include "u_uac1.h"
55077
55078diff --git a/drivers/usb/gadget/function/u_serial.c b/drivers/usb/gadget/function/u_serial.c
55079index 491082a..dfd7d17 100644
55080--- a/drivers/usb/gadget/function/u_serial.c
55081+++ b/drivers/usb/gadget/function/u_serial.c
55082@@ -729,9 +729,9 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55083 spin_lock_irq(&port->port_lock);
55084
55085 /* already open? Great. */
55086- if (port->port.count) {
55087+ if (atomic_read(&port->port.count)) {
55088 status = 0;
55089- port->port.count++;
55090+ atomic_inc(&port->port.count);
55091
55092 /* currently opening/closing? wait ... */
55093 } else if (port->openclose) {
55094@@ -790,7 +790,7 @@ static int gs_open(struct tty_struct *tty, struct file *file)
55095 tty->driver_data = port;
55096 port->port.tty = tty;
55097
55098- port->port.count = 1;
55099+ atomic_set(&port->port.count, 1);
55100 port->openclose = false;
55101
55102 /* if connected, start the I/O stream */
55103@@ -832,11 +832,11 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55104
55105 spin_lock_irq(&port->port_lock);
55106
55107- if (port->port.count != 1) {
55108- if (port->port.count == 0)
55109+ if (atomic_read(&port->port.count) != 1) {
55110+ if (atomic_read(&port->port.count) == 0)
55111 WARN_ON(1);
55112 else
55113- --port->port.count;
55114+ atomic_dec(&port->port.count);
55115 goto exit;
55116 }
55117
55118@@ -846,7 +846,7 @@ static void gs_close(struct tty_struct *tty, struct file *file)
55119 * and sleep if necessary
55120 */
55121 port->openclose = true;
55122- port->port.count = 0;
55123+ atomic_set(&port->port.count, 0);
55124
55125 gser = port->port_usb;
55126 if (gser && gser->disconnect)
55127@@ -1062,7 +1062,7 @@ static int gs_closed(struct gs_port *port)
55128 int cond;
55129
55130 spin_lock_irq(&port->port_lock);
55131- cond = (port->port.count == 0) && !port->openclose;
55132+ cond = (atomic_read(&port->port.count) == 0) && !port->openclose;
55133 spin_unlock_irq(&port->port_lock);
55134 return cond;
55135 }
55136@@ -1205,7 +1205,7 @@ int gserial_connect(struct gserial *gser, u8 port_num)
55137 /* if it's already open, start I/O ... and notify the serial
55138 * protocol about open/close status (connect/disconnect).
55139 */
55140- if (port->port.count) {
55141+ if (atomic_read(&port->port.count)) {
55142 pr_debug("gserial_connect: start ttyGS%d\n", port->port_num);
55143 gs_start_io(port);
55144 if (gser->connect)
55145@@ -1252,7 +1252,7 @@ void gserial_disconnect(struct gserial *gser)
55146
55147 port->port_usb = NULL;
55148 gser->ioport = NULL;
55149- if (port->port.count > 0 || port->openclose) {
55150+ if (atomic_read(&port->port.count) > 0 || port->openclose) {
55151 wake_up_interruptible(&port->drain_wait);
55152 if (port->port.tty)
55153 tty_hangup(port->port.tty);
55154@@ -1268,7 +1268,7 @@ void gserial_disconnect(struct gserial *gser)
55155
55156 /* finally, free any unused/unusable I/O buffers */
55157 spin_lock_irqsave(&port->port_lock, flags);
55158- if (port->port.count == 0 && !port->openclose)
55159+ if (atomic_read(&port->port.count) == 0 && !port->openclose)
55160 gs_buf_free(&port->port_write_buf);
55161 gs_free_requests(gser->out, &port->read_pool, NULL);
55162 gs_free_requests(gser->out, &port->read_queue, NULL);
55163diff --git a/drivers/usb/gadget/function/u_uac1.c b/drivers/usb/gadget/function/u_uac1.c
55164index c78c841..48fd281 100644
55165--- a/drivers/usb/gadget/function/u_uac1.c
55166+++ b/drivers/usb/gadget/function/u_uac1.c
55167@@ -17,6 +17,7 @@
55168 #include <linux/ctype.h>
55169 #include <linux/random.h>
55170 #include <linux/syscalls.h>
55171+#include <linux/module.h>
55172
55173 #include "u_uac1.h"
55174
55175diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
55176index 7354d01..299478e 100644
55177--- a/drivers/usb/host/ehci-hub.c
55178+++ b/drivers/usb/host/ehci-hub.c
55179@@ -772,7 +772,7 @@ static struct urb *request_single_step_set_feature_urb(
55180 urb->transfer_flags = URB_DIR_IN;
55181 usb_get_urb(urb);
55182 atomic_inc(&urb->use_count);
55183- atomic_inc(&urb->dev->urbnum);
55184+ atomic_inc_unchecked(&urb->dev->urbnum);
55185 urb->setup_dma = dma_map_single(
55186 hcd->self.controller,
55187 urb->setup_packet,
55188@@ -839,7 +839,7 @@ static int ehset_single_step_set_feature(struct usb_hcd *hcd, int port)
55189 urb->status = -EINPROGRESS;
55190 usb_get_urb(urb);
55191 atomic_inc(&urb->use_count);
55192- atomic_inc(&urb->dev->urbnum);
55193+ atomic_inc_unchecked(&urb->dev->urbnum);
55194 retval = submit_single_step_set_feature(hcd, urb, 0);
55195 if (!retval && !wait_for_completion_timeout(&done,
55196 msecs_to_jiffies(2000))) {
55197diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c
55198index 1db0626..4948782 100644
55199--- a/drivers/usb/host/hwa-hc.c
55200+++ b/drivers/usb/host/hwa-hc.c
55201@@ -337,7 +337,10 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55202 struct hwahc *hwahc = container_of(wusbhc, struct hwahc, wusbhc);
55203 struct wahc *wa = &hwahc->wa;
55204 struct device *dev = &wa->usb_iface->dev;
55205- u8 mas_le[UWB_NUM_MAS/8];
55206+ u8 *mas_le = kmalloc(UWB_NUM_MAS/8, GFP_KERNEL);
55207+
55208+ if (mas_le == NULL)
55209+ return -ENOMEM;
55210
55211 /* Set the stream index */
55212 result = usb_control_msg(wa->usb_dev, usb_sndctrlpipe(wa->usb_dev, 0),
55213@@ -356,10 +359,12 @@ static int __hwahc_op_bwa_set(struct wusbhc *wusbhc, s8 stream_index,
55214 WUSB_REQ_SET_WUSB_MAS,
55215 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
55216 0, wa->usb_iface->cur_altsetting->desc.bInterfaceNumber,
55217- mas_le, 32, USB_CTRL_SET_TIMEOUT);
55218+ mas_le, UWB_NUM_MAS/8, USB_CTRL_SET_TIMEOUT);
55219 if (result < 0)
55220 dev_err(dev, "Cannot set WUSB MAS allocation: %d\n", result);
55221 out:
55222+ kfree(mas_le);
55223+
55224 return result;
55225 }
55226
55227diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c
55228index b3d245e..99549ed 100644
55229--- a/drivers/usb/misc/appledisplay.c
55230+++ b/drivers/usb/misc/appledisplay.c
55231@@ -84,7 +84,7 @@ struct appledisplay {
55232 struct mutex sysfslock; /* concurrent read and write */
55233 };
55234
55235-static atomic_t count_displays = ATOMIC_INIT(0);
55236+static atomic_unchecked_t count_displays = ATOMIC_INIT(0);
55237 static struct workqueue_struct *wq;
55238
55239 static void appledisplay_complete(struct urb *urb)
55240@@ -288,7 +288,7 @@ static int appledisplay_probe(struct usb_interface *iface,
55241
55242 /* Register backlight device */
55243 snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
55244- atomic_inc_return(&count_displays) - 1);
55245+ atomic_inc_return_unchecked(&count_displays) - 1);
55246 memset(&props, 0, sizeof(struct backlight_properties));
55247 props.type = BACKLIGHT_RAW;
55248 props.max_brightness = 0xff;
55249diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
55250index 3806e70..55c508b 100644
55251--- a/drivers/usb/serial/console.c
55252+++ b/drivers/usb/serial/console.c
55253@@ -126,7 +126,7 @@ static int usb_console_setup(struct console *co, char *options)
55254
55255 info->port = port;
55256
55257- ++port->port.count;
55258+ atomic_inc(&port->port.count);
55259 if (!test_bit(ASYNCB_INITIALIZED, &port->port.flags)) {
55260 if (serial->type->set_termios) {
55261 /*
55262@@ -175,7 +175,7 @@ static int usb_console_setup(struct console *co, char *options)
55263 }
55264 /* Now that any required fake tty operations are completed restore
55265 * the tty port count */
55266- --port->port.count;
55267+ atomic_dec(&port->port.count);
55268 /* The console is special in terms of closing the device so
55269 * indicate this port is now acting as a system console. */
55270 port->port.console = 1;
55271@@ -188,7 +188,7 @@ static int usb_console_setup(struct console *co, char *options)
55272 put_tty:
55273 tty_kref_put(tty);
55274 reset_open_count:
55275- port->port.count = 0;
55276+ atomic_set(&port->port.count, 0);
55277 usb_autopm_put_interface(serial->interface);
55278 error_get_interface:
55279 usb_serial_put(serial);
55280@@ -199,7 +199,7 @@ static int usb_console_setup(struct console *co, char *options)
55281 static void usb_console_write(struct console *co,
55282 const char *buf, unsigned count)
55283 {
55284- static struct usbcons_info *info = &usbcons_info;
55285+ struct usbcons_info *info = &usbcons_info;
55286 struct usb_serial_port *port = info->port;
55287 struct usb_serial *serial;
55288 int retval = -ENODEV;
55289diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
55290index 307e339..6aa97cb 100644
55291--- a/drivers/usb/storage/usb.h
55292+++ b/drivers/usb/storage/usb.h
55293@@ -63,7 +63,7 @@ struct us_unusual_dev {
55294 __u8 useProtocol;
55295 __u8 useTransport;
55296 int (*initFunction)(struct us_data *);
55297-};
55298+} __do_const;
55299
55300
55301 /* Dynamic bitflag definitions (us->dflags): used in set_bit() etc. */
55302diff --git a/drivers/usb/usbip/vhci.h b/drivers/usb/usbip/vhci.h
55303index a863a98..d272795 100644
55304--- a/drivers/usb/usbip/vhci.h
55305+++ b/drivers/usb/usbip/vhci.h
55306@@ -83,7 +83,7 @@ struct vhci_hcd {
55307 unsigned resuming:1;
55308 unsigned long re_timeout;
55309
55310- atomic_t seqnum;
55311+ atomic_unchecked_t seqnum;
55312
55313 /*
55314 * NOTE:
55315diff --git a/drivers/usb/usbip/vhci_hcd.c b/drivers/usb/usbip/vhci_hcd.c
55316index 11f6f61..1087910 100644
55317--- a/drivers/usb/usbip/vhci_hcd.c
55318+++ b/drivers/usb/usbip/vhci_hcd.c
55319@@ -440,7 +440,7 @@ static void vhci_tx_urb(struct urb *urb)
55320
55321 spin_lock(&vdev->priv_lock);
55322
55323- priv->seqnum = atomic_inc_return(&the_controller->seqnum);
55324+ priv->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
55325 if (priv->seqnum == 0xffff)
55326 dev_info(&urb->dev->dev, "seqnum max\n");
55327
55328@@ -685,7 +685,7 @@ static int vhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status)
55329 return -ENOMEM;
55330 }
55331
55332- unlink->seqnum = atomic_inc_return(&the_controller->seqnum);
55333+ unlink->seqnum = atomic_inc_return_unchecked(&the_controller->seqnum);
55334 if (unlink->seqnum == 0xffff)
55335 pr_info("seqnum max\n");
55336
55337@@ -889,7 +889,7 @@ static int vhci_start(struct usb_hcd *hcd)
55338 vdev->rhport = rhport;
55339 }
55340
55341- atomic_set(&vhci->seqnum, 0);
55342+ atomic_set_unchecked(&vhci->seqnum, 0);
55343 spin_lock_init(&vhci->lock);
55344
55345 hcd->power_budget = 0; /* no limit */
55346diff --git a/drivers/usb/usbip/vhci_rx.c b/drivers/usb/usbip/vhci_rx.c
55347index 00e4a54..d676f85 100644
55348--- a/drivers/usb/usbip/vhci_rx.c
55349+++ b/drivers/usb/usbip/vhci_rx.c
55350@@ -80,7 +80,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
55351 if (!urb) {
55352 pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
55353 pr_info("max seqnum %d\n",
55354- atomic_read(&the_controller->seqnum));
55355+ atomic_read_unchecked(&the_controller->seqnum));
55356 usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
55357 return;
55358 }
55359diff --git a/drivers/usb/wusbcore/wa-hc.h b/drivers/usb/wusbcore/wa-hc.h
55360index edc7267..9f65ce2 100644
55361--- a/drivers/usb/wusbcore/wa-hc.h
55362+++ b/drivers/usb/wusbcore/wa-hc.h
55363@@ -240,7 +240,7 @@ struct wahc {
55364 spinlock_t xfer_list_lock;
55365 struct work_struct xfer_enqueue_work;
55366 struct work_struct xfer_error_work;
55367- atomic_t xfer_id_count;
55368+ atomic_unchecked_t xfer_id_count;
55369
55370 kernel_ulong_t quirks;
55371 };
55372@@ -305,7 +305,7 @@ static inline void wa_init(struct wahc *wa)
55373 INIT_WORK(&wa->xfer_enqueue_work, wa_urb_enqueue_run);
55374 INIT_WORK(&wa->xfer_error_work, wa_process_errored_transfers_run);
55375 wa->dto_in_use = 0;
55376- atomic_set(&wa->xfer_id_count, 1);
55377+ atomic_set_unchecked(&wa->xfer_id_count, 1);
55378 /* init the buf in URBs */
55379 for (index = 0; index < WA_MAX_BUF_IN_URBS; ++index)
55380 usb_init_urb(&(wa->buf_in_urbs[index]));
55381diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
55382index 69af4fd..da390d7 100644
55383--- a/drivers/usb/wusbcore/wa-xfer.c
55384+++ b/drivers/usb/wusbcore/wa-xfer.c
55385@@ -314,7 +314,7 @@ static void wa_xfer_completion(struct wa_xfer *xfer)
55386 */
55387 static void wa_xfer_id_init(struct wa_xfer *xfer)
55388 {
55389- xfer->id = atomic_add_return(1, &xfer->wa->xfer_id_count);
55390+ xfer->id = atomic_add_return_unchecked(1, &xfer->wa->xfer_id_count);
55391 }
55392
55393 /* Return the xfer's ID. */
55394diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
55395index 4cde855..b23d05d 100644
55396--- a/drivers/vfio/vfio.c
55397+++ b/drivers/vfio/vfio.c
55398@@ -518,7 +518,7 @@ static int vfio_group_nb_add_dev(struct vfio_group *group, struct device *dev)
55399 return 0;
55400
55401 /* TODO Prevent device auto probing */
55402- WARN("Device %s added to live group %d!\n", dev_name(dev),
55403+ WARN(1, "Device %s added to live group %d!\n", dev_name(dev),
55404 iommu_group_id(group->iommu_group));
55405
55406 return 0;
55407diff --git a/drivers/vhost/vringh.c b/drivers/vhost/vringh.c
55408index 3bb02c6..a01ff38 100644
55409--- a/drivers/vhost/vringh.c
55410+++ b/drivers/vhost/vringh.c
55411@@ -551,7 +551,7 @@ static inline void __vringh_notify_disable(struct vringh *vrh,
55412 static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio16 *p)
55413 {
55414 __virtio16 v = 0;
55415- int rc = get_user(v, (__force __virtio16 __user *)p);
55416+ int rc = get_user(v, (__force_user __virtio16 *)p);
55417 *val = vringh16_to_cpu(vrh, v);
55418 return rc;
55419 }
55420@@ -559,12 +559,12 @@ static inline int getu16_user(const struct vringh *vrh, u16 *val, const __virtio
55421 static inline int putu16_user(const struct vringh *vrh, __virtio16 *p, u16 val)
55422 {
55423 __virtio16 v = cpu_to_vringh16(vrh, val);
55424- return put_user(v, (__force __virtio16 __user *)p);
55425+ return put_user(v, (__force_user __virtio16 *)p);
55426 }
55427
55428 static inline int copydesc_user(void *dst, const void *src, size_t len)
55429 {
55430- return copy_from_user(dst, (__force void __user *)src, len) ?
55431+ return copy_from_user(dst, (void __force_user *)src, len) ?
55432 -EFAULT : 0;
55433 }
55434
55435@@ -572,19 +572,19 @@ static inline int putused_user(struct vring_used_elem *dst,
55436 const struct vring_used_elem *src,
55437 unsigned int num)
55438 {
55439- return copy_to_user((__force void __user *)dst, src,
55440+ return copy_to_user((void __force_user *)dst, src,
55441 sizeof(*dst) * num) ? -EFAULT : 0;
55442 }
55443
55444 static inline int xfer_from_user(void *src, void *dst, size_t len)
55445 {
55446- return copy_from_user(dst, (__force void __user *)src, len) ?
55447+ return copy_from_user(dst, (void __force_user *)src, len) ?
55448 -EFAULT : 0;
55449 }
55450
55451 static inline int xfer_to_user(void *dst, void *src, size_t len)
55452 {
55453- return copy_to_user((__force void __user *)dst, src, len) ?
55454+ return copy_to_user((void __force_user *)dst, src, len) ?
55455 -EFAULT : 0;
55456 }
55457
55458@@ -621,9 +621,9 @@ int vringh_init_user(struct vringh *vrh, u64 features,
55459 vrh->last_used_idx = 0;
55460 vrh->vring.num = num;
55461 /* vring expects kernel addresses, but only used via accessors. */
55462- vrh->vring.desc = (__force struct vring_desc *)desc;
55463- vrh->vring.avail = (__force struct vring_avail *)avail;
55464- vrh->vring.used = (__force struct vring_used *)used;
55465+ vrh->vring.desc = (__force_kernel struct vring_desc *)desc;
55466+ vrh->vring.avail = (__force_kernel struct vring_avail *)avail;
55467+ vrh->vring.used = (__force_kernel struct vring_used *)used;
55468 return 0;
55469 }
55470 EXPORT_SYMBOL(vringh_init_user);
55471@@ -826,7 +826,7 @@ static inline int getu16_kern(const struct vringh *vrh,
55472
55473 static inline int putu16_kern(const struct vringh *vrh, __virtio16 *p, u16 val)
55474 {
55475- ACCESS_ONCE(*p) = cpu_to_vringh16(vrh, val);
55476+ ACCESS_ONCE_RW(*p) = cpu_to_vringh16(vrh, val);
55477 return 0;
55478 }
55479
55480diff --git a/drivers/video/backlight/kb3886_bl.c b/drivers/video/backlight/kb3886_bl.c
55481index 84a110a..96312c3 100644
55482--- a/drivers/video/backlight/kb3886_bl.c
55483+++ b/drivers/video/backlight/kb3886_bl.c
55484@@ -78,7 +78,7 @@ static struct kb3886bl_machinfo *bl_machinfo;
55485 static unsigned long kb3886bl_flags;
55486 #define KB3886BL_SUSPENDED 0x01
55487
55488-static struct dmi_system_id kb3886bl_device_table[] __initdata = {
55489+static const struct dmi_system_id kb3886bl_device_table[] __initconst = {
55490 {
55491 .ident = "Sahara Touch-iT",
55492 .matches = {
55493diff --git a/drivers/video/fbdev/arcfb.c b/drivers/video/fbdev/arcfb.c
55494index 1b0b233..6f34c2c 100644
55495--- a/drivers/video/fbdev/arcfb.c
55496+++ b/drivers/video/fbdev/arcfb.c
55497@@ -458,7 +458,7 @@ static ssize_t arcfb_write(struct fb_info *info, const char __user *buf,
55498 return -ENOSPC;
55499
55500 err = 0;
55501- if ((count + p) > fbmemlength) {
55502+ if (count > (fbmemlength - p)) {
55503 count = fbmemlength - p;
55504 err = -ENOSPC;
55505 }
55506diff --git a/drivers/video/fbdev/aty/aty128fb.c b/drivers/video/fbdev/aty/aty128fb.c
55507index aedf2fb..47c9aca 100644
55508--- a/drivers/video/fbdev/aty/aty128fb.c
55509+++ b/drivers/video/fbdev/aty/aty128fb.c
55510@@ -149,7 +149,7 @@ enum {
55511 };
55512
55513 /* Must match above enum */
55514-static char * const r128_family[] = {
55515+static const char * const r128_family[] = {
55516 "AGP",
55517 "PCI",
55518 "PRO AGP",
55519diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
55520index 8789e48..698fe4c 100644
55521--- a/drivers/video/fbdev/aty/atyfb_base.c
55522+++ b/drivers/video/fbdev/aty/atyfb_base.c
55523@@ -1326,10 +1326,14 @@ static int atyfb_set_par(struct fb_info *info)
55524 par->accel_flags = var->accel_flags; /* hack */
55525
55526 if (var->accel_flags) {
55527- info->fbops->fb_sync = atyfb_sync;
55528+ pax_open_kernel();
55529+ *(void **)&info->fbops->fb_sync = atyfb_sync;
55530+ pax_close_kernel();
55531 info->flags &= ~FBINFO_HWACCEL_DISABLED;
55532 } else {
55533- info->fbops->fb_sync = NULL;
55534+ pax_open_kernel();
55535+ *(void **)&info->fbops->fb_sync = NULL;
55536+ pax_close_kernel();
55537 info->flags |= FBINFO_HWACCEL_DISABLED;
55538 }
55539
55540diff --git a/drivers/video/fbdev/aty/mach64_cursor.c b/drivers/video/fbdev/aty/mach64_cursor.c
55541index 2fa0317..4983f2a 100644
55542--- a/drivers/video/fbdev/aty/mach64_cursor.c
55543+++ b/drivers/video/fbdev/aty/mach64_cursor.c
55544@@ -8,6 +8,7 @@
55545 #include "../core/fb_draw.h"
55546
55547 #include <asm/io.h>
55548+#include <asm/pgtable.h>
55549
55550 #ifdef __sparc__
55551 #include <asm/fbio.h>
55552@@ -218,7 +219,9 @@ int aty_init_cursor(struct fb_info *info)
55553 info->sprite.buf_align = 16; /* and 64 lines tall. */
55554 info->sprite.flags = FB_PIXMAP_IO;
55555
55556- info->fbops->fb_cursor = atyfb_cursor;
55557+ pax_open_kernel();
55558+ *(void **)&info->fbops->fb_cursor = atyfb_cursor;
55559+ pax_close_kernel();
55560
55561 return 0;
55562 }
55563diff --git a/drivers/video/fbdev/core/fb_defio.c b/drivers/video/fbdev/core/fb_defio.c
55564index d6cab1f..112f680 100644
55565--- a/drivers/video/fbdev/core/fb_defio.c
55566+++ b/drivers/video/fbdev/core/fb_defio.c
55567@@ -207,7 +207,9 @@ void fb_deferred_io_init(struct fb_info *info)
55568
55569 BUG_ON(!fbdefio);
55570 mutex_init(&fbdefio->lock);
55571- info->fbops->fb_mmap = fb_deferred_io_mmap;
55572+ pax_open_kernel();
55573+ *(void **)&info->fbops->fb_mmap = fb_deferred_io_mmap;
55574+ pax_close_kernel();
55575 INIT_DELAYED_WORK(&info->deferred_work, fb_deferred_io_work);
55576 INIT_LIST_HEAD(&fbdefio->pagelist);
55577 if (fbdefio->delay == 0) /* set a default of 1 s */
55578@@ -238,7 +240,7 @@ void fb_deferred_io_cleanup(struct fb_info *info)
55579 page->mapping = NULL;
55580 }
55581
55582- info->fbops->fb_mmap = NULL;
55583+ *(void **)&info->fbops->fb_mmap = NULL;
55584 mutex_destroy(&fbdefio->lock);
55585 }
55586 EXPORT_SYMBOL_GPL(fb_deferred_io_cleanup);
55587diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
55588index 0705d88..d9429bf 100644
55589--- a/drivers/video/fbdev/core/fbmem.c
55590+++ b/drivers/video/fbdev/core/fbmem.c
55591@@ -1301,7 +1301,7 @@ static int do_fscreeninfo_to_user(struct fb_fix_screeninfo *fix,
55592 __u32 data;
55593 int err;
55594
55595- err = copy_to_user(&fix32->id, &fix->id, sizeof(fix32->id));
55596+ err = copy_to_user(fix32->id, &fix->id, sizeof(fix32->id));
55597
55598 data = (__u32) (unsigned long) fix->smem_start;
55599 err |= put_user(data, &fix32->smem_start);
55600diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
55601index 4254336..282567e 100644
55602--- a/drivers/video/fbdev/hyperv_fb.c
55603+++ b/drivers/video/fbdev/hyperv_fb.c
55604@@ -240,7 +240,7 @@ static uint screen_fb_size;
55605 static inline int synthvid_send(struct hv_device *hdev,
55606 struct synthvid_msg *msg)
55607 {
55608- static atomic64_t request_id = ATOMIC64_INIT(0);
55609+ static atomic64_unchecked_t request_id = ATOMIC64_INIT(0);
55610 int ret;
55611
55612 msg->pipe_hdr.type = PIPE_MSG_DATA;
55613@@ -248,7 +248,7 @@ static inline int synthvid_send(struct hv_device *hdev,
55614
55615 ret = vmbus_sendpacket(hdev->channel, msg,
55616 msg->vid_hdr.size + sizeof(struct pipe_msg_hdr),
55617- atomic64_inc_return(&request_id),
55618+ atomic64_inc_return_unchecked(&request_id),
55619 VM_PKT_DATA_INBAND, 0);
55620
55621 if (ret)
55622diff --git a/drivers/video/fbdev/i810/i810_accel.c b/drivers/video/fbdev/i810/i810_accel.c
55623index 7672d2e..b56437f 100644
55624--- a/drivers/video/fbdev/i810/i810_accel.c
55625+++ b/drivers/video/fbdev/i810/i810_accel.c
55626@@ -73,6 +73,7 @@ static inline int wait_for_space(struct fb_info *info, u32 space)
55627 }
55628 }
55629 printk("ringbuffer lockup!!!\n");
55630+ printk("head:%u tail:%u iring.size:%u space:%u\n", head, tail, par->iring.size, space);
55631 i810_report_error(mmio);
55632 par->dev_flags |= LOCKUP;
55633 info->pixmap.scan_align = 1;
55634diff --git a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
55635index a01147f..5d896f8 100644
55636--- a/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
55637+++ b/drivers/video/fbdev/matrox/matroxfb_DAC1064.c
55638@@ -1088,14 +1088,20 @@ static void MGAG100_restore(struct matrox_fb_info *minfo)
55639
55640 #ifdef CONFIG_FB_MATROX_MYSTIQUE
55641 struct matrox_switch matrox_mystique = {
55642- MGA1064_preinit, MGA1064_reset, MGA1064_init, MGA1064_restore,
55643+ .preinit = MGA1064_preinit,
55644+ .reset = MGA1064_reset,
55645+ .init = MGA1064_init,
55646+ .restore = MGA1064_restore,
55647 };
55648 EXPORT_SYMBOL(matrox_mystique);
55649 #endif
55650
55651 #ifdef CONFIG_FB_MATROX_G
55652 struct matrox_switch matrox_G100 = {
55653- MGAG100_preinit, MGAG100_reset, MGAG100_init, MGAG100_restore,
55654+ .preinit = MGAG100_preinit,
55655+ .reset = MGAG100_reset,
55656+ .init = MGAG100_init,
55657+ .restore = MGAG100_restore,
55658 };
55659 EXPORT_SYMBOL(matrox_G100);
55660 #endif
55661diff --git a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
55662index 195ad7c..09743fc 100644
55663--- a/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
55664+++ b/drivers/video/fbdev/matrox/matroxfb_Ti3026.c
55665@@ -738,7 +738,10 @@ static int Ti3026_preinit(struct matrox_fb_info *minfo)
55666 }
55667
55668 struct matrox_switch matrox_millennium = {
55669- Ti3026_preinit, Ti3026_reset, Ti3026_init, Ti3026_restore
55670+ .preinit = Ti3026_preinit,
55671+ .reset = Ti3026_reset,
55672+ .init = Ti3026_init,
55673+ .restore = Ti3026_restore
55674 };
55675 EXPORT_SYMBOL(matrox_millennium);
55676 #endif
55677diff --git a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
55678index fe92eed..106e085 100644
55679--- a/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
55680+++ b/drivers/video/fbdev/mb862xx/mb862xxfb_accel.c
55681@@ -312,14 +312,18 @@ void mb862xxfb_init_accel(struct fb_info *info, int xres)
55682 struct mb862xxfb_par *par = info->par;
55683
55684 if (info->var.bits_per_pixel == 32) {
55685- info->fbops->fb_fillrect = cfb_fillrect;
55686- info->fbops->fb_copyarea = cfb_copyarea;
55687- info->fbops->fb_imageblit = cfb_imageblit;
55688+ pax_open_kernel();
55689+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
55690+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
55691+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
55692+ pax_close_kernel();
55693 } else {
55694 outreg(disp, GC_L0EM, 3);
55695- info->fbops->fb_fillrect = mb86290fb_fillrect;
55696- info->fbops->fb_copyarea = mb86290fb_copyarea;
55697- info->fbops->fb_imageblit = mb86290fb_imageblit;
55698+ pax_open_kernel();
55699+ *(void **)&info->fbops->fb_fillrect = mb86290fb_fillrect;
55700+ *(void **)&info->fbops->fb_copyarea = mb86290fb_copyarea;
55701+ *(void **)&info->fbops->fb_imageblit = mb86290fb_imageblit;
55702+ pax_close_kernel();
55703 }
55704 outreg(draw, GDC_REG_DRAW_BASE, 0);
55705 outreg(draw, GDC_REG_MODE_MISC, 0x8000);
55706diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c
55707index def0412..fed6529 100644
55708--- a/drivers/video/fbdev/nvidia/nvidia.c
55709+++ b/drivers/video/fbdev/nvidia/nvidia.c
55710@@ -669,19 +669,23 @@ static int nvidiafb_set_par(struct fb_info *info)
55711 info->fix.line_length = (info->var.xres_virtual *
55712 info->var.bits_per_pixel) >> 3;
55713 if (info->var.accel_flags) {
55714- info->fbops->fb_imageblit = nvidiafb_imageblit;
55715- info->fbops->fb_fillrect = nvidiafb_fillrect;
55716- info->fbops->fb_copyarea = nvidiafb_copyarea;
55717- info->fbops->fb_sync = nvidiafb_sync;
55718+ pax_open_kernel();
55719+ *(void **)&info->fbops->fb_imageblit = nvidiafb_imageblit;
55720+ *(void **)&info->fbops->fb_fillrect = nvidiafb_fillrect;
55721+ *(void **)&info->fbops->fb_copyarea = nvidiafb_copyarea;
55722+ *(void **)&info->fbops->fb_sync = nvidiafb_sync;
55723+ pax_close_kernel();
55724 info->pixmap.scan_align = 4;
55725 info->flags &= ~FBINFO_HWACCEL_DISABLED;
55726 info->flags |= FBINFO_READS_FAST;
55727 NVResetGraphics(info);
55728 } else {
55729- info->fbops->fb_imageblit = cfb_imageblit;
55730- info->fbops->fb_fillrect = cfb_fillrect;
55731- info->fbops->fb_copyarea = cfb_copyarea;
55732- info->fbops->fb_sync = NULL;
55733+ pax_open_kernel();
55734+ *(void **)&info->fbops->fb_imageblit = cfb_imageblit;
55735+ *(void **)&info->fbops->fb_fillrect = cfb_fillrect;
55736+ *(void **)&info->fbops->fb_copyarea = cfb_copyarea;
55737+ *(void **)&info->fbops->fb_sync = NULL;
55738+ pax_close_kernel();
55739 info->pixmap.scan_align = 1;
55740 info->flags |= FBINFO_HWACCEL_DISABLED;
55741 info->flags &= ~FBINFO_READS_FAST;
55742@@ -1173,8 +1177,11 @@ static int nvidia_set_fbinfo(struct fb_info *info)
55743 info->pixmap.size = 8 * 1024;
55744 info->pixmap.flags = FB_PIXMAP_SYSTEM;
55745
55746- if (!hwcur)
55747- info->fbops->fb_cursor = NULL;
55748+ if (!hwcur) {
55749+ pax_open_kernel();
55750+ *(void **)&info->fbops->fb_cursor = NULL;
55751+ pax_close_kernel();
55752+ }
55753
55754 info->var.accel_flags = (!noaccel);
55755
55756diff --git a/drivers/video/fbdev/omap2/dss/display.c b/drivers/video/fbdev/omap2/dss/display.c
55757index 2412a0d..294215b 100644
55758--- a/drivers/video/fbdev/omap2/dss/display.c
55759+++ b/drivers/video/fbdev/omap2/dss/display.c
55760@@ -161,12 +161,14 @@ int omapdss_register_display(struct omap_dss_device *dssdev)
55761 if (dssdev->name == NULL)
55762 dssdev->name = dssdev->alias;
55763
55764+ pax_open_kernel();
55765 if (drv && drv->get_resolution == NULL)
55766- drv->get_resolution = omapdss_default_get_resolution;
55767+ *(void **)&drv->get_resolution = omapdss_default_get_resolution;
55768 if (drv && drv->get_recommended_bpp == NULL)
55769- drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
55770+ *(void **)&drv->get_recommended_bpp = omapdss_default_get_recommended_bpp;
55771 if (drv && drv->get_timings == NULL)
55772- drv->get_timings = omapdss_default_get_timings;
55773+ *(void **)&drv->get_timings = omapdss_default_get_timings;
55774+ pax_close_kernel();
55775
55776 mutex_lock(&panel_list_mutex);
55777 list_add_tail(&dssdev->panel_list, &panel_list);
55778diff --git a/drivers/video/fbdev/s1d13xxxfb.c b/drivers/video/fbdev/s1d13xxxfb.c
55779index 83433cb..71e9b98 100644
55780--- a/drivers/video/fbdev/s1d13xxxfb.c
55781+++ b/drivers/video/fbdev/s1d13xxxfb.c
55782@@ -881,8 +881,10 @@ static int s1d13xxxfb_probe(struct platform_device *pdev)
55783
55784 switch(prod_id) {
55785 case S1D13506_PROD_ID: /* activate acceleration */
55786- s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
55787- s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
55788+ pax_open_kernel();
55789+ *(void **)&s1d13xxxfb_fbops.fb_fillrect = s1d13xxxfb_bitblt_solidfill;
55790+ *(void **)&s1d13xxxfb_fbops.fb_copyarea = s1d13xxxfb_bitblt_copyarea;
55791+ pax_close_kernel();
55792 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
55793 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
55794 break;
55795diff --git a/drivers/video/fbdev/sh_mobile_lcdcfb.c b/drivers/video/fbdev/sh_mobile_lcdcfb.c
55796index d3013cd..95b8285 100644
55797--- a/drivers/video/fbdev/sh_mobile_lcdcfb.c
55798+++ b/drivers/video/fbdev/sh_mobile_lcdcfb.c
55799@@ -439,9 +439,9 @@ static unsigned long lcdc_sys_read_data(void *handle)
55800 }
55801
55802 static struct sh_mobile_lcdc_sys_bus_ops sh_mobile_lcdc_sys_bus_ops = {
55803- lcdc_sys_write_index,
55804- lcdc_sys_write_data,
55805- lcdc_sys_read_data,
55806+ .write_index = lcdc_sys_write_index,
55807+ .write_data = lcdc_sys_write_data,
55808+ .read_data = lcdc_sys_read_data,
55809 };
55810
55811 static int sh_mobile_lcdc_sginit(struct fb_info *info,
55812diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c
55813index 9279e5f..d5f5276 100644
55814--- a/drivers/video/fbdev/smscufx.c
55815+++ b/drivers/video/fbdev/smscufx.c
55816@@ -1174,7 +1174,9 @@ static int ufx_ops_release(struct fb_info *info, int user)
55817 fb_deferred_io_cleanup(info);
55818 kfree(info->fbdefio);
55819 info->fbdefio = NULL;
55820- info->fbops->fb_mmap = ufx_ops_mmap;
55821+ pax_open_kernel();
55822+ *(void **)&info->fbops->fb_mmap = ufx_ops_mmap;
55823+ pax_close_kernel();
55824 }
55825
55826 pr_debug("released /dev/fb%d user=%d count=%d",
55827diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c
55828index ff2b873..626a8d5 100644
55829--- a/drivers/video/fbdev/udlfb.c
55830+++ b/drivers/video/fbdev/udlfb.c
55831@@ -623,11 +623,11 @@ static int dlfb_handle_damage(struct dlfb_data *dev, int x, int y,
55832 dlfb_urb_completion(urb);
55833
55834 error:
55835- atomic_add(bytes_sent, &dev->bytes_sent);
55836- atomic_add(bytes_identical, &dev->bytes_identical);
55837- atomic_add(width*height*2, &dev->bytes_rendered);
55838+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
55839+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
55840+ atomic_add_unchecked(width*height*2, &dev->bytes_rendered);
55841 end_cycles = get_cycles();
55842- atomic_add(((unsigned int) ((end_cycles - start_cycles)
55843+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
55844 >> 10)), /* Kcycles */
55845 &dev->cpu_kcycles_used);
55846
55847@@ -748,11 +748,11 @@ static void dlfb_dpy_deferred_io(struct fb_info *info,
55848 dlfb_urb_completion(urb);
55849
55850 error:
55851- atomic_add(bytes_sent, &dev->bytes_sent);
55852- atomic_add(bytes_identical, &dev->bytes_identical);
55853- atomic_add(bytes_rendered, &dev->bytes_rendered);
55854+ atomic_add_unchecked(bytes_sent, &dev->bytes_sent);
55855+ atomic_add_unchecked(bytes_identical, &dev->bytes_identical);
55856+ atomic_add_unchecked(bytes_rendered, &dev->bytes_rendered);
55857 end_cycles = get_cycles();
55858- atomic_add(((unsigned int) ((end_cycles - start_cycles)
55859+ atomic_add_unchecked(((unsigned int) ((end_cycles - start_cycles)
55860 >> 10)), /* Kcycles */
55861 &dev->cpu_kcycles_used);
55862 }
55863@@ -991,7 +991,9 @@ static int dlfb_ops_release(struct fb_info *info, int user)
55864 fb_deferred_io_cleanup(info);
55865 kfree(info->fbdefio);
55866 info->fbdefio = NULL;
55867- info->fbops->fb_mmap = dlfb_ops_mmap;
55868+ pax_open_kernel();
55869+ *(void **)&info->fbops->fb_mmap = dlfb_ops_mmap;
55870+ pax_close_kernel();
55871 }
55872
55873 pr_warn("released /dev/fb%d user=%d count=%d\n",
55874@@ -1373,7 +1375,7 @@ static ssize_t metrics_bytes_rendered_show(struct device *fbdev,
55875 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55876 struct dlfb_data *dev = fb_info->par;
55877 return snprintf(buf, PAGE_SIZE, "%u\n",
55878- atomic_read(&dev->bytes_rendered));
55879+ atomic_read_unchecked(&dev->bytes_rendered));
55880 }
55881
55882 static ssize_t metrics_bytes_identical_show(struct device *fbdev,
55883@@ -1381,7 +1383,7 @@ static ssize_t metrics_bytes_identical_show(struct device *fbdev,
55884 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55885 struct dlfb_data *dev = fb_info->par;
55886 return snprintf(buf, PAGE_SIZE, "%u\n",
55887- atomic_read(&dev->bytes_identical));
55888+ atomic_read_unchecked(&dev->bytes_identical));
55889 }
55890
55891 static ssize_t metrics_bytes_sent_show(struct device *fbdev,
55892@@ -1389,7 +1391,7 @@ static ssize_t metrics_bytes_sent_show(struct device *fbdev,
55893 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55894 struct dlfb_data *dev = fb_info->par;
55895 return snprintf(buf, PAGE_SIZE, "%u\n",
55896- atomic_read(&dev->bytes_sent));
55897+ atomic_read_unchecked(&dev->bytes_sent));
55898 }
55899
55900 static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
55901@@ -1397,7 +1399,7 @@ static ssize_t metrics_cpu_kcycles_used_show(struct device *fbdev,
55902 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55903 struct dlfb_data *dev = fb_info->par;
55904 return snprintf(buf, PAGE_SIZE, "%u\n",
55905- atomic_read(&dev->cpu_kcycles_used));
55906+ atomic_read_unchecked(&dev->cpu_kcycles_used));
55907 }
55908
55909 static ssize_t edid_show(
55910@@ -1457,10 +1459,10 @@ static ssize_t metrics_reset_store(struct device *fbdev,
55911 struct fb_info *fb_info = dev_get_drvdata(fbdev);
55912 struct dlfb_data *dev = fb_info->par;
55913
55914- atomic_set(&dev->bytes_rendered, 0);
55915- atomic_set(&dev->bytes_identical, 0);
55916- atomic_set(&dev->bytes_sent, 0);
55917- atomic_set(&dev->cpu_kcycles_used, 0);
55918+ atomic_set_unchecked(&dev->bytes_rendered, 0);
55919+ atomic_set_unchecked(&dev->bytes_identical, 0);
55920+ atomic_set_unchecked(&dev->bytes_sent, 0);
55921+ atomic_set_unchecked(&dev->cpu_kcycles_used, 0);
55922
55923 return count;
55924 }
55925diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c
55926index d32d1c4..46722e6 100644
55927--- a/drivers/video/fbdev/uvesafb.c
55928+++ b/drivers/video/fbdev/uvesafb.c
55929@@ -19,6 +19,7 @@
55930 #include <linux/io.h>
55931 #include <linux/mutex.h>
55932 #include <linux/slab.h>
55933+#include <linux/moduleloader.h>
55934 #include <video/edid.h>
55935 #include <video/uvesafb.h>
55936 #ifdef CONFIG_X86
55937@@ -565,10 +566,32 @@ static int uvesafb_vbe_getpmi(struct uvesafb_ktask *task,
55938 if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) {
55939 par->pmi_setpal = par->ypan = 0;
55940 } else {
55941+
55942+#ifdef CONFIG_PAX_KERNEXEC
55943+#ifdef CONFIG_MODULES
55944+ par->pmi_code = module_alloc_exec((u16)task->t.regs.ecx);
55945+#endif
55946+ if (!par->pmi_code) {
55947+ par->pmi_setpal = par->ypan = 0;
55948+ return 0;
55949+ }
55950+#endif
55951+
55952 par->pmi_base = (u16 *)phys_to_virt(((u32)task->t.regs.es << 4)
55953 + task->t.regs.edi);
55954+
55955+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
55956+ pax_open_kernel();
55957+ memcpy(par->pmi_code, par->pmi_base, (u16)task->t.regs.ecx);
55958+ pax_close_kernel();
55959+
55960+ par->pmi_start = ktva_ktla(par->pmi_code + par->pmi_base[1]);
55961+ par->pmi_pal = ktva_ktla(par->pmi_code + par->pmi_base[2]);
55962+#else
55963 par->pmi_start = (u8 *)par->pmi_base + par->pmi_base[1];
55964 par->pmi_pal = (u8 *)par->pmi_base + par->pmi_base[2];
55965+#endif
55966+
55967 printk(KERN_INFO "uvesafb: protected mode interface info at "
55968 "%04x:%04x\n",
55969 (u16)task->t.regs.es, (u16)task->t.regs.edi);
55970@@ -813,13 +836,14 @@ static int uvesafb_vbe_init(struct fb_info *info)
55971 par->ypan = ypan;
55972
55973 if (par->pmi_setpal || par->ypan) {
55974+#if !defined(CONFIG_MODULES) || !defined(CONFIG_PAX_KERNEXEC)
55975 if (__supported_pte_mask & _PAGE_NX) {
55976 par->pmi_setpal = par->ypan = 0;
55977 printk(KERN_WARNING "uvesafb: NX protection is active, "
55978 "better not use the PMI.\n");
55979- } else {
55980+ } else
55981+#endif
55982 uvesafb_vbe_getpmi(task, par);
55983- }
55984 }
55985 #else
55986 /* The protected mode interface is not available on non-x86. */
55987@@ -1452,8 +1476,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
55988 info->fix.ywrapstep = (par->ypan > 1) ? 1 : 0;
55989
55990 /* Disable blanking if the user requested so. */
55991- if (!blank)
55992- info->fbops->fb_blank = NULL;
55993+ if (!blank) {
55994+ pax_open_kernel();
55995+ *(void **)&info->fbops->fb_blank = NULL;
55996+ pax_close_kernel();
55997+ }
55998
55999 /*
56000 * Find out how much IO memory is required for the mode with
56001@@ -1524,8 +1551,11 @@ static void uvesafb_init_info(struct fb_info *info, struct vbe_mode_ib *mode)
56002 info->flags = FBINFO_FLAG_DEFAULT |
56003 (par->ypan ? FBINFO_HWACCEL_YPAN : 0);
56004
56005- if (!par->ypan)
56006- info->fbops->fb_pan_display = NULL;
56007+ if (!par->ypan) {
56008+ pax_open_kernel();
56009+ *(void **)&info->fbops->fb_pan_display = NULL;
56010+ pax_close_kernel();
56011+ }
56012 }
56013
56014 static void uvesafb_init_mtrr(struct fb_info *info)
56015@@ -1786,6 +1816,11 @@ out_mode:
56016 out:
56017 kfree(par->vbe_modes);
56018
56019+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56020+ if (par->pmi_code)
56021+ module_memfree_exec(par->pmi_code);
56022+#endif
56023+
56024 framebuffer_release(info);
56025 return err;
56026 }
56027@@ -1810,6 +1845,11 @@ static int uvesafb_remove(struct platform_device *dev)
56028 kfree(par->vbe_state_orig);
56029 kfree(par->vbe_state_saved);
56030
56031+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56032+ if (par->pmi_code)
56033+ module_memfree_exec(par->pmi_code);
56034+#endif
56035+
56036 framebuffer_release(info);
56037 }
56038 return 0;
56039diff --git a/drivers/video/fbdev/vesafb.c b/drivers/video/fbdev/vesafb.c
56040index d79a0ac..2d0c3d4 100644
56041--- a/drivers/video/fbdev/vesafb.c
56042+++ b/drivers/video/fbdev/vesafb.c
56043@@ -9,6 +9,7 @@
56044 */
56045
56046 #include <linux/module.h>
56047+#include <linux/moduleloader.h>
56048 #include <linux/kernel.h>
56049 #include <linux/errno.h>
56050 #include <linux/string.h>
56051@@ -52,8 +53,8 @@ static int vram_remap; /* Set amount of memory to be used */
56052 static int vram_total; /* Set total amount of memory */
56053 static int pmi_setpal __read_mostly = 1; /* pmi for palette changes ??? */
56054 static int ypan __read_mostly; /* 0..nothing, 1..ypan, 2..ywrap */
56055-static void (*pmi_start)(void) __read_mostly;
56056-static void (*pmi_pal) (void) __read_mostly;
56057+static void (*pmi_start)(void) __read_only;
56058+static void (*pmi_pal) (void) __read_only;
56059 static int depth __read_mostly;
56060 static int vga_compat __read_mostly;
56061 /* --------------------------------------------------------------------- */
56062@@ -233,6 +234,7 @@ static int vesafb_probe(struct platform_device *dev)
56063 unsigned int size_remap;
56064 unsigned int size_total;
56065 char *option = NULL;
56066+ void *pmi_code = NULL;
56067
56068 /* ignore error return of fb_get_options */
56069 fb_get_options("vesafb", &option);
56070@@ -279,10 +281,6 @@ static int vesafb_probe(struct platform_device *dev)
56071 size_remap = size_total;
56072 vesafb_fix.smem_len = size_remap;
56073
56074-#ifndef __i386__
56075- screen_info.vesapm_seg = 0;
56076-#endif
56077-
56078 if (!request_mem_region(vesafb_fix.smem_start, size_total, "vesafb")) {
56079 printk(KERN_WARNING
56080 "vesafb: cannot reserve video memory at 0x%lx\n",
56081@@ -312,9 +310,21 @@ static int vesafb_probe(struct platform_device *dev)
56082 printk(KERN_INFO "vesafb: mode is %dx%dx%d, linelength=%d, pages=%d\n",
56083 vesafb_defined.xres, vesafb_defined.yres, vesafb_defined.bits_per_pixel, vesafb_fix.line_length, screen_info.pages);
56084
56085+#ifdef __i386__
56086+
56087+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56088+ pmi_code = module_alloc_exec(screen_info.vesapm_size);
56089+ if (!pmi_code)
56090+#elif !defined(CONFIG_PAX_KERNEXEC)
56091+ if (0)
56092+#endif
56093+
56094+#endif
56095+ screen_info.vesapm_seg = 0;
56096+
56097 if (screen_info.vesapm_seg) {
56098- printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x\n",
56099- screen_info.vesapm_seg,screen_info.vesapm_off);
56100+ printk(KERN_INFO "vesafb: protected mode interface info at %04x:%04x %04x bytes\n",
56101+ screen_info.vesapm_seg,screen_info.vesapm_off,screen_info.vesapm_size);
56102 }
56103
56104 if (screen_info.vesapm_seg < 0xc000)
56105@@ -322,9 +332,25 @@ static int vesafb_probe(struct platform_device *dev)
56106
56107 if (ypan || pmi_setpal) {
56108 unsigned short *pmi_base;
56109+
56110 pmi_base = (unsigned short*)phys_to_virt(((unsigned long)screen_info.vesapm_seg << 4) + screen_info.vesapm_off);
56111- pmi_start = (void*)((char*)pmi_base + pmi_base[1]);
56112- pmi_pal = (void*)((char*)pmi_base + pmi_base[2]);
56113+
56114+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56115+ pax_open_kernel();
56116+ memcpy(pmi_code, pmi_base, screen_info.vesapm_size);
56117+#else
56118+ pmi_code = pmi_base;
56119+#endif
56120+
56121+ pmi_start = (void*)((char*)pmi_code + pmi_base[1]);
56122+ pmi_pal = (void*)((char*)pmi_code + pmi_base[2]);
56123+
56124+#if defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56125+ pmi_start = ktva_ktla(pmi_start);
56126+ pmi_pal = ktva_ktla(pmi_pal);
56127+ pax_close_kernel();
56128+#endif
56129+
56130 printk(KERN_INFO "vesafb: pmi: set display start = %p, set palette = %p\n",pmi_start,pmi_pal);
56131 if (pmi_base[3]) {
56132 printk(KERN_INFO "vesafb: pmi: ports = ");
56133@@ -477,8 +503,11 @@ static int vesafb_probe(struct platform_device *dev)
56134 info->flags = FBINFO_FLAG_DEFAULT | FBINFO_MISC_FIRMWARE |
56135 (ypan ? FBINFO_HWACCEL_YPAN : 0);
56136
56137- if (!ypan)
56138- info->fbops->fb_pan_display = NULL;
56139+ if (!ypan) {
56140+ pax_open_kernel();
56141+ *(void **)&info->fbops->fb_pan_display = NULL;
56142+ pax_close_kernel();
56143+ }
56144
56145 if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
56146 err = -ENOMEM;
56147@@ -492,6 +521,11 @@ static int vesafb_probe(struct platform_device *dev)
56148 fb_info(info, "%s frame buffer device\n", info->fix.id);
56149 return 0;
56150 err:
56151+
56152+#if defined(__i386__) && defined(CONFIG_MODULES) && defined(CONFIG_PAX_KERNEXEC)
56153+ module_memfree_exec(pmi_code);
56154+#endif
56155+
56156 if (info->screen_base)
56157 iounmap(info->screen_base);
56158 framebuffer_release(info);
56159diff --git a/drivers/video/fbdev/via/via_clock.h b/drivers/video/fbdev/via/via_clock.h
56160index 88714ae..16c2e11 100644
56161--- a/drivers/video/fbdev/via/via_clock.h
56162+++ b/drivers/video/fbdev/via/via_clock.h
56163@@ -56,7 +56,7 @@ struct via_clock {
56164
56165 void (*set_engine_pll_state)(u8 state);
56166 void (*set_engine_pll)(struct via_pll_config config);
56167-};
56168+} __no_const;
56169
56170
56171 static inline u32 get_pll_internal_frequency(u32 ref_freq,
56172diff --git a/drivers/video/logo/logo_linux_clut224.ppm b/drivers/video/logo/logo_linux_clut224.ppm
56173index 3c14e43..2630570 100644
56174--- a/drivers/video/logo/logo_linux_clut224.ppm
56175+++ b/drivers/video/logo/logo_linux_clut224.ppm
56176@@ -2,1603 +2,1123 @@ P3
56177 # Standard 224-color Linux logo
56178 80 80
56179 255
56180- 0 0 0 0 0 0 0 0 0 0 0 0
56181- 0 0 0 0 0 0 0 0 0 0 0 0
56182- 0 0 0 0 0 0 0 0 0 0 0 0
56183- 0 0 0 0 0 0 0 0 0 0 0 0
56184- 0 0 0 0 0 0 0 0 0 0 0 0
56185- 0 0 0 0 0 0 0 0 0 0 0 0
56186- 0 0 0 0 0 0 0 0 0 0 0 0
56187- 0 0 0 0 0 0 0 0 0 0 0 0
56188- 0 0 0 0 0 0 0 0 0 0 0 0
56189- 6 6 6 6 6 6 10 10 10 10 10 10
56190- 10 10 10 6 6 6 6 6 6 6 6 6
56191- 0 0 0 0 0 0 0 0 0 0 0 0
56192- 0 0 0 0 0 0 0 0 0 0 0 0
56193- 0 0 0 0 0 0 0 0 0 0 0 0
56194- 0 0 0 0 0 0 0 0 0 0 0 0
56195- 0 0 0 0 0 0 0 0 0 0 0 0
56196- 0 0 0 0 0 0 0 0 0 0 0 0
56197- 0 0 0 0 0 0 0 0 0 0 0 0
56198- 0 0 0 0 0 0 0 0 0 0 0 0
56199- 0 0 0 0 0 0 0 0 0 0 0 0
56200- 0 0 0 0 0 0 0 0 0 0 0 0
56201- 0 0 0 0 0 0 0 0 0 0 0 0
56202- 0 0 0 0 0 0 0 0 0 0 0 0
56203- 0 0 0 0 0 0 0 0 0 0 0 0
56204- 0 0 0 0 0 0 0 0 0 0 0 0
56205- 0 0 0 0 0 0 0 0 0 0 0 0
56206- 0 0 0 0 0 0 0 0 0 0 0 0
56207- 0 0 0 0 0 0 0 0 0 0 0 0
56208- 0 0 0 6 6 6 10 10 10 14 14 14
56209- 22 22 22 26 26 26 30 30 30 34 34 34
56210- 30 30 30 30 30 30 26 26 26 18 18 18
56211- 14 14 14 10 10 10 6 6 6 0 0 0
56212- 0 0 0 0 0 0 0 0 0 0 0 0
56213- 0 0 0 0 0 0 0 0 0 0 0 0
56214- 0 0 0 0 0 0 0 0 0 0 0 0
56215- 0 0 0 0 0 0 0 0 0 0 0 0
56216- 0 0 0 0 0 0 0 0 0 0 0 0
56217- 0 0 0 0 0 0 0 0 0 0 0 0
56218- 0 0 0 0 0 0 0 0 0 0 0 0
56219- 0 0 0 0 0 0 0 0 0 0 0 0
56220- 0 0 0 0 0 0 0 0 0 0 0 0
56221- 0 0 0 0 0 1 0 0 1 0 0 0
56222- 0 0 0 0 0 0 0 0 0 0 0 0
56223- 0 0 0 0 0 0 0 0 0 0 0 0
56224- 0 0 0 0 0 0 0 0 0 0 0 0
56225- 0 0 0 0 0 0 0 0 0 0 0 0
56226- 0 0 0 0 0 0 0 0 0 0 0 0
56227- 0 0 0 0 0 0 0 0 0 0 0 0
56228- 6 6 6 14 14 14 26 26 26 42 42 42
56229- 54 54 54 66 66 66 78 78 78 78 78 78
56230- 78 78 78 74 74 74 66 66 66 54 54 54
56231- 42 42 42 26 26 26 18 18 18 10 10 10
56232- 6 6 6 0 0 0 0 0 0 0 0 0
56233- 0 0 0 0 0 0 0 0 0 0 0 0
56234- 0 0 0 0 0 0 0 0 0 0 0 0
56235- 0 0 0 0 0 0 0 0 0 0 0 0
56236- 0 0 0 0 0 0 0 0 0 0 0 0
56237- 0 0 0 0 0 0 0 0 0 0 0 0
56238- 0 0 0 0 0 0 0 0 0 0 0 0
56239- 0 0 0 0 0 0 0 0 0 0 0 0
56240- 0 0 0 0 0 0 0 0 0 0 0 0
56241- 0 0 1 0 0 0 0 0 0 0 0 0
56242- 0 0 0 0 0 0 0 0 0 0 0 0
56243- 0 0 0 0 0 0 0 0 0 0 0 0
56244- 0 0 0 0 0 0 0 0 0 0 0 0
56245- 0 0 0 0 0 0 0 0 0 0 0 0
56246- 0 0 0 0 0 0 0 0 0 0 0 0
56247- 0 0 0 0 0 0 0 0 0 10 10 10
56248- 22 22 22 42 42 42 66 66 66 86 86 86
56249- 66 66 66 38 38 38 38 38 38 22 22 22
56250- 26 26 26 34 34 34 54 54 54 66 66 66
56251- 86 86 86 70 70 70 46 46 46 26 26 26
56252- 14 14 14 6 6 6 0 0 0 0 0 0
56253- 0 0 0 0 0 0 0 0 0 0 0 0
56254- 0 0 0 0 0 0 0 0 0 0 0 0
56255- 0 0 0 0 0 0 0 0 0 0 0 0
56256- 0 0 0 0 0 0 0 0 0 0 0 0
56257- 0 0 0 0 0 0 0 0 0 0 0 0
56258- 0 0 0 0 0 0 0 0 0 0 0 0
56259- 0 0 0 0 0 0 0 0 0 0 0 0
56260- 0 0 0 0 0 0 0 0 0 0 0 0
56261- 0 0 1 0 0 1 0 0 1 0 0 0
56262- 0 0 0 0 0 0 0 0 0 0 0 0
56263- 0 0 0 0 0 0 0 0 0 0 0 0
56264- 0 0 0 0 0 0 0 0 0 0 0 0
56265- 0 0 0 0 0 0 0 0 0 0 0 0
56266- 0 0 0 0 0 0 0 0 0 0 0 0
56267- 0 0 0 0 0 0 10 10 10 26 26 26
56268- 50 50 50 82 82 82 58 58 58 6 6 6
56269- 2 2 6 2 2 6 2 2 6 2 2 6
56270- 2 2 6 2 2 6 2 2 6 2 2 6
56271- 6 6 6 54 54 54 86 86 86 66 66 66
56272- 38 38 38 18 18 18 6 6 6 0 0 0
56273- 0 0 0 0 0 0 0 0 0 0 0 0
56274- 0 0 0 0 0 0 0 0 0 0 0 0
56275- 0 0 0 0 0 0 0 0 0 0 0 0
56276- 0 0 0 0 0 0 0 0 0 0 0 0
56277- 0 0 0 0 0 0 0 0 0 0 0 0
56278- 0 0 0 0 0 0 0 0 0 0 0 0
56279- 0 0 0 0 0 0 0 0 0 0 0 0
56280- 0 0 0 0 0 0 0 0 0 0 0 0
56281- 0 0 0 0 0 0 0 0 0 0 0 0
56282- 0 0 0 0 0 0 0 0 0 0 0 0
56283- 0 0 0 0 0 0 0 0 0 0 0 0
56284- 0 0 0 0 0 0 0 0 0 0 0 0
56285- 0 0 0 0 0 0 0 0 0 0 0 0
56286- 0 0 0 0 0 0 0 0 0 0 0 0
56287- 0 0 0 6 6 6 22 22 22 50 50 50
56288- 78 78 78 34 34 34 2 2 6 2 2 6
56289- 2 2 6 2 2 6 2 2 6 2 2 6
56290- 2 2 6 2 2 6 2 2 6 2 2 6
56291- 2 2 6 2 2 6 6 6 6 70 70 70
56292- 78 78 78 46 46 46 22 22 22 6 6 6
56293- 0 0 0 0 0 0 0 0 0 0 0 0
56294- 0 0 0 0 0 0 0 0 0 0 0 0
56295- 0 0 0 0 0 0 0 0 0 0 0 0
56296- 0 0 0 0 0 0 0 0 0 0 0 0
56297- 0 0 0 0 0 0 0 0 0 0 0 0
56298- 0 0 0 0 0 0 0 0 0 0 0 0
56299- 0 0 0 0 0 0 0 0 0 0 0 0
56300- 0 0 0 0 0 0 0 0 0 0 0 0
56301- 0 0 1 0 0 1 0 0 1 0 0 0
56302- 0 0 0 0 0 0 0 0 0 0 0 0
56303- 0 0 0 0 0 0 0 0 0 0 0 0
56304- 0 0 0 0 0 0 0 0 0 0 0 0
56305- 0 0 0 0 0 0 0 0 0 0 0 0
56306- 0 0 0 0 0 0 0 0 0 0 0 0
56307- 6 6 6 18 18 18 42 42 42 82 82 82
56308- 26 26 26 2 2 6 2 2 6 2 2 6
56309- 2 2 6 2 2 6 2 2 6 2 2 6
56310- 2 2 6 2 2 6 2 2 6 14 14 14
56311- 46 46 46 34 34 34 6 6 6 2 2 6
56312- 42 42 42 78 78 78 42 42 42 18 18 18
56313- 6 6 6 0 0 0 0 0 0 0 0 0
56314- 0 0 0 0 0 0 0 0 0 0 0 0
56315- 0 0 0 0 0 0 0 0 0 0 0 0
56316- 0 0 0 0 0 0 0 0 0 0 0 0
56317- 0 0 0 0 0 0 0 0 0 0 0 0
56318- 0 0 0 0 0 0 0 0 0 0 0 0
56319- 0 0 0 0 0 0 0 0 0 0 0 0
56320- 0 0 0 0 0 0 0 0 0 0 0 0
56321- 0 0 1 0 0 0 0 0 1 0 0 0
56322- 0 0 0 0 0 0 0 0 0 0 0 0
56323- 0 0 0 0 0 0 0 0 0 0 0 0
56324- 0 0 0 0 0 0 0 0 0 0 0 0
56325- 0 0 0 0 0 0 0 0 0 0 0 0
56326- 0 0 0 0 0 0 0 0 0 0 0 0
56327- 10 10 10 30 30 30 66 66 66 58 58 58
56328- 2 2 6 2 2 6 2 2 6 2 2 6
56329- 2 2 6 2 2 6 2 2 6 2 2 6
56330- 2 2 6 2 2 6 2 2 6 26 26 26
56331- 86 86 86 101 101 101 46 46 46 10 10 10
56332- 2 2 6 58 58 58 70 70 70 34 34 34
56333- 10 10 10 0 0 0 0 0 0 0 0 0
56334- 0 0 0 0 0 0 0 0 0 0 0 0
56335- 0 0 0 0 0 0 0 0 0 0 0 0
56336- 0 0 0 0 0 0 0 0 0 0 0 0
56337- 0 0 0 0 0 0 0 0 0 0 0 0
56338- 0 0 0 0 0 0 0 0 0 0 0 0
56339- 0 0 0 0 0 0 0 0 0 0 0 0
56340- 0 0 0 0 0 0 0 0 0 0 0 0
56341- 0 0 1 0 0 1 0 0 1 0 0 0
56342- 0 0 0 0 0 0 0 0 0 0 0 0
56343- 0 0 0 0 0 0 0 0 0 0 0 0
56344- 0 0 0 0 0 0 0 0 0 0 0 0
56345- 0 0 0 0 0 0 0 0 0 0 0 0
56346- 0 0 0 0 0 0 0 0 0 0 0 0
56347- 14 14 14 42 42 42 86 86 86 10 10 10
56348- 2 2 6 2 2 6 2 2 6 2 2 6
56349- 2 2 6 2 2 6 2 2 6 2 2 6
56350- 2 2 6 2 2 6 2 2 6 30 30 30
56351- 94 94 94 94 94 94 58 58 58 26 26 26
56352- 2 2 6 6 6 6 78 78 78 54 54 54
56353- 22 22 22 6 6 6 0 0 0 0 0 0
56354- 0 0 0 0 0 0 0 0 0 0 0 0
56355- 0 0 0 0 0 0 0 0 0 0 0 0
56356- 0 0 0 0 0 0 0 0 0 0 0 0
56357- 0 0 0 0 0 0 0 0 0 0 0 0
56358- 0 0 0 0 0 0 0 0 0 0 0 0
56359- 0 0 0 0 0 0 0 0 0 0 0 0
56360- 0 0 0 0 0 0 0 0 0 0 0 0
56361- 0 0 0 0 0 0 0 0 0 0 0 0
56362- 0 0 0 0 0 0 0 0 0 0 0 0
56363- 0 0 0 0 0 0 0 0 0 0 0 0
56364- 0 0 0 0 0 0 0 0 0 0 0 0
56365- 0 0 0 0 0 0 0 0 0 0 0 0
56366- 0 0 0 0 0 0 0 0 0 6 6 6
56367- 22 22 22 62 62 62 62 62 62 2 2 6
56368- 2 2 6 2 2 6 2 2 6 2 2 6
56369- 2 2 6 2 2 6 2 2 6 2 2 6
56370- 2 2 6 2 2 6 2 2 6 26 26 26
56371- 54 54 54 38 38 38 18 18 18 10 10 10
56372- 2 2 6 2 2 6 34 34 34 82 82 82
56373- 38 38 38 14 14 14 0 0 0 0 0 0
56374- 0 0 0 0 0 0 0 0 0 0 0 0
56375- 0 0 0 0 0 0 0 0 0 0 0 0
56376- 0 0 0 0 0 0 0 0 0 0 0 0
56377- 0 0 0 0 0 0 0 0 0 0 0 0
56378- 0 0 0 0 0 0 0 0 0 0 0 0
56379- 0 0 0 0 0 0 0 0 0 0 0 0
56380- 0 0 0 0 0 0 0 0 0 0 0 0
56381- 0 0 0 0 0 1 0 0 1 0 0 0
56382- 0 0 0 0 0 0 0 0 0 0 0 0
56383- 0 0 0 0 0 0 0 0 0 0 0 0
56384- 0 0 0 0 0 0 0 0 0 0 0 0
56385- 0 0 0 0 0 0 0 0 0 0 0 0
56386- 0 0 0 0 0 0 0 0 0 6 6 6
56387- 30 30 30 78 78 78 30 30 30 2 2 6
56388- 2 2 6 2 2 6 2 2 6 2 2 6
56389- 2 2 6 2 2 6 2 2 6 2 2 6
56390- 2 2 6 2 2 6 2 2 6 10 10 10
56391- 10 10 10 2 2 6 2 2 6 2 2 6
56392- 2 2 6 2 2 6 2 2 6 78 78 78
56393- 50 50 50 18 18 18 6 6 6 0 0 0
56394- 0 0 0 0 0 0 0 0 0 0 0 0
56395- 0 0 0 0 0 0 0 0 0 0 0 0
56396- 0 0 0 0 0 0 0 0 0 0 0 0
56397- 0 0 0 0 0 0 0 0 0 0 0 0
56398- 0 0 0 0 0 0 0 0 0 0 0 0
56399- 0 0 0 0 0 0 0 0 0 0 0 0
56400- 0 0 0 0 0 0 0 0 0 0 0 0
56401- 0 0 1 0 0 0 0 0 0 0 0 0
56402- 0 0 0 0 0 0 0 0 0 0 0 0
56403- 0 0 0 0 0 0 0 0 0 0 0 0
56404- 0 0 0 0 0 0 0 0 0 0 0 0
56405- 0 0 0 0 0 0 0 0 0 0 0 0
56406- 0 0 0 0 0 0 0 0 0 10 10 10
56407- 38 38 38 86 86 86 14 14 14 2 2 6
56408- 2 2 6 2 2 6 2 2 6 2 2 6
56409- 2 2 6 2 2 6 2 2 6 2 2 6
56410- 2 2 6 2 2 6 2 2 6 2 2 6
56411- 2 2 6 2 2 6 2 2 6 2 2 6
56412- 2 2 6 2 2 6 2 2 6 54 54 54
56413- 66 66 66 26 26 26 6 6 6 0 0 0
56414- 0 0 0 0 0 0 0 0 0 0 0 0
56415- 0 0 0 0 0 0 0 0 0 0 0 0
56416- 0 0 0 0 0 0 0 0 0 0 0 0
56417- 0 0 0 0 0 0 0 0 0 0 0 0
56418- 0 0 0 0 0 0 0 0 0 0 0 0
56419- 0 0 0 0 0 0 0 0 0 0 0 0
56420- 0 0 0 0 0 0 0 0 0 0 0 0
56421- 0 0 0 0 0 1 0 0 1 0 0 0
56422- 0 0 0 0 0 0 0 0 0 0 0 0
56423- 0 0 0 0 0 0 0 0 0 0 0 0
56424- 0 0 0 0 0 0 0 0 0 0 0 0
56425- 0 0 0 0 0 0 0 0 0 0 0 0
56426- 0 0 0 0 0 0 0 0 0 14 14 14
56427- 42 42 42 82 82 82 2 2 6 2 2 6
56428- 2 2 6 6 6 6 10 10 10 2 2 6
56429- 2 2 6 2 2 6 2 2 6 2 2 6
56430- 2 2 6 2 2 6 2 2 6 6 6 6
56431- 14 14 14 10 10 10 2 2 6 2 2 6
56432- 2 2 6 2 2 6 2 2 6 18 18 18
56433- 82 82 82 34 34 34 10 10 10 0 0 0
56434- 0 0 0 0 0 0 0 0 0 0 0 0
56435- 0 0 0 0 0 0 0 0 0 0 0 0
56436- 0 0 0 0 0 0 0 0 0 0 0 0
56437- 0 0 0 0 0 0 0 0 0 0 0 0
56438- 0 0 0 0 0 0 0 0 0 0 0 0
56439- 0 0 0 0 0 0 0 0 0 0 0 0
56440- 0 0 0 0 0 0 0 0 0 0 0 0
56441- 0 0 1 0 0 0 0 0 0 0 0 0
56442- 0 0 0 0 0 0 0 0 0 0 0 0
56443- 0 0 0 0 0 0 0 0 0 0 0 0
56444- 0 0 0 0 0 0 0 0 0 0 0 0
56445- 0 0 0 0 0 0 0 0 0 0 0 0
56446- 0 0 0 0 0 0 0 0 0 14 14 14
56447- 46 46 46 86 86 86 2 2 6 2 2 6
56448- 6 6 6 6 6 6 22 22 22 34 34 34
56449- 6 6 6 2 2 6 2 2 6 2 2 6
56450- 2 2 6 2 2 6 18 18 18 34 34 34
56451- 10 10 10 50 50 50 22 22 22 2 2 6
56452- 2 2 6 2 2 6 2 2 6 10 10 10
56453- 86 86 86 42 42 42 14 14 14 0 0 0
56454- 0 0 0 0 0 0 0 0 0 0 0 0
56455- 0 0 0 0 0 0 0 0 0 0 0 0
56456- 0 0 0 0 0 0 0 0 0 0 0 0
56457- 0 0 0 0 0 0 0 0 0 0 0 0
56458- 0 0 0 0 0 0 0 0 0 0 0 0
56459- 0 0 0 0 0 0 0 0 0 0 0 0
56460- 0 0 0 0 0 0 0 0 0 0 0 0
56461- 0 0 1 0 0 1 0 0 1 0 0 0
56462- 0 0 0 0 0 0 0 0 0 0 0 0
56463- 0 0 0 0 0 0 0 0 0 0 0 0
56464- 0 0 0 0 0 0 0 0 0 0 0 0
56465- 0 0 0 0 0 0 0 0 0 0 0 0
56466- 0 0 0 0 0 0 0 0 0 14 14 14
56467- 46 46 46 86 86 86 2 2 6 2 2 6
56468- 38 38 38 116 116 116 94 94 94 22 22 22
56469- 22 22 22 2 2 6 2 2 6 2 2 6
56470- 14 14 14 86 86 86 138 138 138 162 162 162
56471-154 154 154 38 38 38 26 26 26 6 6 6
56472- 2 2 6 2 2 6 2 2 6 2 2 6
56473- 86 86 86 46 46 46 14 14 14 0 0 0
56474- 0 0 0 0 0 0 0 0 0 0 0 0
56475- 0 0 0 0 0 0 0 0 0 0 0 0
56476- 0 0 0 0 0 0 0 0 0 0 0 0
56477- 0 0 0 0 0 0 0 0 0 0 0 0
56478- 0 0 0 0 0 0 0 0 0 0 0 0
56479- 0 0 0 0 0 0 0 0 0 0 0 0
56480- 0 0 0 0 0 0 0 0 0 0 0 0
56481- 0 0 0 0 0 0 0 0 0 0 0 0
56482- 0 0 0 0 0 0 0 0 0 0 0 0
56483- 0 0 0 0 0 0 0 0 0 0 0 0
56484- 0 0 0 0 0 0 0 0 0 0 0 0
56485- 0 0 0 0 0 0 0 0 0 0 0 0
56486- 0 0 0 0 0 0 0 0 0 14 14 14
56487- 46 46 46 86 86 86 2 2 6 14 14 14
56488-134 134 134 198 198 198 195 195 195 116 116 116
56489- 10 10 10 2 2 6 2 2 6 6 6 6
56490-101 98 89 187 187 187 210 210 210 218 218 218
56491-214 214 214 134 134 134 14 14 14 6 6 6
56492- 2 2 6 2 2 6 2 2 6 2 2 6
56493- 86 86 86 50 50 50 18 18 18 6 6 6
56494- 0 0 0 0 0 0 0 0 0 0 0 0
56495- 0 0 0 0 0 0 0 0 0 0 0 0
56496- 0 0 0 0 0 0 0 0 0 0 0 0
56497- 0 0 0 0 0 0 0 0 0 0 0 0
56498- 0 0 0 0 0 0 0 0 0 0 0 0
56499- 0 0 0 0 0 0 0 0 0 0 0 0
56500- 0 0 0 0 0 0 0 0 1 0 0 0
56501- 0 0 1 0 0 1 0 0 1 0 0 0
56502- 0 0 0 0 0 0 0 0 0 0 0 0
56503- 0 0 0 0 0 0 0 0 0 0 0 0
56504- 0 0 0 0 0 0 0 0 0 0 0 0
56505- 0 0 0 0 0 0 0 0 0 0 0 0
56506- 0 0 0 0 0 0 0 0 0 14 14 14
56507- 46 46 46 86 86 86 2 2 6 54 54 54
56508-218 218 218 195 195 195 226 226 226 246 246 246
56509- 58 58 58 2 2 6 2 2 6 30 30 30
56510-210 210 210 253 253 253 174 174 174 123 123 123
56511-221 221 221 234 234 234 74 74 74 2 2 6
56512- 2 2 6 2 2 6 2 2 6 2 2 6
56513- 70 70 70 58 58 58 22 22 22 6 6 6
56514- 0 0 0 0 0 0 0 0 0 0 0 0
56515- 0 0 0 0 0 0 0 0 0 0 0 0
56516- 0 0 0 0 0 0 0 0 0 0 0 0
56517- 0 0 0 0 0 0 0 0 0 0 0 0
56518- 0 0 0 0 0 0 0 0 0 0 0 0
56519- 0 0 0 0 0 0 0 0 0 0 0 0
56520- 0 0 0 0 0 0 0 0 0 0 0 0
56521- 0 0 0 0 0 0 0 0 0 0 0 0
56522- 0 0 0 0 0 0 0 0 0 0 0 0
56523- 0 0 0 0 0 0 0 0 0 0 0 0
56524- 0 0 0 0 0 0 0 0 0 0 0 0
56525- 0 0 0 0 0 0 0 0 0 0 0 0
56526- 0 0 0 0 0 0 0 0 0 14 14 14
56527- 46 46 46 82 82 82 2 2 6 106 106 106
56528-170 170 170 26 26 26 86 86 86 226 226 226
56529-123 123 123 10 10 10 14 14 14 46 46 46
56530-231 231 231 190 190 190 6 6 6 70 70 70
56531- 90 90 90 238 238 238 158 158 158 2 2 6
56532- 2 2 6 2 2 6 2 2 6 2 2 6
56533- 70 70 70 58 58 58 22 22 22 6 6 6
56534- 0 0 0 0 0 0 0 0 0 0 0 0
56535- 0 0 0 0 0 0 0 0 0 0 0 0
56536- 0 0 0 0 0 0 0 0 0 0 0 0
56537- 0 0 0 0 0 0 0 0 0 0 0 0
56538- 0 0 0 0 0 0 0 0 0 0 0 0
56539- 0 0 0 0 0 0 0 0 0 0 0 0
56540- 0 0 0 0 0 0 0 0 1 0 0 0
56541- 0 0 1 0 0 1 0 0 1 0 0 0
56542- 0 0 0 0 0 0 0 0 0 0 0 0
56543- 0 0 0 0 0 0 0 0 0 0 0 0
56544- 0 0 0 0 0 0 0 0 0 0 0 0
56545- 0 0 0 0 0 0 0 0 0 0 0 0
56546- 0 0 0 0 0 0 0 0 0 14 14 14
56547- 42 42 42 86 86 86 6 6 6 116 116 116
56548-106 106 106 6 6 6 70 70 70 149 149 149
56549-128 128 128 18 18 18 38 38 38 54 54 54
56550-221 221 221 106 106 106 2 2 6 14 14 14
56551- 46 46 46 190 190 190 198 198 198 2 2 6
56552- 2 2 6 2 2 6 2 2 6 2 2 6
56553- 74 74 74 62 62 62 22 22 22 6 6 6
56554- 0 0 0 0 0 0 0 0 0 0 0 0
56555- 0 0 0 0 0 0 0 0 0 0 0 0
56556- 0 0 0 0 0 0 0 0 0 0 0 0
56557- 0 0 0 0 0 0 0 0 0 0 0 0
56558- 0 0 0 0 0 0 0 0 0 0 0 0
56559- 0 0 0 0 0 0 0 0 0 0 0 0
56560- 0 0 0 0 0 0 0 0 1 0 0 0
56561- 0 0 1 0 0 0 0 0 1 0 0 0
56562- 0 0 0 0 0 0 0 0 0 0 0 0
56563- 0 0 0 0 0 0 0 0 0 0 0 0
56564- 0 0 0 0 0 0 0 0 0 0 0 0
56565- 0 0 0 0 0 0 0 0 0 0 0 0
56566- 0 0 0 0 0 0 0 0 0 14 14 14
56567- 42 42 42 94 94 94 14 14 14 101 101 101
56568-128 128 128 2 2 6 18 18 18 116 116 116
56569-118 98 46 121 92 8 121 92 8 98 78 10
56570-162 162 162 106 106 106 2 2 6 2 2 6
56571- 2 2 6 195 195 195 195 195 195 6 6 6
56572- 2 2 6 2 2 6 2 2 6 2 2 6
56573- 74 74 74 62 62 62 22 22 22 6 6 6
56574- 0 0 0 0 0 0 0 0 0 0 0 0
56575- 0 0 0 0 0 0 0 0 0 0 0 0
56576- 0 0 0 0 0 0 0 0 0 0 0 0
56577- 0 0 0 0 0 0 0 0 0 0 0 0
56578- 0 0 0 0 0 0 0 0 0 0 0 0
56579- 0 0 0 0 0 0 0 0 0 0 0 0
56580- 0 0 0 0 0 0 0 0 1 0 0 1
56581- 0 0 1 0 0 0 0 0 1 0 0 0
56582- 0 0 0 0 0 0 0 0 0 0 0 0
56583- 0 0 0 0 0 0 0 0 0 0 0 0
56584- 0 0 0 0 0 0 0 0 0 0 0 0
56585- 0 0 0 0 0 0 0 0 0 0 0 0
56586- 0 0 0 0 0 0 0 0 0 10 10 10
56587- 38 38 38 90 90 90 14 14 14 58 58 58
56588-210 210 210 26 26 26 54 38 6 154 114 10
56589-226 170 11 236 186 11 225 175 15 184 144 12
56590-215 174 15 175 146 61 37 26 9 2 2 6
56591- 70 70 70 246 246 246 138 138 138 2 2 6
56592- 2 2 6 2 2 6 2 2 6 2 2 6
56593- 70 70 70 66 66 66 26 26 26 6 6 6
56594- 0 0 0 0 0 0 0 0 0 0 0 0
56595- 0 0 0 0 0 0 0 0 0 0 0 0
56596- 0 0 0 0 0 0 0 0 0 0 0 0
56597- 0 0 0 0 0 0 0 0 0 0 0 0
56598- 0 0 0 0 0 0 0 0 0 0 0 0
56599- 0 0 0 0 0 0 0 0 0 0 0 0
56600- 0 0 0 0 0 0 0 0 0 0 0 0
56601- 0 0 0 0 0 0 0 0 0 0 0 0
56602- 0 0 0 0 0 0 0 0 0 0 0 0
56603- 0 0 0 0 0 0 0 0 0 0 0 0
56604- 0 0 0 0 0 0 0 0 0 0 0 0
56605- 0 0 0 0 0 0 0 0 0 0 0 0
56606- 0 0 0 0 0 0 0 0 0 10 10 10
56607- 38 38 38 86 86 86 14 14 14 10 10 10
56608-195 195 195 188 164 115 192 133 9 225 175 15
56609-239 182 13 234 190 10 232 195 16 232 200 30
56610-245 207 45 241 208 19 232 195 16 184 144 12
56611-218 194 134 211 206 186 42 42 42 2 2 6
56612- 2 2 6 2 2 6 2 2 6 2 2 6
56613- 50 50 50 74 74 74 30 30 30 6 6 6
56614- 0 0 0 0 0 0 0 0 0 0 0 0
56615- 0 0 0 0 0 0 0 0 0 0 0 0
56616- 0 0 0 0 0 0 0 0 0 0 0 0
56617- 0 0 0 0 0 0 0 0 0 0 0 0
56618- 0 0 0 0 0 0 0 0 0 0 0 0
56619- 0 0 0 0 0 0 0 0 0 0 0 0
56620- 0 0 0 0 0 0 0 0 0 0 0 0
56621- 0 0 0 0 0 0 0 0 0 0 0 0
56622- 0 0 0 0 0 0 0 0 0 0 0 0
56623- 0 0 0 0 0 0 0 0 0 0 0 0
56624- 0 0 0 0 0 0 0 0 0 0 0 0
56625- 0 0 0 0 0 0 0 0 0 0 0 0
56626- 0 0 0 0 0 0 0 0 0 10 10 10
56627- 34 34 34 86 86 86 14 14 14 2 2 6
56628-121 87 25 192 133 9 219 162 10 239 182 13
56629-236 186 11 232 195 16 241 208 19 244 214 54
56630-246 218 60 246 218 38 246 215 20 241 208 19
56631-241 208 19 226 184 13 121 87 25 2 2 6
56632- 2 2 6 2 2 6 2 2 6 2 2 6
56633- 50 50 50 82 82 82 34 34 34 10 10 10
56634- 0 0 0 0 0 0 0 0 0 0 0 0
56635- 0 0 0 0 0 0 0 0 0 0 0 0
56636- 0 0 0 0 0 0 0 0 0 0 0 0
56637- 0 0 0 0 0 0 0 0 0 0 0 0
56638- 0 0 0 0 0 0 0 0 0 0 0 0
56639- 0 0 0 0 0 0 0 0 0 0 0 0
56640- 0 0 0 0 0 0 0 0 0 0 0 0
56641- 0 0 0 0 0 0 0 0 0 0 0 0
56642- 0 0 0 0 0 0 0 0 0 0 0 0
56643- 0 0 0 0 0 0 0 0 0 0 0 0
56644- 0 0 0 0 0 0 0 0 0 0 0 0
56645- 0 0 0 0 0 0 0 0 0 0 0 0
56646- 0 0 0 0 0 0 0 0 0 10 10 10
56647- 34 34 34 82 82 82 30 30 30 61 42 6
56648-180 123 7 206 145 10 230 174 11 239 182 13
56649-234 190 10 238 202 15 241 208 19 246 218 74
56650-246 218 38 246 215 20 246 215 20 246 215 20
56651-226 184 13 215 174 15 184 144 12 6 6 6
56652- 2 2 6 2 2 6 2 2 6 2 2 6
56653- 26 26 26 94 94 94 42 42 42 14 14 14
56654- 0 0 0 0 0 0 0 0 0 0 0 0
56655- 0 0 0 0 0 0 0 0 0 0 0 0
56656- 0 0 0 0 0 0 0 0 0 0 0 0
56657- 0 0 0 0 0 0 0 0 0 0 0 0
56658- 0 0 0 0 0 0 0 0 0 0 0 0
56659- 0 0 0 0 0 0 0 0 0 0 0 0
56660- 0 0 0 0 0 0 0 0 0 0 0 0
56661- 0 0 0 0 0 0 0 0 0 0 0 0
56662- 0 0 0 0 0 0 0 0 0 0 0 0
56663- 0 0 0 0 0 0 0 0 0 0 0 0
56664- 0 0 0 0 0 0 0 0 0 0 0 0
56665- 0 0 0 0 0 0 0 0 0 0 0 0
56666- 0 0 0 0 0 0 0 0 0 10 10 10
56667- 30 30 30 78 78 78 50 50 50 104 69 6
56668-192 133 9 216 158 10 236 178 12 236 186 11
56669-232 195 16 241 208 19 244 214 54 245 215 43
56670-246 215 20 246 215 20 241 208 19 198 155 10
56671-200 144 11 216 158 10 156 118 10 2 2 6
56672- 2 2 6 2 2 6 2 2 6 2 2 6
56673- 6 6 6 90 90 90 54 54 54 18 18 18
56674- 6 6 6 0 0 0 0 0 0 0 0 0
56675- 0 0 0 0 0 0 0 0 0 0 0 0
56676- 0 0 0 0 0 0 0 0 0 0 0 0
56677- 0 0 0 0 0 0 0 0 0 0 0 0
56678- 0 0 0 0 0 0 0 0 0 0 0 0
56679- 0 0 0 0 0 0 0 0 0 0 0 0
56680- 0 0 0 0 0 0 0 0 0 0 0 0
56681- 0 0 0 0 0 0 0 0 0 0 0 0
56682- 0 0 0 0 0 0 0 0 0 0 0 0
56683- 0 0 0 0 0 0 0 0 0 0 0 0
56684- 0 0 0 0 0 0 0 0 0 0 0 0
56685- 0 0 0 0 0 0 0 0 0 0 0 0
56686- 0 0 0 0 0 0 0 0 0 10 10 10
56687- 30 30 30 78 78 78 46 46 46 22 22 22
56688-137 92 6 210 162 10 239 182 13 238 190 10
56689-238 202 15 241 208 19 246 215 20 246 215 20
56690-241 208 19 203 166 17 185 133 11 210 150 10
56691-216 158 10 210 150 10 102 78 10 2 2 6
56692- 6 6 6 54 54 54 14 14 14 2 2 6
56693- 2 2 6 62 62 62 74 74 74 30 30 30
56694- 10 10 10 0 0 0 0 0 0 0 0 0
56695- 0 0 0 0 0 0 0 0 0 0 0 0
56696- 0 0 0 0 0 0 0 0 0 0 0 0
56697- 0 0 0 0 0 0 0 0 0 0 0 0
56698- 0 0 0 0 0 0 0 0 0 0 0 0
56699- 0 0 0 0 0 0 0 0 0 0 0 0
56700- 0 0 0 0 0 0 0 0 0 0 0 0
56701- 0 0 0 0 0 0 0 0 0 0 0 0
56702- 0 0 0 0 0 0 0 0 0 0 0 0
56703- 0 0 0 0 0 0 0 0 0 0 0 0
56704- 0 0 0 0 0 0 0 0 0 0 0 0
56705- 0 0 0 0 0 0 0 0 0 0 0 0
56706- 0 0 0 0 0 0 0 0 0 10 10 10
56707- 34 34 34 78 78 78 50 50 50 6 6 6
56708- 94 70 30 139 102 15 190 146 13 226 184 13
56709-232 200 30 232 195 16 215 174 15 190 146 13
56710-168 122 10 192 133 9 210 150 10 213 154 11
56711-202 150 34 182 157 106 101 98 89 2 2 6
56712- 2 2 6 78 78 78 116 116 116 58 58 58
56713- 2 2 6 22 22 22 90 90 90 46 46 46
56714- 18 18 18 6 6 6 0 0 0 0 0 0
56715- 0 0 0 0 0 0 0 0 0 0 0 0
56716- 0 0 0 0 0 0 0 0 0 0 0 0
56717- 0 0 0 0 0 0 0 0 0 0 0 0
56718- 0 0 0 0 0 0 0 0 0 0 0 0
56719- 0 0 0 0 0 0 0 0 0 0 0 0
56720- 0 0 0 0 0 0 0 0 0 0 0 0
56721- 0 0 0 0 0 0 0 0 0 0 0 0
56722- 0 0 0 0 0 0 0 0 0 0 0 0
56723- 0 0 0 0 0 0 0 0 0 0 0 0
56724- 0 0 0 0 0 0 0 0 0 0 0 0
56725- 0 0 0 0 0 0 0 0 0 0 0 0
56726- 0 0 0 0 0 0 0 0 0 10 10 10
56727- 38 38 38 86 86 86 50 50 50 6 6 6
56728-128 128 128 174 154 114 156 107 11 168 122 10
56729-198 155 10 184 144 12 197 138 11 200 144 11
56730-206 145 10 206 145 10 197 138 11 188 164 115
56731-195 195 195 198 198 198 174 174 174 14 14 14
56732- 2 2 6 22 22 22 116 116 116 116 116 116
56733- 22 22 22 2 2 6 74 74 74 70 70 70
56734- 30 30 30 10 10 10 0 0 0 0 0 0
56735- 0 0 0 0 0 0 0 0 0 0 0 0
56736- 0 0 0 0 0 0 0 0 0 0 0 0
56737- 0 0 0 0 0 0 0 0 0 0 0 0
56738- 0 0 0 0 0 0 0 0 0 0 0 0
56739- 0 0 0 0 0 0 0 0 0 0 0 0
56740- 0 0 0 0 0 0 0 0 0 0 0 0
56741- 0 0 0 0 0 0 0 0 0 0 0 0
56742- 0 0 0 0 0 0 0 0 0 0 0 0
56743- 0 0 0 0 0 0 0 0 0 0 0 0
56744- 0 0 0 0 0 0 0 0 0 0 0 0
56745- 0 0 0 0 0 0 0 0 0 0 0 0
56746- 0 0 0 0 0 0 6 6 6 18 18 18
56747- 50 50 50 101 101 101 26 26 26 10 10 10
56748-138 138 138 190 190 190 174 154 114 156 107 11
56749-197 138 11 200 144 11 197 138 11 192 133 9
56750-180 123 7 190 142 34 190 178 144 187 187 187
56751-202 202 202 221 221 221 214 214 214 66 66 66
56752- 2 2 6 2 2 6 50 50 50 62 62 62
56753- 6 6 6 2 2 6 10 10 10 90 90 90
56754- 50 50 50 18 18 18 6 6 6 0 0 0
56755- 0 0 0 0 0 0 0 0 0 0 0 0
56756- 0 0 0 0 0 0 0 0 0 0 0 0
56757- 0 0 0 0 0 0 0 0 0 0 0 0
56758- 0 0 0 0 0 0 0 0 0 0 0 0
56759- 0 0 0 0 0 0 0 0 0 0 0 0
56760- 0 0 0 0 0 0 0 0 0 0 0 0
56761- 0 0 0 0 0 0 0 0 0 0 0 0
56762- 0 0 0 0 0 0 0 0 0 0 0 0
56763- 0 0 0 0 0 0 0 0 0 0 0 0
56764- 0 0 0 0 0 0 0 0 0 0 0 0
56765- 0 0 0 0 0 0 0 0 0 0 0 0
56766- 0 0 0 0 0 0 10 10 10 34 34 34
56767- 74 74 74 74 74 74 2 2 6 6 6 6
56768-144 144 144 198 198 198 190 190 190 178 166 146
56769-154 121 60 156 107 11 156 107 11 168 124 44
56770-174 154 114 187 187 187 190 190 190 210 210 210
56771-246 246 246 253 253 253 253 253 253 182 182 182
56772- 6 6 6 2 2 6 2 2 6 2 2 6
56773- 2 2 6 2 2 6 2 2 6 62 62 62
56774- 74 74 74 34 34 34 14 14 14 0 0 0
56775- 0 0 0 0 0 0 0 0 0 0 0 0
56776- 0 0 0 0 0 0 0 0 0 0 0 0
56777- 0 0 0 0 0 0 0 0 0 0 0 0
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 10 10 10 22 22 22 54 54 54
56787- 94 94 94 18 18 18 2 2 6 46 46 46
56788-234 234 234 221 221 221 190 190 190 190 190 190
56789-190 190 190 187 187 187 187 187 187 190 190 190
56790-190 190 190 195 195 195 214 214 214 242 242 242
56791-253 253 253 253 253 253 253 253 253 253 253 253
56792- 82 82 82 2 2 6 2 2 6 2 2 6
56793- 2 2 6 2 2 6 2 2 6 14 14 14
56794- 86 86 86 54 54 54 22 22 22 6 6 6
56795- 0 0 0 0 0 0 0 0 0 0 0 0
56796- 0 0 0 0 0 0 0 0 0 0 0 0
56797- 0 0 0 0 0 0 0 0 0 0 0 0
56798- 0 0 0 0 0 0 0 0 0 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- 6 6 6 18 18 18 46 46 46 90 90 90
56807- 46 46 46 18 18 18 6 6 6 182 182 182
56808-253 253 253 246 246 246 206 206 206 190 190 190
56809-190 190 190 190 190 190 190 190 190 190 190 190
56810-206 206 206 231 231 231 250 250 250 253 253 253
56811-253 253 253 253 253 253 253 253 253 253 253 253
56812-202 202 202 14 14 14 2 2 6 2 2 6
56813- 2 2 6 2 2 6 2 2 6 2 2 6
56814- 42 42 42 86 86 86 42 42 42 18 18 18
56815- 6 6 6 0 0 0 0 0 0 0 0 0
56816- 0 0 0 0 0 0 0 0 0 0 0 0
56817- 0 0 0 0 0 0 0 0 0 0 0 0
56818- 0 0 0 0 0 0 0 0 0 0 0 0
56819- 0 0 0 0 0 0 0 0 0 0 0 0
56820- 0 0 0 0 0 0 0 0 0 0 0 0
56821- 0 0 0 0 0 0 0 0 0 0 0 0
56822- 0 0 0 0 0 0 0 0 0 0 0 0
56823- 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 6 6 6
56826- 14 14 14 38 38 38 74 74 74 66 66 66
56827- 2 2 6 6 6 6 90 90 90 250 250 250
56828-253 253 253 253 253 253 238 238 238 198 198 198
56829-190 190 190 190 190 190 195 195 195 221 221 221
56830-246 246 246 253 253 253 253 253 253 253 253 253
56831-253 253 253 253 253 253 253 253 253 253 253 253
56832-253 253 253 82 82 82 2 2 6 2 2 6
56833- 2 2 6 2 2 6 2 2 6 2 2 6
56834- 2 2 6 78 78 78 70 70 70 34 34 34
56835- 14 14 14 6 6 6 0 0 0 0 0 0
56836- 0 0 0 0 0 0 0 0 0 0 0 0
56837- 0 0 0 0 0 0 0 0 0 0 0 0
56838- 0 0 0 0 0 0 0 0 0 0 0 0
56839- 0 0 0 0 0 0 0 0 0 0 0 0
56840- 0 0 0 0 0 0 0 0 0 0 0 0
56841- 0 0 0 0 0 0 0 0 0 0 0 0
56842- 0 0 0 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 14 14 14
56846- 34 34 34 66 66 66 78 78 78 6 6 6
56847- 2 2 6 18 18 18 218 218 218 253 253 253
56848-253 253 253 253 253 253 253 253 253 246 246 246
56849-226 226 226 231 231 231 246 246 246 253 253 253
56850-253 253 253 253 253 253 253 253 253 253 253 253
56851-253 253 253 253 253 253 253 253 253 253 253 253
56852-253 253 253 178 178 178 2 2 6 2 2 6
56853- 2 2 6 2 2 6 2 2 6 2 2 6
56854- 2 2 6 18 18 18 90 90 90 62 62 62
56855- 30 30 30 10 10 10 0 0 0 0 0 0
56856- 0 0 0 0 0 0 0 0 0 0 0 0
56857- 0 0 0 0 0 0 0 0 0 0 0 0
56858- 0 0 0 0 0 0 0 0 0 0 0 0
56859- 0 0 0 0 0 0 0 0 0 0 0 0
56860- 0 0 0 0 0 0 0 0 0 0 0 0
56861- 0 0 0 0 0 0 0 0 0 0 0 0
56862- 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 10 10 10 26 26 26
56866- 58 58 58 90 90 90 18 18 18 2 2 6
56867- 2 2 6 110 110 110 253 253 253 253 253 253
56868-253 253 253 253 253 253 253 253 253 253 253 253
56869-250 250 250 253 253 253 253 253 253 253 253 253
56870-253 253 253 253 253 253 253 253 253 253 253 253
56871-253 253 253 253 253 253 253 253 253 253 253 253
56872-253 253 253 231 231 231 18 18 18 2 2 6
56873- 2 2 6 2 2 6 2 2 6 2 2 6
56874- 2 2 6 2 2 6 18 18 18 94 94 94
56875- 54 54 54 26 26 26 10 10 10 0 0 0
56876- 0 0 0 0 0 0 0 0 0 0 0 0
56877- 0 0 0 0 0 0 0 0 0 0 0 0
56878- 0 0 0 0 0 0 0 0 0 0 0 0
56879- 0 0 0 0 0 0 0 0 0 0 0 0
56880- 0 0 0 0 0 0 0 0 0 0 0 0
56881- 0 0 0 0 0 0 0 0 0 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 6 6 6 22 22 22 50 50 50
56886- 90 90 90 26 26 26 2 2 6 2 2 6
56887- 14 14 14 195 195 195 250 250 250 253 253 253
56888-253 253 253 253 253 253 253 253 253 253 253 253
56889-253 253 253 253 253 253 253 253 253 253 253 253
56890-253 253 253 253 253 253 253 253 253 253 253 253
56891-253 253 253 253 253 253 253 253 253 253 253 253
56892-250 250 250 242 242 242 54 54 54 2 2 6
56893- 2 2 6 2 2 6 2 2 6 2 2 6
56894- 2 2 6 2 2 6 2 2 6 38 38 38
56895- 86 86 86 50 50 50 22 22 22 6 6 6
56896- 0 0 0 0 0 0 0 0 0 0 0 0
56897- 0 0 0 0 0 0 0 0 0 0 0 0
56898- 0 0 0 0 0 0 0 0 0 0 0 0
56899- 0 0 0 0 0 0 0 0 0 0 0 0
56900- 0 0 0 0 0 0 0 0 0 0 0 0
56901- 0 0 0 0 0 0 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- 6 6 6 14 14 14 38 38 38 82 82 82
56906- 34 34 34 2 2 6 2 2 6 2 2 6
56907- 42 42 42 195 195 195 246 246 246 253 253 253
56908-253 253 253 253 253 253 253 253 253 250 250 250
56909-242 242 242 242 242 242 250 250 250 253 253 253
56910-253 253 253 253 253 253 253 253 253 253 253 253
56911-253 253 253 250 250 250 246 246 246 238 238 238
56912-226 226 226 231 231 231 101 101 101 6 6 6
56913- 2 2 6 2 2 6 2 2 6 2 2 6
56914- 2 2 6 2 2 6 2 2 6 2 2 6
56915- 38 38 38 82 82 82 42 42 42 14 14 14
56916- 6 6 6 0 0 0 0 0 0 0 0 0
56917- 0 0 0 0 0 0 0 0 0 0 0 0
56918- 0 0 0 0 0 0 0 0 0 0 0 0
56919- 0 0 0 0 0 0 0 0 0 0 0 0
56920- 0 0 0 0 0 0 0 0 0 0 0 0
56921- 0 0 0 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- 10 10 10 26 26 26 62 62 62 66 66 66
56926- 2 2 6 2 2 6 2 2 6 6 6 6
56927- 70 70 70 170 170 170 206 206 206 234 234 234
56928-246 246 246 250 250 250 250 250 250 238 238 238
56929-226 226 226 231 231 231 238 238 238 250 250 250
56930-250 250 250 250 250 250 246 246 246 231 231 231
56931-214 214 214 206 206 206 202 202 202 202 202 202
56932-198 198 198 202 202 202 182 182 182 18 18 18
56933- 2 2 6 2 2 6 2 2 6 2 2 6
56934- 2 2 6 2 2 6 2 2 6 2 2 6
56935- 2 2 6 62 62 62 66 66 66 30 30 30
56936- 10 10 10 0 0 0 0 0 0 0 0 0
56937- 0 0 0 0 0 0 0 0 0 0 0 0
56938- 0 0 0 0 0 0 0 0 0 0 0 0
56939- 0 0 0 0 0 0 0 0 0 0 0 0
56940- 0 0 0 0 0 0 0 0 0 0 0 0
56941- 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- 14 14 14 42 42 42 82 82 82 18 18 18
56946- 2 2 6 2 2 6 2 2 6 10 10 10
56947- 94 94 94 182 182 182 218 218 218 242 242 242
56948-250 250 250 253 253 253 253 253 253 250 250 250
56949-234 234 234 253 253 253 253 253 253 253 253 253
56950-253 253 253 253 253 253 253 253 253 246 246 246
56951-238 238 238 226 226 226 210 210 210 202 202 202
56952-195 195 195 195 195 195 210 210 210 158 158 158
56953- 6 6 6 14 14 14 50 50 50 14 14 14
56954- 2 2 6 2 2 6 2 2 6 2 2 6
56955- 2 2 6 6 6 6 86 86 86 46 46 46
56956- 18 18 18 6 6 6 0 0 0 0 0 0
56957- 0 0 0 0 0 0 0 0 0 0 0 0
56958- 0 0 0 0 0 0 0 0 0 0 0 0
56959- 0 0 0 0 0 0 0 0 0 0 0 0
56960- 0 0 0 0 0 0 0 0 0 0 0 0
56961- 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 6 6 6
56965- 22 22 22 54 54 54 70 70 70 2 2 6
56966- 2 2 6 10 10 10 2 2 6 22 22 22
56967-166 166 166 231 231 231 250 250 250 253 253 253
56968-253 253 253 253 253 253 253 253 253 250 250 250
56969-242 242 242 253 253 253 253 253 253 253 253 253
56970-253 253 253 253 253 253 253 253 253 253 253 253
56971-253 253 253 253 253 253 253 253 253 246 246 246
56972-231 231 231 206 206 206 198 198 198 226 226 226
56973- 94 94 94 2 2 6 6 6 6 38 38 38
56974- 30 30 30 2 2 6 2 2 6 2 2 6
56975- 2 2 6 2 2 6 62 62 62 66 66 66
56976- 26 26 26 10 10 10 0 0 0 0 0 0
56977- 0 0 0 0 0 0 0 0 0 0 0 0
56978- 0 0 0 0 0 0 0 0 0 0 0 0
56979- 0 0 0 0 0 0 0 0 0 0 0 0
56980- 0 0 0 0 0 0 0 0 0 0 0 0
56981- 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 10 10 10
56985- 30 30 30 74 74 74 50 50 50 2 2 6
56986- 26 26 26 26 26 26 2 2 6 106 106 106
56987-238 238 238 253 253 253 253 253 253 253 253 253
56988-253 253 253 253 253 253 253 253 253 253 253 253
56989-253 253 253 253 253 253 253 253 253 253 253 253
56990-253 253 253 253 253 253 253 253 253 253 253 253
56991-253 253 253 253 253 253 253 253 253 253 253 253
56992-253 253 253 246 246 246 218 218 218 202 202 202
56993-210 210 210 14 14 14 2 2 6 2 2 6
56994- 30 30 30 22 22 22 2 2 6 2 2 6
56995- 2 2 6 2 2 6 18 18 18 86 86 86
56996- 42 42 42 14 14 14 0 0 0 0 0 0
56997- 0 0 0 0 0 0 0 0 0 0 0 0
56998- 0 0 0 0 0 0 0 0 0 0 0 0
56999- 0 0 0 0 0 0 0 0 0 0 0 0
57000- 0 0 0 0 0 0 0 0 0 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 14 14 14
57005- 42 42 42 90 90 90 22 22 22 2 2 6
57006- 42 42 42 2 2 6 18 18 18 218 218 218
57007-253 253 253 253 253 253 253 253 253 253 253 253
57008-253 253 253 253 253 253 253 253 253 253 253 253
57009-253 253 253 253 253 253 253 253 253 253 253 253
57010-253 253 253 253 253 253 253 253 253 253 253 253
57011-253 253 253 253 253 253 253 253 253 253 253 253
57012-253 253 253 253 253 253 250 250 250 221 221 221
57013-218 218 218 101 101 101 2 2 6 14 14 14
57014- 18 18 18 38 38 38 10 10 10 2 2 6
57015- 2 2 6 2 2 6 2 2 6 78 78 78
57016- 58 58 58 22 22 22 6 6 6 0 0 0
57017- 0 0 0 0 0 0 0 0 0 0 0 0
57018- 0 0 0 0 0 0 0 0 0 0 0 0
57019- 0 0 0 0 0 0 0 0 0 0 0 0
57020- 0 0 0 0 0 0 0 0 0 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 6 6 6 18 18 18
57025- 54 54 54 82 82 82 2 2 6 26 26 26
57026- 22 22 22 2 2 6 123 123 123 253 253 253
57027-253 253 253 253 253 253 253 253 253 253 253 253
57028-253 253 253 253 253 253 253 253 253 253 253 253
57029-253 253 253 253 253 253 253 253 253 253 253 253
57030-253 253 253 253 253 253 253 253 253 253 253 253
57031-253 253 253 253 253 253 253 253 253 253 253 253
57032-253 253 253 253 253 253 253 253 253 250 250 250
57033-238 238 238 198 198 198 6 6 6 38 38 38
57034- 58 58 58 26 26 26 38 38 38 2 2 6
57035- 2 2 6 2 2 6 2 2 6 46 46 46
57036- 78 78 78 30 30 30 10 10 10 0 0 0
57037- 0 0 0 0 0 0 0 0 0 0 0 0
57038- 0 0 0 0 0 0 0 0 0 0 0 0
57039- 0 0 0 0 0 0 0 0 0 0 0 0
57040- 0 0 0 0 0 0 0 0 0 0 0 0
57041- 0 0 0 0 0 0 0 0 0 0 0 0
57042- 0 0 0 0 0 0 0 0 0 0 0 0
57043- 0 0 0 0 0 0 0 0 0 0 0 0
57044- 0 0 0 0 0 0 10 10 10 30 30 30
57045- 74 74 74 58 58 58 2 2 6 42 42 42
57046- 2 2 6 22 22 22 231 231 231 253 253 253
57047-253 253 253 253 253 253 253 253 253 253 253 253
57048-253 253 253 253 253 253 253 253 253 250 250 250
57049-253 253 253 253 253 253 253 253 253 253 253 253
57050-253 253 253 253 253 253 253 253 253 253 253 253
57051-253 253 253 253 253 253 253 253 253 253 253 253
57052-253 253 253 253 253 253 253 253 253 253 253 253
57053-253 253 253 246 246 246 46 46 46 38 38 38
57054- 42 42 42 14 14 14 38 38 38 14 14 14
57055- 2 2 6 2 2 6 2 2 6 6 6 6
57056- 86 86 86 46 46 46 14 14 14 0 0 0
57057- 0 0 0 0 0 0 0 0 0 0 0 0
57058- 0 0 0 0 0 0 0 0 0 0 0 0
57059- 0 0 0 0 0 0 0 0 0 0 0 0
57060- 0 0 0 0 0 0 0 0 0 0 0 0
57061- 0 0 0 0 0 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 6 6 6 14 14 14 42 42 42
57065- 90 90 90 18 18 18 18 18 18 26 26 26
57066- 2 2 6 116 116 116 253 253 253 253 253 253
57067-253 253 253 253 253 253 253 253 253 253 253 253
57068-253 253 253 253 253 253 250 250 250 238 238 238
57069-253 253 253 253 253 253 253 253 253 253 253 253
57070-253 253 253 253 253 253 253 253 253 253 253 253
57071-253 253 253 253 253 253 253 253 253 253 253 253
57072-253 253 253 253 253 253 253 253 253 253 253 253
57073-253 253 253 253 253 253 94 94 94 6 6 6
57074- 2 2 6 2 2 6 10 10 10 34 34 34
57075- 2 2 6 2 2 6 2 2 6 2 2 6
57076- 74 74 74 58 58 58 22 22 22 6 6 6
57077- 0 0 0 0 0 0 0 0 0 0 0 0
57078- 0 0 0 0 0 0 0 0 0 0 0 0
57079- 0 0 0 0 0 0 0 0 0 0 0 0
57080- 0 0 0 0 0 0 0 0 0 0 0 0
57081- 0 0 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 10 10 10 26 26 26 66 66 66
57085- 82 82 82 2 2 6 38 38 38 6 6 6
57086- 14 14 14 210 210 210 253 253 253 253 253 253
57087-253 253 253 253 253 253 253 253 253 253 253 253
57088-253 253 253 253 253 253 246 246 246 242 242 242
57089-253 253 253 253 253 253 253 253 253 253 253 253
57090-253 253 253 253 253 253 253 253 253 253 253 253
57091-253 253 253 253 253 253 253 253 253 253 253 253
57092-253 253 253 253 253 253 253 253 253 253 253 253
57093-253 253 253 253 253 253 144 144 144 2 2 6
57094- 2 2 6 2 2 6 2 2 6 46 46 46
57095- 2 2 6 2 2 6 2 2 6 2 2 6
57096- 42 42 42 74 74 74 30 30 30 10 10 10
57097- 0 0 0 0 0 0 0 0 0 0 0 0
57098- 0 0 0 0 0 0 0 0 0 0 0 0
57099- 0 0 0 0 0 0 0 0 0 0 0 0
57100- 0 0 0 0 0 0 0 0 0 0 0 0
57101- 0 0 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- 6 6 6 14 14 14 42 42 42 90 90 90
57105- 26 26 26 6 6 6 42 42 42 2 2 6
57106- 74 74 74 250 250 250 253 253 253 253 253 253
57107-253 253 253 253 253 253 253 253 253 253 253 253
57108-253 253 253 253 253 253 242 242 242 242 242 242
57109-253 253 253 253 253 253 253 253 253 253 253 253
57110-253 253 253 253 253 253 253 253 253 253 253 253
57111-253 253 253 253 253 253 253 253 253 253 253 253
57112-253 253 253 253 253 253 253 253 253 253 253 253
57113-253 253 253 253 253 253 182 182 182 2 2 6
57114- 2 2 6 2 2 6 2 2 6 46 46 46
57115- 2 2 6 2 2 6 2 2 6 2 2 6
57116- 10 10 10 86 86 86 38 38 38 10 10 10
57117- 0 0 0 0 0 0 0 0 0 0 0 0
57118- 0 0 0 0 0 0 0 0 0 0 0 0
57119- 0 0 0 0 0 0 0 0 0 0 0 0
57120- 0 0 0 0 0 0 0 0 0 0 0 0
57121- 0 0 0 0 0 0 0 0 0 0 0 0
57122- 0 0 0 0 0 0 0 0 0 0 0 0
57123- 0 0 0 0 0 0 0 0 0 0 0 0
57124- 10 10 10 26 26 26 66 66 66 82 82 82
57125- 2 2 6 22 22 22 18 18 18 2 2 6
57126-149 149 149 253 253 253 253 253 253 253 253 253
57127-253 253 253 253 253 253 253 253 253 253 253 253
57128-253 253 253 253 253 253 234 234 234 242 242 242
57129-253 253 253 253 253 253 253 253 253 253 253 253
57130-253 253 253 253 253 253 253 253 253 253 253 253
57131-253 253 253 253 253 253 253 253 253 253 253 253
57132-253 253 253 253 253 253 253 253 253 253 253 253
57133-253 253 253 253 253 253 206 206 206 2 2 6
57134- 2 2 6 2 2 6 2 2 6 38 38 38
57135- 2 2 6 2 2 6 2 2 6 2 2 6
57136- 6 6 6 86 86 86 46 46 46 14 14 14
57137- 0 0 0 0 0 0 0 0 0 0 0 0
57138- 0 0 0 0 0 0 0 0 0 0 0 0
57139- 0 0 0 0 0 0 0 0 0 0 0 0
57140- 0 0 0 0 0 0 0 0 0 0 0 0
57141- 0 0 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 6 6 6
57144- 18 18 18 46 46 46 86 86 86 18 18 18
57145- 2 2 6 34 34 34 10 10 10 6 6 6
57146-210 210 210 253 253 253 253 253 253 253 253 253
57147-253 253 253 253 253 253 253 253 253 253 253 253
57148-253 253 253 253 253 253 234 234 234 242 242 242
57149-253 253 253 253 253 253 253 253 253 253 253 253
57150-253 253 253 253 253 253 253 253 253 253 253 253
57151-253 253 253 253 253 253 253 253 253 253 253 253
57152-253 253 253 253 253 253 253 253 253 253 253 253
57153-253 253 253 253 253 253 221 221 221 6 6 6
57154- 2 2 6 2 2 6 6 6 6 30 30 30
57155- 2 2 6 2 2 6 2 2 6 2 2 6
57156- 2 2 6 82 82 82 54 54 54 18 18 18
57157- 6 6 6 0 0 0 0 0 0 0 0 0
57158- 0 0 0 0 0 0 0 0 0 0 0 0
57159- 0 0 0 0 0 0 0 0 0 0 0 0
57160- 0 0 0 0 0 0 0 0 0 0 0 0
57161- 0 0 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 10 10 10
57164- 26 26 26 66 66 66 62 62 62 2 2 6
57165- 2 2 6 38 38 38 10 10 10 26 26 26
57166-238 238 238 253 253 253 253 253 253 253 253 253
57167-253 253 253 253 253 253 253 253 253 253 253 253
57168-253 253 253 253 253 253 231 231 231 238 238 238
57169-253 253 253 253 253 253 253 253 253 253 253 253
57170-253 253 253 253 253 253 253 253 253 253 253 253
57171-253 253 253 253 253 253 253 253 253 253 253 253
57172-253 253 253 253 253 253 253 253 253 253 253 253
57173-253 253 253 253 253 253 231 231 231 6 6 6
57174- 2 2 6 2 2 6 10 10 10 30 30 30
57175- 2 2 6 2 2 6 2 2 6 2 2 6
57176- 2 2 6 66 66 66 58 58 58 22 22 22
57177- 6 6 6 0 0 0 0 0 0 0 0 0
57178- 0 0 0 0 0 0 0 0 0 0 0 0
57179- 0 0 0 0 0 0 0 0 0 0 0 0
57180- 0 0 0 0 0 0 0 0 0 0 0 0
57181- 0 0 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 10 10 10
57184- 38 38 38 78 78 78 6 6 6 2 2 6
57185- 2 2 6 46 46 46 14 14 14 42 42 42
57186-246 246 246 253 253 253 253 253 253 253 253 253
57187-253 253 253 253 253 253 253 253 253 253 253 253
57188-253 253 253 253 253 253 231 231 231 242 242 242
57189-253 253 253 253 253 253 253 253 253 253 253 253
57190-253 253 253 253 253 253 253 253 253 253 253 253
57191-253 253 253 253 253 253 253 253 253 253 253 253
57192-253 253 253 253 253 253 253 253 253 253 253 253
57193-253 253 253 253 253 253 234 234 234 10 10 10
57194- 2 2 6 2 2 6 22 22 22 14 14 14
57195- 2 2 6 2 2 6 2 2 6 2 2 6
57196- 2 2 6 66 66 66 62 62 62 22 22 22
57197- 6 6 6 0 0 0 0 0 0 0 0 0
57198- 0 0 0 0 0 0 0 0 0 0 0 0
57199- 0 0 0 0 0 0 0 0 0 0 0 0
57200- 0 0 0 0 0 0 0 0 0 0 0 0
57201- 0 0 0 0 0 0 0 0 0 0 0 0
57202- 0 0 0 0 0 0 0 0 0 0 0 0
57203- 0 0 0 0 0 0 6 6 6 18 18 18
57204- 50 50 50 74 74 74 2 2 6 2 2 6
57205- 14 14 14 70 70 70 34 34 34 62 62 62
57206-250 250 250 253 253 253 253 253 253 253 253 253
57207-253 253 253 253 253 253 253 253 253 253 253 253
57208-253 253 253 253 253 253 231 231 231 246 246 246
57209-253 253 253 253 253 253 253 253 253 253 253 253
57210-253 253 253 253 253 253 253 253 253 253 253 253
57211-253 253 253 253 253 253 253 253 253 253 253 253
57212-253 253 253 253 253 253 253 253 253 253 253 253
57213-253 253 253 253 253 253 234 234 234 14 14 14
57214- 2 2 6 2 2 6 30 30 30 2 2 6
57215- 2 2 6 2 2 6 2 2 6 2 2 6
57216- 2 2 6 66 66 66 62 62 62 22 22 22
57217- 6 6 6 0 0 0 0 0 0 0 0 0
57218- 0 0 0 0 0 0 0 0 0 0 0 0
57219- 0 0 0 0 0 0 0 0 0 0 0 0
57220- 0 0 0 0 0 0 0 0 0 0 0 0
57221- 0 0 0 0 0 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 6 6 6 18 18 18
57224- 54 54 54 62 62 62 2 2 6 2 2 6
57225- 2 2 6 30 30 30 46 46 46 70 70 70
57226-250 250 250 253 253 253 253 253 253 253 253 253
57227-253 253 253 253 253 253 253 253 253 253 253 253
57228-253 253 253 253 253 253 231 231 231 246 246 246
57229-253 253 253 253 253 253 253 253 253 253 253 253
57230-253 253 253 253 253 253 253 253 253 253 253 253
57231-253 253 253 253 253 253 253 253 253 253 253 253
57232-253 253 253 253 253 253 253 253 253 253 253 253
57233-253 253 253 253 253 253 226 226 226 10 10 10
57234- 2 2 6 6 6 6 30 30 30 2 2 6
57235- 2 2 6 2 2 6 2 2 6 2 2 6
57236- 2 2 6 66 66 66 58 58 58 22 22 22
57237- 6 6 6 0 0 0 0 0 0 0 0 0
57238- 0 0 0 0 0 0 0 0 0 0 0 0
57239- 0 0 0 0 0 0 0 0 0 0 0 0
57240- 0 0 0 0 0 0 0 0 0 0 0 0
57241- 0 0 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 6 6 6 22 22 22
57244- 58 58 58 62 62 62 2 2 6 2 2 6
57245- 2 2 6 2 2 6 30 30 30 78 78 78
57246-250 250 250 253 253 253 253 253 253 253 253 253
57247-253 253 253 253 253 253 253 253 253 253 253 253
57248-253 253 253 253 253 253 231 231 231 246 246 246
57249-253 253 253 253 253 253 253 253 253 253 253 253
57250-253 253 253 253 253 253 253 253 253 253 253 253
57251-253 253 253 253 253 253 253 253 253 253 253 253
57252-253 253 253 253 253 253 253 253 253 253 253 253
57253-253 253 253 253 253 253 206 206 206 2 2 6
57254- 22 22 22 34 34 34 18 14 6 22 22 22
57255- 26 26 26 18 18 18 6 6 6 2 2 6
57256- 2 2 6 82 82 82 54 54 54 18 18 18
57257- 6 6 6 0 0 0 0 0 0 0 0 0
57258- 0 0 0 0 0 0 0 0 0 0 0 0
57259- 0 0 0 0 0 0 0 0 0 0 0 0
57260- 0 0 0 0 0 0 0 0 0 0 0 0
57261- 0 0 0 0 0 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 6 6 6 26 26 26
57264- 62 62 62 106 106 106 74 54 14 185 133 11
57265-210 162 10 121 92 8 6 6 6 62 62 62
57266-238 238 238 253 253 253 253 253 253 253 253 253
57267-253 253 253 253 253 253 253 253 253 253 253 253
57268-253 253 253 253 253 253 231 231 231 246 246 246
57269-253 253 253 253 253 253 253 253 253 253 253 253
57270-253 253 253 253 253 253 253 253 253 253 253 253
57271-253 253 253 253 253 253 253 253 253 253 253 253
57272-253 253 253 253 253 253 253 253 253 253 253 253
57273-253 253 253 253 253 253 158 158 158 18 18 18
57274- 14 14 14 2 2 6 2 2 6 2 2 6
57275- 6 6 6 18 18 18 66 66 66 38 38 38
57276- 6 6 6 94 94 94 50 50 50 18 18 18
57277- 6 6 6 0 0 0 0 0 0 0 0 0
57278- 0 0 0 0 0 0 0 0 0 0 0 0
57279- 0 0 0 0 0 0 0 0 0 0 0 0
57280- 0 0 0 0 0 0 0 0 0 0 0 0
57281- 0 0 0 0 0 0 0 0 0 0 0 0
57282- 0 0 0 0 0 0 0 0 0 6 6 6
57283- 10 10 10 10 10 10 18 18 18 38 38 38
57284- 78 78 78 142 134 106 216 158 10 242 186 14
57285-246 190 14 246 190 14 156 118 10 10 10 10
57286- 90 90 90 238 238 238 253 253 253 253 253 253
57287-253 253 253 253 253 253 253 253 253 253 253 253
57288-253 253 253 253 253 253 231 231 231 250 250 250
57289-253 253 253 253 253 253 253 253 253 253 253 253
57290-253 253 253 253 253 253 253 253 253 253 253 253
57291-253 253 253 253 253 253 253 253 253 253 253 253
57292-253 253 253 253 253 253 253 253 253 246 230 190
57293-238 204 91 238 204 91 181 142 44 37 26 9
57294- 2 2 6 2 2 6 2 2 6 2 2 6
57295- 2 2 6 2 2 6 38 38 38 46 46 46
57296- 26 26 26 106 106 106 54 54 54 18 18 18
57297- 6 6 6 0 0 0 0 0 0 0 0 0
57298- 0 0 0 0 0 0 0 0 0 0 0 0
57299- 0 0 0 0 0 0 0 0 0 0 0 0
57300- 0 0 0 0 0 0 0 0 0 0 0 0
57301- 0 0 0 0 0 0 0 0 0 0 0 0
57302- 0 0 0 6 6 6 14 14 14 22 22 22
57303- 30 30 30 38 38 38 50 50 50 70 70 70
57304-106 106 106 190 142 34 226 170 11 242 186 14
57305-246 190 14 246 190 14 246 190 14 154 114 10
57306- 6 6 6 74 74 74 226 226 226 253 253 253
57307-253 253 253 253 253 253 253 253 253 253 253 253
57308-253 253 253 253 253 253 231 231 231 250 250 250
57309-253 253 253 253 253 253 253 253 253 253 253 253
57310-253 253 253 253 253 253 253 253 253 253 253 253
57311-253 253 253 253 253 253 253 253 253 253 253 253
57312-253 253 253 253 253 253 253 253 253 228 184 62
57313-241 196 14 241 208 19 232 195 16 38 30 10
57314- 2 2 6 2 2 6 2 2 6 2 2 6
57315- 2 2 6 6 6 6 30 30 30 26 26 26
57316-203 166 17 154 142 90 66 66 66 26 26 26
57317- 6 6 6 0 0 0 0 0 0 0 0 0
57318- 0 0 0 0 0 0 0 0 0 0 0 0
57319- 0 0 0 0 0 0 0 0 0 0 0 0
57320- 0 0 0 0 0 0 0 0 0 0 0 0
57321- 0 0 0 0 0 0 0 0 0 0 0 0
57322- 6 6 6 18 18 18 38 38 38 58 58 58
57323- 78 78 78 86 86 86 101 101 101 123 123 123
57324-175 146 61 210 150 10 234 174 13 246 186 14
57325-246 190 14 246 190 14 246 190 14 238 190 10
57326-102 78 10 2 2 6 46 46 46 198 198 198
57327-253 253 253 253 253 253 253 253 253 253 253 253
57328-253 253 253 253 253 253 234 234 234 242 242 242
57329-253 253 253 253 253 253 253 253 253 253 253 253
57330-253 253 253 253 253 253 253 253 253 253 253 253
57331-253 253 253 253 253 253 253 253 253 253 253 253
57332-253 253 253 253 253 253 253 253 253 224 178 62
57333-242 186 14 241 196 14 210 166 10 22 18 6
57334- 2 2 6 2 2 6 2 2 6 2 2 6
57335- 2 2 6 2 2 6 6 6 6 121 92 8
57336-238 202 15 232 195 16 82 82 82 34 34 34
57337- 10 10 10 0 0 0 0 0 0 0 0 0
57338- 0 0 0 0 0 0 0 0 0 0 0 0
57339- 0 0 0 0 0 0 0 0 0 0 0 0
57340- 0 0 0 0 0 0 0 0 0 0 0 0
57341- 0 0 0 0 0 0 0 0 0 0 0 0
57342- 14 14 14 38 38 38 70 70 70 154 122 46
57343-190 142 34 200 144 11 197 138 11 197 138 11
57344-213 154 11 226 170 11 242 186 14 246 190 14
57345-246 190 14 246 190 14 246 190 14 246 190 14
57346-225 175 15 46 32 6 2 2 6 22 22 22
57347-158 158 158 250 250 250 253 253 253 253 253 253
57348-253 253 253 253 253 253 253 253 253 253 253 253
57349-253 253 253 253 253 253 253 253 253 253 253 253
57350-253 253 253 253 253 253 253 253 253 253 253 253
57351-253 253 253 253 253 253 253 253 253 253 253 253
57352-253 253 253 250 250 250 242 242 242 224 178 62
57353-239 182 13 236 186 11 213 154 11 46 32 6
57354- 2 2 6 2 2 6 2 2 6 2 2 6
57355- 2 2 6 2 2 6 61 42 6 225 175 15
57356-238 190 10 236 186 11 112 100 78 42 42 42
57357- 14 14 14 0 0 0 0 0 0 0 0 0
57358- 0 0 0 0 0 0 0 0 0 0 0 0
57359- 0 0 0 0 0 0 0 0 0 0 0 0
57360- 0 0 0 0 0 0 0 0 0 0 0 0
57361- 0 0 0 0 0 0 0 0 0 6 6 6
57362- 22 22 22 54 54 54 154 122 46 213 154 11
57363-226 170 11 230 174 11 226 170 11 226 170 11
57364-236 178 12 242 186 14 246 190 14 246 190 14
57365-246 190 14 246 190 14 246 190 14 246 190 14
57366-241 196 14 184 144 12 10 10 10 2 2 6
57367- 6 6 6 116 116 116 242 242 242 253 253 253
57368-253 253 253 253 253 253 253 253 253 253 253 253
57369-253 253 253 253 253 253 253 253 253 253 253 253
57370-253 253 253 253 253 253 253 253 253 253 253 253
57371-253 253 253 253 253 253 253 253 253 253 253 253
57372-253 253 253 231 231 231 198 198 198 214 170 54
57373-236 178 12 236 178 12 210 150 10 137 92 6
57374- 18 14 6 2 2 6 2 2 6 2 2 6
57375- 6 6 6 70 47 6 200 144 11 236 178 12
57376-239 182 13 239 182 13 124 112 88 58 58 58
57377- 22 22 22 6 6 6 0 0 0 0 0 0
57378- 0 0 0 0 0 0 0 0 0 0 0 0
57379- 0 0 0 0 0 0 0 0 0 0 0 0
57380- 0 0 0 0 0 0 0 0 0 0 0 0
57381- 0 0 0 0 0 0 0 0 0 10 10 10
57382- 30 30 30 70 70 70 180 133 36 226 170 11
57383-239 182 13 242 186 14 242 186 14 246 186 14
57384-246 190 14 246 190 14 246 190 14 246 190 14
57385-246 190 14 246 190 14 246 190 14 246 190 14
57386-246 190 14 232 195 16 98 70 6 2 2 6
57387- 2 2 6 2 2 6 66 66 66 221 221 221
57388-253 253 253 253 253 253 253 253 253 253 253 253
57389-253 253 253 253 253 253 253 253 253 253 253 253
57390-253 253 253 253 253 253 253 253 253 253 253 253
57391-253 253 253 253 253 253 253 253 253 253 253 253
57392-253 253 253 206 206 206 198 198 198 214 166 58
57393-230 174 11 230 174 11 216 158 10 192 133 9
57394-163 110 8 116 81 8 102 78 10 116 81 8
57395-167 114 7 197 138 11 226 170 11 239 182 13
57396-242 186 14 242 186 14 162 146 94 78 78 78
57397- 34 34 34 14 14 14 6 6 6 0 0 0
57398- 0 0 0 0 0 0 0 0 0 0 0 0
57399- 0 0 0 0 0 0 0 0 0 0 0 0
57400- 0 0 0 0 0 0 0 0 0 0 0 0
57401- 0 0 0 0 0 0 0 0 0 6 6 6
57402- 30 30 30 78 78 78 190 142 34 226 170 11
57403-239 182 13 246 190 14 246 190 14 246 190 14
57404-246 190 14 246 190 14 246 190 14 246 190 14
57405-246 190 14 246 190 14 246 190 14 246 190 14
57406-246 190 14 241 196 14 203 166 17 22 18 6
57407- 2 2 6 2 2 6 2 2 6 38 38 38
57408-218 218 218 253 253 253 253 253 253 253 253 253
57409-253 253 253 253 253 253 253 253 253 253 253 253
57410-253 253 253 253 253 253 253 253 253 253 253 253
57411-253 253 253 253 253 253 253 253 253 253 253 253
57412-250 250 250 206 206 206 198 198 198 202 162 69
57413-226 170 11 236 178 12 224 166 10 210 150 10
57414-200 144 11 197 138 11 192 133 9 197 138 11
57415-210 150 10 226 170 11 242 186 14 246 190 14
57416-246 190 14 246 186 14 225 175 15 124 112 88
57417- 62 62 62 30 30 30 14 14 14 6 6 6
57418- 0 0 0 0 0 0 0 0 0 0 0 0
57419- 0 0 0 0 0 0 0 0 0 0 0 0
57420- 0 0 0 0 0 0 0 0 0 0 0 0
57421- 0 0 0 0 0 0 0 0 0 10 10 10
57422- 30 30 30 78 78 78 174 135 50 224 166 10
57423-239 182 13 246 190 14 246 190 14 246 190 14
57424-246 190 14 246 190 14 246 190 14 246 190 14
57425-246 190 14 246 190 14 246 190 14 246 190 14
57426-246 190 14 246 190 14 241 196 14 139 102 15
57427- 2 2 6 2 2 6 2 2 6 2 2 6
57428- 78 78 78 250 250 250 253 253 253 253 253 253
57429-253 253 253 253 253 253 253 253 253 253 253 253
57430-253 253 253 253 253 253 253 253 253 253 253 253
57431-253 253 253 253 253 253 253 253 253 253 253 253
57432-250 250 250 214 214 214 198 198 198 190 150 46
57433-219 162 10 236 178 12 234 174 13 224 166 10
57434-216 158 10 213 154 11 213 154 11 216 158 10
57435-226 170 11 239 182 13 246 190 14 246 190 14
57436-246 190 14 246 190 14 242 186 14 206 162 42
57437-101 101 101 58 58 58 30 30 30 14 14 14
57438- 6 6 6 0 0 0 0 0 0 0 0 0
57439- 0 0 0 0 0 0 0 0 0 0 0 0
57440- 0 0 0 0 0 0 0 0 0 0 0 0
57441- 0 0 0 0 0 0 0 0 0 10 10 10
57442- 30 30 30 74 74 74 174 135 50 216 158 10
57443-236 178 12 246 190 14 246 190 14 246 190 14
57444-246 190 14 246 190 14 246 190 14 246 190 14
57445-246 190 14 246 190 14 246 190 14 246 190 14
57446-246 190 14 246 190 14 241 196 14 226 184 13
57447- 61 42 6 2 2 6 2 2 6 2 2 6
57448- 22 22 22 238 238 238 253 253 253 253 253 253
57449-253 253 253 253 253 253 253 253 253 253 253 253
57450-253 253 253 253 253 253 253 253 253 253 253 253
57451-253 253 253 253 253 253 253 253 253 253 253 253
57452-253 253 253 226 226 226 187 187 187 180 133 36
57453-216 158 10 236 178 12 239 182 13 236 178 12
57454-230 174 11 226 170 11 226 170 11 230 174 11
57455-236 178 12 242 186 14 246 190 14 246 190 14
57456-246 190 14 246 190 14 246 186 14 239 182 13
57457-206 162 42 106 106 106 66 66 66 34 34 34
57458- 14 14 14 6 6 6 0 0 0 0 0 0
57459- 0 0 0 0 0 0 0 0 0 0 0 0
57460- 0 0 0 0 0 0 0 0 0 0 0 0
57461- 0 0 0 0 0 0 0 0 0 6 6 6
57462- 26 26 26 70 70 70 163 133 67 213 154 11
57463-236 178 12 246 190 14 246 190 14 246 190 14
57464-246 190 14 246 190 14 246 190 14 246 190 14
57465-246 190 14 246 190 14 246 190 14 246 190 14
57466-246 190 14 246 190 14 246 190 14 241 196 14
57467-190 146 13 18 14 6 2 2 6 2 2 6
57468- 46 46 46 246 246 246 253 253 253 253 253 253
57469-253 253 253 253 253 253 253 253 253 253 253 253
57470-253 253 253 253 253 253 253 253 253 253 253 253
57471-253 253 253 253 253 253 253 253 253 253 253 253
57472-253 253 253 221 221 221 86 86 86 156 107 11
57473-216 158 10 236 178 12 242 186 14 246 186 14
57474-242 186 14 239 182 13 239 182 13 242 186 14
57475-242 186 14 246 186 14 246 190 14 246 190 14
57476-246 190 14 246 190 14 246 190 14 246 190 14
57477-242 186 14 225 175 15 142 122 72 66 66 66
57478- 30 30 30 10 10 10 0 0 0 0 0 0
57479- 0 0 0 0 0 0 0 0 0 0 0 0
57480- 0 0 0 0 0 0 0 0 0 0 0 0
57481- 0 0 0 0 0 0 0 0 0 6 6 6
57482- 26 26 26 70 70 70 163 133 67 210 150 10
57483-236 178 12 246 190 14 246 190 14 246 190 14
57484-246 190 14 246 190 14 246 190 14 246 190 14
57485-246 190 14 246 190 14 246 190 14 246 190 14
57486-246 190 14 246 190 14 246 190 14 246 190 14
57487-232 195 16 121 92 8 34 34 34 106 106 106
57488-221 221 221 253 253 253 253 253 253 253 253 253
57489-253 253 253 253 253 253 253 253 253 253 253 253
57490-253 253 253 253 253 253 253 253 253 253 253 253
57491-253 253 253 253 253 253 253 253 253 253 253 253
57492-242 242 242 82 82 82 18 14 6 163 110 8
57493-216 158 10 236 178 12 242 186 14 246 190 14
57494-246 190 14 246 190 14 246 190 14 246 190 14
57495-246 190 14 246 190 14 246 190 14 246 190 14
57496-246 190 14 246 190 14 246 190 14 246 190 14
57497-246 190 14 246 190 14 242 186 14 163 133 67
57498- 46 46 46 18 18 18 6 6 6 0 0 0
57499- 0 0 0 0 0 0 0 0 0 0 0 0
57500- 0 0 0 0 0 0 0 0 0 0 0 0
57501- 0 0 0 0 0 0 0 0 0 10 10 10
57502- 30 30 30 78 78 78 163 133 67 210 150 10
57503-236 178 12 246 186 14 246 190 14 246 190 14
57504-246 190 14 246 190 14 246 190 14 246 190 14
57505-246 190 14 246 190 14 246 190 14 246 190 14
57506-246 190 14 246 190 14 246 190 14 246 190 14
57507-241 196 14 215 174 15 190 178 144 253 253 253
57508-253 253 253 253 253 253 253 253 253 253 253 253
57509-253 253 253 253 253 253 253 253 253 253 253 253
57510-253 253 253 253 253 253 253 253 253 253 253 253
57511-253 253 253 253 253 253 253 253 253 218 218 218
57512- 58 58 58 2 2 6 22 18 6 167 114 7
57513-216 158 10 236 178 12 246 186 14 246 190 14
57514-246 190 14 246 190 14 246 190 14 246 190 14
57515-246 190 14 246 190 14 246 190 14 246 190 14
57516-246 190 14 246 190 14 246 190 14 246 190 14
57517-246 190 14 246 186 14 242 186 14 190 150 46
57518- 54 54 54 22 22 22 6 6 6 0 0 0
57519- 0 0 0 0 0 0 0 0 0 0 0 0
57520- 0 0 0 0 0 0 0 0 0 0 0 0
57521- 0 0 0 0 0 0 0 0 0 14 14 14
57522- 38 38 38 86 86 86 180 133 36 213 154 11
57523-236 178 12 246 186 14 246 190 14 246 190 14
57524-246 190 14 246 190 14 246 190 14 246 190 14
57525-246 190 14 246 190 14 246 190 14 246 190 14
57526-246 190 14 246 190 14 246 190 14 246 190 14
57527-246 190 14 232 195 16 190 146 13 214 214 214
57528-253 253 253 253 253 253 253 253 253 253 253 253
57529-253 253 253 253 253 253 253 253 253 253 253 253
57530-253 253 253 253 253 253 253 253 253 253 253 253
57531-253 253 253 250 250 250 170 170 170 26 26 26
57532- 2 2 6 2 2 6 37 26 9 163 110 8
57533-219 162 10 239 182 13 246 186 14 246 190 14
57534-246 190 14 246 190 14 246 190 14 246 190 14
57535-246 190 14 246 190 14 246 190 14 246 190 14
57536-246 190 14 246 190 14 246 190 14 246 190 14
57537-246 186 14 236 178 12 224 166 10 142 122 72
57538- 46 46 46 18 18 18 6 6 6 0 0 0
57539- 0 0 0 0 0 0 0 0 0 0 0 0
57540- 0 0 0 0 0 0 0 0 0 0 0 0
57541- 0 0 0 0 0 0 6 6 6 18 18 18
57542- 50 50 50 109 106 95 192 133 9 224 166 10
57543-242 186 14 246 190 14 246 190 14 246 190 14
57544-246 190 14 246 190 14 246 190 14 246 190 14
57545-246 190 14 246 190 14 246 190 14 246 190 14
57546-246 190 14 246 190 14 246 190 14 246 190 14
57547-242 186 14 226 184 13 210 162 10 142 110 46
57548-226 226 226 253 253 253 253 253 253 253 253 253
57549-253 253 253 253 253 253 253 253 253 253 253 253
57550-253 253 253 253 253 253 253 253 253 253 253 253
57551-198 198 198 66 66 66 2 2 6 2 2 6
57552- 2 2 6 2 2 6 50 34 6 156 107 11
57553-219 162 10 239 182 13 246 186 14 246 190 14
57554-246 190 14 246 190 14 246 190 14 246 190 14
57555-246 190 14 246 190 14 246 190 14 246 190 14
57556-246 190 14 246 190 14 246 190 14 242 186 14
57557-234 174 13 213 154 11 154 122 46 66 66 66
57558- 30 30 30 10 10 10 0 0 0 0 0 0
57559- 0 0 0 0 0 0 0 0 0 0 0 0
57560- 0 0 0 0 0 0 0 0 0 0 0 0
57561- 0 0 0 0 0 0 6 6 6 22 22 22
57562- 58 58 58 154 121 60 206 145 10 234 174 13
57563-242 186 14 246 186 14 246 190 14 246 190 14
57564-246 190 14 246 190 14 246 190 14 246 190 14
57565-246 190 14 246 190 14 246 190 14 246 190 14
57566-246 190 14 246 190 14 246 190 14 246 190 14
57567-246 186 14 236 178 12 210 162 10 163 110 8
57568- 61 42 6 138 138 138 218 218 218 250 250 250
57569-253 253 253 253 253 253 253 253 253 250 250 250
57570-242 242 242 210 210 210 144 144 144 66 66 66
57571- 6 6 6 2 2 6 2 2 6 2 2 6
57572- 2 2 6 2 2 6 61 42 6 163 110 8
57573-216 158 10 236 178 12 246 190 14 246 190 14
57574-246 190 14 246 190 14 246 190 14 246 190 14
57575-246 190 14 246 190 14 246 190 14 246 190 14
57576-246 190 14 239 182 13 230 174 11 216 158 10
57577-190 142 34 124 112 88 70 70 70 38 38 38
57578- 18 18 18 6 6 6 0 0 0 0 0 0
57579- 0 0 0 0 0 0 0 0 0 0 0 0
57580- 0 0 0 0 0 0 0 0 0 0 0 0
57581- 0 0 0 0 0 0 6 6 6 22 22 22
57582- 62 62 62 168 124 44 206 145 10 224 166 10
57583-236 178 12 239 182 13 242 186 14 242 186 14
57584-246 186 14 246 190 14 246 190 14 246 190 14
57585-246 190 14 246 190 14 246 190 14 246 190 14
57586-246 190 14 246 190 14 246 190 14 246 190 14
57587-246 190 14 236 178 12 216 158 10 175 118 6
57588- 80 54 7 2 2 6 6 6 6 30 30 30
57589- 54 54 54 62 62 62 50 50 50 38 38 38
57590- 14 14 14 2 2 6 2 2 6 2 2 6
57591- 2 2 6 2 2 6 2 2 6 2 2 6
57592- 2 2 6 6 6 6 80 54 7 167 114 7
57593-213 154 11 236 178 12 246 190 14 246 190 14
57594-246 190 14 246 190 14 246 190 14 246 190 14
57595-246 190 14 242 186 14 239 182 13 239 182 13
57596-230 174 11 210 150 10 174 135 50 124 112 88
57597- 82 82 82 54 54 54 34 34 34 18 18 18
57598- 6 6 6 0 0 0 0 0 0 0 0 0
57599- 0 0 0 0 0 0 0 0 0 0 0 0
57600- 0 0 0 0 0 0 0 0 0 0 0 0
57601- 0 0 0 0 0 0 6 6 6 18 18 18
57602- 50 50 50 158 118 36 192 133 9 200 144 11
57603-216 158 10 219 162 10 224 166 10 226 170 11
57604-230 174 11 236 178 12 239 182 13 239 182 13
57605-242 186 14 246 186 14 246 190 14 246 190 14
57606-246 190 14 246 190 14 246 190 14 246 190 14
57607-246 186 14 230 174 11 210 150 10 163 110 8
57608-104 69 6 10 10 10 2 2 6 2 2 6
57609- 2 2 6 2 2 6 2 2 6 2 2 6
57610- 2 2 6 2 2 6 2 2 6 2 2 6
57611- 2 2 6 2 2 6 2 2 6 2 2 6
57612- 2 2 6 6 6 6 91 60 6 167 114 7
57613-206 145 10 230 174 11 242 186 14 246 190 14
57614-246 190 14 246 190 14 246 186 14 242 186 14
57615-239 182 13 230 174 11 224 166 10 213 154 11
57616-180 133 36 124 112 88 86 86 86 58 58 58
57617- 38 38 38 22 22 22 10 10 10 6 6 6
57618- 0 0 0 0 0 0 0 0 0 0 0 0
57619- 0 0 0 0 0 0 0 0 0 0 0 0
57620- 0 0 0 0 0 0 0 0 0 0 0 0
57621- 0 0 0 0 0 0 0 0 0 14 14 14
57622- 34 34 34 70 70 70 138 110 50 158 118 36
57623-167 114 7 180 123 7 192 133 9 197 138 11
57624-200 144 11 206 145 10 213 154 11 219 162 10
57625-224 166 10 230 174 11 239 182 13 242 186 14
57626-246 186 14 246 186 14 246 186 14 246 186 14
57627-239 182 13 216 158 10 185 133 11 152 99 6
57628-104 69 6 18 14 6 2 2 6 2 2 6
57629- 2 2 6 2 2 6 2 2 6 2 2 6
57630- 2 2 6 2 2 6 2 2 6 2 2 6
57631- 2 2 6 2 2 6 2 2 6 2 2 6
57632- 2 2 6 6 6 6 80 54 7 152 99 6
57633-192 133 9 219 162 10 236 178 12 239 182 13
57634-246 186 14 242 186 14 239 182 13 236 178 12
57635-224 166 10 206 145 10 192 133 9 154 121 60
57636- 94 94 94 62 62 62 42 42 42 22 22 22
57637- 14 14 14 6 6 6 0 0 0 0 0 0
57638- 0 0 0 0 0 0 0 0 0 0 0 0
57639- 0 0 0 0 0 0 0 0 0 0 0 0
57640- 0 0 0 0 0 0 0 0 0 0 0 0
57641- 0 0 0 0 0 0 0 0 0 6 6 6
57642- 18 18 18 34 34 34 58 58 58 78 78 78
57643-101 98 89 124 112 88 142 110 46 156 107 11
57644-163 110 8 167 114 7 175 118 6 180 123 7
57645-185 133 11 197 138 11 210 150 10 219 162 10
57646-226 170 11 236 178 12 236 178 12 234 174 13
57647-219 162 10 197 138 11 163 110 8 130 83 6
57648- 91 60 6 10 10 10 2 2 6 2 2 6
57649- 18 18 18 38 38 38 38 38 38 38 38 38
57650- 38 38 38 38 38 38 38 38 38 38 38 38
57651- 38 38 38 38 38 38 26 26 26 2 2 6
57652- 2 2 6 6 6 6 70 47 6 137 92 6
57653-175 118 6 200 144 11 219 162 10 230 174 11
57654-234 174 13 230 174 11 219 162 10 210 150 10
57655-192 133 9 163 110 8 124 112 88 82 82 82
57656- 50 50 50 30 30 30 14 14 14 6 6 6
57657- 0 0 0 0 0 0 0 0 0 0 0 0
57658- 0 0 0 0 0 0 0 0 0 0 0 0
57659- 0 0 0 0 0 0 0 0 0 0 0 0
57660- 0 0 0 0 0 0 0 0 0 0 0 0
57661- 0 0 0 0 0 0 0 0 0 0 0 0
57662- 6 6 6 14 14 14 22 22 22 34 34 34
57663- 42 42 42 58 58 58 74 74 74 86 86 86
57664-101 98 89 122 102 70 130 98 46 121 87 25
57665-137 92 6 152 99 6 163 110 8 180 123 7
57666-185 133 11 197 138 11 206 145 10 200 144 11
57667-180 123 7 156 107 11 130 83 6 104 69 6
57668- 50 34 6 54 54 54 110 110 110 101 98 89
57669- 86 86 86 82 82 82 78 78 78 78 78 78
57670- 78 78 78 78 78 78 78 78 78 78 78 78
57671- 78 78 78 82 82 82 86 86 86 94 94 94
57672-106 106 106 101 101 101 86 66 34 124 80 6
57673-156 107 11 180 123 7 192 133 9 200 144 11
57674-206 145 10 200 144 11 192 133 9 175 118 6
57675-139 102 15 109 106 95 70 70 70 42 42 42
57676- 22 22 22 10 10 10 0 0 0 0 0 0
57677- 0 0 0 0 0 0 0 0 0 0 0 0
57678- 0 0 0 0 0 0 0 0 0 0 0 0
57679- 0 0 0 0 0 0 0 0 0 0 0 0
57680- 0 0 0 0 0 0 0 0 0 0 0 0
57681- 0 0 0 0 0 0 0 0 0 0 0 0
57682- 0 0 0 0 0 0 6 6 6 10 10 10
57683- 14 14 14 22 22 22 30 30 30 38 38 38
57684- 50 50 50 62 62 62 74 74 74 90 90 90
57685-101 98 89 112 100 78 121 87 25 124 80 6
57686-137 92 6 152 99 6 152 99 6 152 99 6
57687-138 86 6 124 80 6 98 70 6 86 66 30
57688-101 98 89 82 82 82 58 58 58 46 46 46
57689- 38 38 38 34 34 34 34 34 34 34 34 34
57690- 34 34 34 34 34 34 34 34 34 34 34 34
57691- 34 34 34 34 34 34 38 38 38 42 42 42
57692- 54 54 54 82 82 82 94 86 76 91 60 6
57693-134 86 6 156 107 11 167 114 7 175 118 6
57694-175 118 6 167 114 7 152 99 6 121 87 25
57695-101 98 89 62 62 62 34 34 34 18 18 18
57696- 6 6 6 0 0 0 0 0 0 0 0 0
57697- 0 0 0 0 0 0 0 0 0 0 0 0
57698- 0 0 0 0 0 0 0 0 0 0 0 0
57699- 0 0 0 0 0 0 0 0 0 0 0 0
57700- 0 0 0 0 0 0 0 0 0 0 0 0
57701- 0 0 0 0 0 0 0 0 0 0 0 0
57702- 0 0 0 0 0 0 0 0 0 0 0 0
57703- 0 0 0 6 6 6 6 6 6 10 10 10
57704- 18 18 18 22 22 22 30 30 30 42 42 42
57705- 50 50 50 66 66 66 86 86 86 101 98 89
57706-106 86 58 98 70 6 104 69 6 104 69 6
57707-104 69 6 91 60 6 82 62 34 90 90 90
57708- 62 62 62 38 38 38 22 22 22 14 14 14
57709- 10 10 10 10 10 10 10 10 10 10 10 10
57710- 10 10 10 10 10 10 6 6 6 10 10 10
57711- 10 10 10 10 10 10 10 10 10 14 14 14
57712- 22 22 22 42 42 42 70 70 70 89 81 66
57713- 80 54 7 104 69 6 124 80 6 137 92 6
57714-134 86 6 116 81 8 100 82 52 86 86 86
57715- 58 58 58 30 30 30 14 14 14 6 6 6
57716- 0 0 0 0 0 0 0 0 0 0 0 0
57717- 0 0 0 0 0 0 0 0 0 0 0 0
57718- 0 0 0 0 0 0 0 0 0 0 0 0
57719- 0 0 0 0 0 0 0 0 0 0 0 0
57720- 0 0 0 0 0 0 0 0 0 0 0 0
57721- 0 0 0 0 0 0 0 0 0 0 0 0
57722- 0 0 0 0 0 0 0 0 0 0 0 0
57723- 0 0 0 0 0 0 0 0 0 0 0 0
57724- 0 0 0 6 6 6 10 10 10 14 14 14
57725- 18 18 18 26 26 26 38 38 38 54 54 54
57726- 70 70 70 86 86 86 94 86 76 89 81 66
57727- 89 81 66 86 86 86 74 74 74 50 50 50
57728- 30 30 30 14 14 14 6 6 6 0 0 0
57729- 0 0 0 0 0 0 0 0 0 0 0 0
57730- 0 0 0 0 0 0 0 0 0 0 0 0
57731- 0 0 0 0 0 0 0 0 0 0 0 0
57732- 6 6 6 18 18 18 34 34 34 58 58 58
57733- 82 82 82 89 81 66 89 81 66 89 81 66
57734- 94 86 66 94 86 76 74 74 74 50 50 50
57735- 26 26 26 14 14 14 6 6 6 0 0 0
57736- 0 0 0 0 0 0 0 0 0 0 0 0
57737- 0 0 0 0 0 0 0 0 0 0 0 0
57738- 0 0 0 0 0 0 0 0 0 0 0 0
57739- 0 0 0 0 0 0 0 0 0 0 0 0
57740- 0 0 0 0 0 0 0 0 0 0 0 0
57741- 0 0 0 0 0 0 0 0 0 0 0 0
57742- 0 0 0 0 0 0 0 0 0 0 0 0
57743- 0 0 0 0 0 0 0 0 0 0 0 0
57744- 0 0 0 0 0 0 0 0 0 0 0 0
57745- 6 6 6 6 6 6 14 14 14 18 18 18
57746- 30 30 30 38 38 38 46 46 46 54 54 54
57747- 50 50 50 42 42 42 30 30 30 18 18 18
57748- 10 10 10 0 0 0 0 0 0 0 0 0
57749- 0 0 0 0 0 0 0 0 0 0 0 0
57750- 0 0 0 0 0 0 0 0 0 0 0 0
57751- 0 0 0 0 0 0 0 0 0 0 0 0
57752- 0 0 0 6 6 6 14 14 14 26 26 26
57753- 38 38 38 50 50 50 58 58 58 58 58 58
57754- 54 54 54 42 42 42 30 30 30 18 18 18
57755- 10 10 10 0 0 0 0 0 0 0 0 0
57756- 0 0 0 0 0 0 0 0 0 0 0 0
57757- 0 0 0 0 0 0 0 0 0 0 0 0
57758- 0 0 0 0 0 0 0 0 0 0 0 0
57759- 0 0 0 0 0 0 0 0 0 0 0 0
57760- 0 0 0 0 0 0 0 0 0 0 0 0
57761- 0 0 0 0 0 0 0 0 0 0 0 0
57762- 0 0 0 0 0 0 0 0 0 0 0 0
57763- 0 0 0 0 0 0 0 0 0 0 0 0
57764- 0 0 0 0 0 0 0 0 0 0 0 0
57765- 0 0 0 0 0 0 0 0 0 6 6 6
57766- 6 6 6 10 10 10 14 14 14 18 18 18
57767- 18 18 18 14 14 14 10 10 10 6 6 6
57768- 0 0 0 0 0 0 0 0 0 0 0 0
57769- 0 0 0 0 0 0 0 0 0 0 0 0
57770- 0 0 0 0 0 0 0 0 0 0 0 0
57771- 0 0 0 0 0 0 0 0 0 0 0 0
57772- 0 0 0 0 0 0 0 0 0 6 6 6
57773- 14 14 14 18 18 18 22 22 22 22 22 22
57774- 18 18 18 14 14 14 10 10 10 6 6 6
57775- 0 0 0 0 0 0 0 0 0 0 0 0
57776- 0 0 0 0 0 0 0 0 0 0 0 0
57777- 0 0 0 0 0 0 0 0 0 0 0 0
57778- 0 0 0 0 0 0 0 0 0 0 0 0
57779- 0 0 0 0 0 0 0 0 0 0 0 0
57780+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57781+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57782+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57783+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57784+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57785+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57786+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57787+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57788+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57789+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57790+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57791+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57792+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57793+4 4 4 4 4 4
57794+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57795+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57796+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57797+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57798+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57799+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57800+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57801+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57802+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57803+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57804+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57805+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57806+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57807+4 4 4 4 4 4
57808+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57809+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57810+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57811+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57812+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57813+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57814+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57815+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57816+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57817+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57818+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57819+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57820+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57821+4 4 4 4 4 4
57822+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57823+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57824+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57825+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57826+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57827+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57828+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57829+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57830+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57831+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57832+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57833+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57834+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57835+4 4 4 4 4 4
57836+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57837+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57838+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57839+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57840+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57841+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57842+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57843+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57844+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57845+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57846+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57847+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57848+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57849+4 4 4 4 4 4
57850+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57851+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57852+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57853+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57854+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57855+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57856+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57857+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57858+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57859+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57860+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57861+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57862+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57863+4 4 4 4 4 4
57864+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57865+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57866+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57867+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57868+4 4 4 4 4 4 4 4 4 3 3 3 0 0 0 0 0 0
57869+0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 4 4 4
57870+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57871+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57872+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57873+4 4 4 4 4 4 4 4 4 4 4 4 1 1 1 0 0 0
57874+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57875+4 4 4 4 4 4 4 4 4 2 1 0 2 1 0 3 2 2
57876+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57877+4 4 4 4 4 4
57878+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57879+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57880+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57881+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57882+4 4 4 4 4 4 2 2 2 0 0 0 3 4 3 26 28 28
57883+37 38 37 37 38 37 14 17 19 2 2 2 0 0 0 2 2 2
57884+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57885+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57886+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57887+4 4 4 4 4 4 3 3 3 0 0 0 1 1 1 6 6 6
57888+2 2 2 0 0 0 3 3 3 4 4 4 4 4 4 4 4 4
57889+4 4 5 3 3 3 1 0 0 0 0 0 1 0 0 0 0 0
57890+1 1 1 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57891+4 4 4 4 4 4
57892+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57893+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57894+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57895+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57896+2 2 2 0 0 0 0 0 0 14 17 19 60 74 84 137 136 137
57897+153 152 153 137 136 137 125 124 125 60 73 81 6 6 6 3 1 0
57898+0 0 0 3 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57899+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57900+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57901+4 4 4 4 4 4 0 0 0 4 4 4 41 54 63 125 124 125
57902+60 73 81 6 6 6 4 0 0 3 3 3 4 4 4 4 4 4
57903+4 4 4 0 0 0 6 9 11 41 54 63 41 65 82 22 30 35
57904+2 2 2 2 1 0 4 4 4 4 4 4 4 4 4 4 4 4
57905+4 4 4 4 4 4
57906+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57907+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57908+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57909+4 4 4 4 4 4 5 5 5 5 5 5 2 2 2 0 0 0
57910+4 0 0 6 6 6 41 54 63 137 136 137 174 174 174 167 166 167
57911+165 164 165 165 164 165 163 162 163 163 162 163 125 124 125 41 54 63
57912+1 1 1 0 0 0 0 0 0 3 3 3 5 5 5 4 4 4
57913+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57914+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
57915+3 3 3 2 0 0 4 0 0 60 73 81 156 155 156 167 166 167
57916+163 162 163 85 115 134 5 7 8 0 0 0 4 4 4 5 5 5
57917+0 0 0 2 5 5 55 98 126 90 154 193 90 154 193 72 125 159
57918+37 51 59 2 0 0 1 1 1 4 5 5 4 4 4 4 4 4
57919+4 4 4 4 4 4
57920+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57921+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57922+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57923+4 4 4 5 5 5 4 4 4 1 1 1 0 0 0 3 3 3
57924+37 38 37 125 124 125 163 162 163 174 174 174 158 157 158 158 157 158
57925+156 155 156 156 155 156 158 157 158 165 164 165 174 174 174 166 165 166
57926+125 124 125 16 19 21 1 0 0 0 0 0 0 0 0 4 4 4
57927+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
57928+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 1 1 1
57929+0 0 0 0 0 0 37 38 37 153 152 153 174 174 174 158 157 158
57930+174 174 174 163 162 163 37 38 37 4 3 3 4 0 0 1 1 1
57931+0 0 0 22 40 52 101 161 196 101 161 196 90 154 193 101 161 196
57932+64 123 161 14 17 19 0 0 0 4 4 4 4 4 4 4 4 4
57933+4 4 4 4 4 4
57934+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57935+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57936+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
57937+5 5 5 2 2 2 0 0 0 4 0 0 24 26 27 85 115 134
57938+156 155 156 174 174 174 167 166 167 156 155 156 154 153 154 157 156 157
57939+156 155 156 156 155 156 155 154 155 153 152 153 158 157 158 167 166 167
57940+174 174 174 156 155 156 60 74 84 16 19 21 0 0 0 0 0 0
57941+1 1 1 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
57942+4 4 4 5 5 5 6 6 6 3 3 3 0 0 0 4 0 0
57943+13 16 17 60 73 81 137 136 137 165 164 165 156 155 156 153 152 153
57944+174 174 174 177 184 187 60 73 81 3 1 0 0 0 0 1 1 2
57945+22 30 35 64 123 161 136 185 209 90 154 193 90 154 193 90 154 193
57946+90 154 193 21 29 34 0 0 0 3 2 2 4 4 5 4 4 4
57947+4 4 4 4 4 4
57948+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57949+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57950+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 3 3 3
57951+0 0 0 0 0 0 10 13 16 60 74 84 157 156 157 174 174 174
57952+174 174 174 158 157 158 153 152 153 154 153 154 156 155 156 155 154 155
57953+156 155 156 155 154 155 154 153 154 157 156 157 154 153 154 153 152 153
57954+163 162 163 174 174 174 177 184 187 137 136 137 60 73 81 13 16 17
57955+4 0 0 0 0 0 3 3 3 5 5 5 4 4 4 4 4 4
57956+5 5 5 4 4 4 1 1 1 0 0 0 3 3 3 41 54 63
57957+131 129 131 174 174 174 174 174 174 174 174 174 167 166 167 174 174 174
57958+190 197 201 137 136 137 24 26 27 4 0 0 16 21 25 50 82 103
57959+90 154 193 136 185 209 90 154 193 101 161 196 101 161 196 101 161 196
57960+31 91 132 3 6 7 0 0 0 4 4 4 4 4 4 4 4 4
57961+4 4 4 4 4 4
57962+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57963+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57964+4 4 4 4 4 4 4 4 4 2 2 2 0 0 0 4 0 0
57965+4 0 0 43 57 68 137 136 137 177 184 187 174 174 174 163 162 163
57966+155 154 155 155 154 155 156 155 156 155 154 155 158 157 158 165 164 165
57967+167 166 167 166 165 166 163 162 163 157 156 157 155 154 155 155 154 155
57968+153 152 153 156 155 156 167 166 167 174 174 174 174 174 174 131 129 131
57969+41 54 63 5 5 5 0 0 0 0 0 0 3 3 3 4 4 4
57970+1 1 1 0 0 0 1 0 0 26 28 28 125 124 125 174 174 174
57971+177 184 187 174 174 174 174 174 174 156 155 156 131 129 131 137 136 137
57972+125 124 125 24 26 27 4 0 0 41 65 82 90 154 193 136 185 209
57973+136 185 209 101 161 196 53 118 160 37 112 160 90 154 193 34 86 122
57974+7 12 15 0 0 0 4 4 4 4 4 4 4 4 4 4 4 4
57975+4 4 4 4 4 4
57976+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57977+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57978+4 4 4 3 3 3 0 0 0 0 0 0 5 5 5 37 38 37
57979+125 124 125 167 166 167 174 174 174 167 166 167 158 157 158 155 154 155
57980+156 155 156 156 155 156 156 155 156 163 162 163 167 166 167 155 154 155
57981+137 136 137 153 152 153 156 155 156 165 164 165 163 162 163 156 155 156
57982+156 155 156 156 155 156 155 154 155 158 157 158 166 165 166 174 174 174
57983+167 166 167 125 124 125 37 38 37 1 0 0 0 0 0 0 0 0
57984+0 0 0 24 26 27 60 74 84 158 157 158 174 174 174 174 174 174
57985+166 165 166 158 157 158 125 124 125 41 54 63 13 16 17 6 6 6
57986+6 6 6 37 38 37 80 127 157 136 185 209 101 161 196 101 161 196
57987+90 154 193 28 67 93 6 10 14 13 20 25 13 20 25 6 10 14
57988+1 1 2 4 3 3 4 4 4 4 4 4 4 4 4 4 4 4
57989+4 4 4 4 4 4
57990+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57991+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
57992+1 1 1 1 0 0 4 3 3 37 38 37 60 74 84 153 152 153
57993+167 166 167 167 166 167 158 157 158 154 153 154 155 154 155 156 155 156
57994+157 156 157 158 157 158 167 166 167 167 166 167 131 129 131 43 57 68
57995+26 28 28 37 38 37 60 73 81 131 129 131 165 164 165 166 165 166
57996+158 157 158 155 154 155 156 155 156 156 155 156 156 155 156 158 157 158
57997+165 164 165 174 174 174 163 162 163 60 74 84 16 19 21 13 16 17
57998+60 73 81 131 129 131 174 174 174 174 174 174 167 166 167 165 164 165
57999+137 136 137 60 73 81 24 26 27 4 0 0 4 0 0 16 19 21
58000+52 104 138 101 161 196 136 185 209 136 185 209 90 154 193 27 99 146
58001+13 20 25 4 5 7 2 5 5 4 5 7 1 1 2 0 0 0
58002+4 4 4 4 4 4 3 3 3 2 2 2 2 2 2 4 4 4
58003+4 4 4 4 4 4
58004+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58005+4 4 4 4 4 4 4 4 4 4 4 4 3 3 3 0 0 0
58006+0 0 0 13 16 17 60 73 81 137 136 137 174 174 174 166 165 166
58007+158 157 158 156 155 156 157 156 157 156 155 156 155 154 155 158 157 158
58008+167 166 167 174 174 174 153 152 153 60 73 81 16 19 21 4 0 0
58009+4 0 0 4 0 0 6 6 6 26 28 28 60 74 84 158 157 158
58010+174 174 174 166 165 166 157 156 157 155 154 155 156 155 156 156 155 156
58011+155 154 155 158 157 158 167 166 167 167 166 167 131 129 131 125 124 125
58012+137 136 137 167 166 167 167 166 167 174 174 174 158 157 158 125 124 125
58013+16 19 21 4 0 0 4 0 0 10 13 16 49 76 92 107 159 188
58014+136 185 209 136 185 209 90 154 193 26 108 161 22 40 52 6 10 14
58015+2 3 3 1 1 2 1 1 2 4 4 5 4 4 5 4 4 5
58016+4 4 5 2 2 1 0 0 0 0 0 0 0 0 0 2 2 2
58017+4 4 4 4 4 4
58018+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58019+4 4 4 5 5 5 3 3 3 0 0 0 1 0 0 4 0 0
58020+37 51 59 131 129 131 167 166 167 167 166 167 163 162 163 157 156 157
58021+157 156 157 155 154 155 153 152 153 157 156 157 167 166 167 174 174 174
58022+153 152 153 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
58023+4 3 3 4 3 3 4 0 0 6 6 6 4 0 0 37 38 37
58024+125 124 125 174 174 174 174 174 174 165 164 165 156 155 156 154 153 154
58025+156 155 156 156 155 156 155 154 155 163 162 163 158 157 158 163 162 163
58026+174 174 174 174 174 174 174 174 174 125 124 125 37 38 37 0 0 0
58027+4 0 0 6 9 11 41 54 63 90 154 193 136 185 209 146 190 211
58028+136 185 209 37 112 160 22 40 52 6 10 14 3 6 7 1 1 2
58029+1 1 2 3 3 3 1 1 2 3 3 3 4 4 4 4 4 4
58030+2 2 2 2 0 0 16 19 21 37 38 37 24 26 27 0 0 0
58031+0 0 0 4 4 4
58032+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 5 5 5
58033+4 4 4 0 0 0 0 0 0 0 0 0 26 28 28 120 125 127
58034+158 157 158 174 174 174 165 164 165 157 156 157 155 154 155 156 155 156
58035+153 152 153 153 152 153 167 166 167 174 174 174 174 174 174 125 124 125
58036+37 38 37 4 0 0 0 0 0 4 0 0 4 3 3 4 4 4
58037+4 4 4 4 4 4 5 5 5 4 0 0 4 0 0 4 0 0
58038+4 3 3 43 57 68 137 136 137 174 174 174 174 174 174 165 164 165
58039+154 153 154 153 152 153 153 152 153 153 152 153 163 162 163 174 174 174
58040+174 174 174 153 152 153 60 73 81 6 6 6 4 0 0 4 3 3
58041+32 43 50 80 127 157 136 185 209 146 190 211 146 190 211 90 154 193
58042+28 67 93 28 67 93 40 71 93 3 6 7 1 1 2 2 5 5
58043+50 82 103 79 117 143 26 37 45 0 0 0 3 3 3 1 1 1
58044+0 0 0 41 54 63 137 136 137 174 174 174 153 152 153 60 73 81
58045+2 0 0 0 0 0
58046+4 4 4 4 4 4 4 4 4 4 4 4 6 6 6 2 2 2
58047+0 0 0 2 0 0 24 26 27 60 74 84 153 152 153 174 174 174
58048+174 174 174 157 156 157 154 153 154 156 155 156 154 153 154 153 152 153
58049+165 164 165 174 174 174 177 184 187 137 136 137 43 57 68 6 6 6
58050+4 0 0 2 0 0 3 3 3 5 5 5 5 5 5 4 4 4
58051+4 4 4 4 4 4 4 4 4 5 5 5 6 6 6 4 3 3
58052+4 0 0 4 0 0 24 26 27 60 73 81 153 152 153 174 174 174
58053+174 174 174 158 157 158 158 157 158 174 174 174 174 174 174 158 157 158
58054+60 74 84 24 26 27 4 0 0 4 0 0 17 23 27 59 113 148
58055+136 185 209 191 222 234 146 190 211 136 185 209 31 91 132 7 11 13
58056+22 40 52 101 161 196 90 154 193 6 9 11 3 4 4 43 95 132
58057+136 185 209 172 205 220 55 98 126 0 0 0 0 0 0 2 0 0
58058+26 28 28 153 152 153 177 184 187 167 166 167 177 184 187 165 164 165
58059+37 38 37 0 0 0
58060+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58061+13 16 17 60 73 81 137 136 137 174 174 174 174 174 174 165 164 165
58062+153 152 153 153 152 153 155 154 155 154 153 154 158 157 158 174 174 174
58063+177 184 187 163 162 163 60 73 81 16 19 21 4 0 0 4 0 0
58064+4 3 3 4 4 4 5 5 5 5 5 5 4 4 4 5 5 5
58065+5 5 5 5 5 5 5 5 5 4 4 4 4 4 4 5 5 5
58066+6 6 6 4 0 0 4 0 0 4 0 0 24 26 27 60 74 84
58067+166 165 166 174 174 174 177 184 187 165 164 165 125 124 125 24 26 27
58068+4 0 0 4 0 0 5 5 5 50 82 103 136 185 209 172 205 220
58069+146 190 211 136 185 209 26 108 161 22 40 52 7 12 15 44 81 103
58070+71 116 144 28 67 93 37 51 59 41 65 82 100 139 164 101 161 196
58071+90 154 193 90 154 193 28 67 93 0 0 0 0 0 0 26 28 28
58072+125 124 125 167 166 167 163 162 163 153 152 153 163 162 163 174 174 174
58073+85 115 134 4 0 0
58074+4 4 4 5 5 5 4 4 4 1 0 0 4 0 0 34 47 55
58075+125 124 125 174 174 174 174 174 174 167 166 167 157 156 157 153 152 153
58076+155 154 155 155 154 155 158 157 158 166 165 166 167 166 167 154 153 154
58077+125 124 125 26 28 28 4 0 0 4 0 0 4 0 0 5 5 5
58078+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 1 1 1
58079+0 0 0 0 0 0 1 1 1 4 4 4 4 4 4 4 4 4
58080+5 5 5 5 5 5 4 3 3 4 0 0 4 0 0 6 6 6
58081+37 38 37 131 129 131 137 136 137 37 38 37 0 0 0 4 0 0
58082+4 5 5 43 61 72 90 154 193 172 205 220 146 190 211 136 185 209
58083+90 154 193 28 67 93 13 20 25 43 61 72 71 116 144 44 81 103
58084+2 5 5 7 11 13 59 113 148 101 161 196 90 154 193 28 67 93
58085+13 20 25 6 10 14 0 0 0 13 16 17 60 73 81 137 136 137
58086+166 165 166 158 157 158 156 155 156 154 153 154 167 166 167 174 174 174
58087+60 73 81 4 0 0
58088+4 4 4 4 4 4 0 0 0 3 3 3 60 74 84 174 174 174
58089+174 174 174 167 166 167 163 162 163 155 154 155 157 156 157 155 154 155
58090+156 155 156 163 162 163 167 166 167 158 157 158 125 124 125 37 38 37
58091+4 3 3 4 0 0 4 0 0 6 6 6 6 6 6 5 5 5
58092+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 2 3 3
58093+10 13 16 7 11 13 1 0 0 0 0 0 2 2 1 4 4 4
58094+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 4 0 0
58095+4 0 0 7 11 13 13 16 17 4 0 0 3 3 3 34 47 55
58096+80 127 157 146 190 211 172 205 220 136 185 209 136 185 209 136 185 209
58097+28 67 93 22 40 52 55 98 126 55 98 126 21 29 34 7 11 13
58098+50 82 103 101 161 196 101 161 196 35 83 115 13 20 25 2 2 1
58099+1 1 2 1 1 2 37 51 59 131 129 131 174 174 174 174 174 174
58100+167 166 167 163 162 163 163 162 163 167 166 167 174 174 174 125 124 125
58101+16 19 21 4 0 0
58102+4 4 4 4 0 0 4 0 0 60 74 84 174 174 174 174 174 174
58103+158 157 158 155 154 155 155 154 155 156 155 156 155 154 155 158 157 158
58104+167 166 167 165 164 165 131 129 131 60 73 81 13 16 17 4 0 0
58105+4 0 0 4 3 3 6 6 6 4 3 3 5 5 5 4 4 4
58106+4 4 4 3 2 2 0 0 0 0 0 0 7 11 13 45 69 86
58107+80 127 157 71 116 144 43 61 72 7 11 13 0 0 0 1 1 1
58108+4 3 3 4 4 4 4 4 4 4 4 4 6 6 6 5 5 5
58109+3 2 2 4 0 0 1 0 0 21 29 34 59 113 148 136 185 209
58110+146 190 211 136 185 209 136 185 209 136 185 209 136 185 209 136 185 209
58111+68 124 159 44 81 103 22 40 52 13 16 17 43 61 72 90 154 193
58112+136 185 209 59 113 148 21 29 34 3 4 3 1 1 1 0 0 0
58113+24 26 27 125 124 125 163 162 163 174 174 174 166 165 166 165 164 165
58114+163 162 163 125 124 125 125 124 125 125 124 125 125 124 125 26 28 28
58115+4 0 0 4 3 3
58116+3 3 3 0 0 0 24 26 27 153 152 153 177 184 187 158 157 158
58117+156 155 156 156 155 156 155 154 155 155 154 155 165 164 165 174 174 174
58118+155 154 155 60 74 84 26 28 28 4 0 0 4 0 0 3 1 0
58119+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 3 3
58120+2 0 0 0 0 0 0 0 0 32 43 50 72 125 159 101 161 196
58121+136 185 209 101 161 196 101 161 196 79 117 143 32 43 50 0 0 0
58122+0 0 0 2 2 2 4 4 4 4 4 4 3 3 3 1 0 0
58123+0 0 0 4 5 5 49 76 92 101 161 196 146 190 211 146 190 211
58124+136 185 209 136 185 209 136 185 209 136 185 209 136 185 209 90 154 193
58125+28 67 93 13 16 17 37 51 59 80 127 157 136 185 209 90 154 193
58126+22 40 52 6 9 11 3 4 3 2 2 1 16 19 21 60 73 81
58127+137 136 137 163 162 163 158 157 158 166 165 166 167 166 167 153 152 153
58128+60 74 84 37 38 37 6 6 6 13 16 17 4 0 0 1 0 0
58129+3 2 2 4 4 4
58130+3 2 2 4 0 0 37 38 37 137 136 137 167 166 167 158 157 158
58131+157 156 157 154 153 154 157 156 157 167 166 167 174 174 174 125 124 125
58132+37 38 37 4 0 0 4 0 0 4 0 0 4 3 3 4 4 4
58133+4 4 4 4 4 4 5 5 5 5 5 5 1 1 1 0 0 0
58134+0 0 0 16 21 25 55 98 126 90 154 193 136 185 209 101 161 196
58135+101 161 196 101 161 196 136 185 209 136 185 209 101 161 196 55 98 126
58136+14 17 19 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
58137+22 40 52 90 154 193 146 190 211 146 190 211 136 185 209 136 185 209
58138+136 185 209 136 185 209 136 185 209 101 161 196 35 83 115 7 11 13
58139+17 23 27 59 113 148 136 185 209 101 161 196 34 86 122 7 12 15
58140+2 5 5 3 4 3 6 6 6 60 73 81 131 129 131 163 162 163
58141+166 165 166 174 174 174 174 174 174 163 162 163 125 124 125 41 54 63
58142+13 16 17 4 0 0 4 0 0 4 0 0 1 0 0 2 2 2
58143+4 4 4 4 4 4
58144+1 1 1 2 1 0 43 57 68 137 136 137 153 152 153 153 152 153
58145+163 162 163 156 155 156 165 164 165 167 166 167 60 74 84 6 6 6
58146+4 0 0 4 0 0 5 5 5 4 4 4 4 4 4 4 4 4
58147+4 5 5 6 6 6 4 3 3 0 0 0 0 0 0 11 15 18
58148+40 71 93 100 139 164 101 161 196 101 161 196 101 161 196 101 161 196
58149+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 136 185 209
58150+101 161 196 45 69 86 6 6 6 0 0 0 17 23 27 55 98 126
58151+136 185 209 146 190 211 136 185 209 136 185 209 136 185 209 136 185 209
58152+136 185 209 136 185 209 90 154 193 22 40 52 7 11 13 50 82 103
58153+136 185 209 136 185 209 53 118 160 22 40 52 7 11 13 2 5 5
58154+3 4 3 37 38 37 125 124 125 157 156 157 166 165 166 167 166 167
58155+174 174 174 174 174 174 137 136 137 60 73 81 4 0 0 4 0 0
58156+4 0 0 4 0 0 5 5 5 3 3 3 3 3 3 4 4 4
58157+4 4 4 4 4 4
58158+4 0 0 4 0 0 41 54 63 137 136 137 125 124 125 131 129 131
58159+155 154 155 167 166 167 174 174 174 60 74 84 6 6 6 4 0 0
58160+4 3 3 6 6 6 4 4 4 4 4 4 4 4 4 5 5 5
58161+4 4 4 1 1 1 0 0 0 3 6 7 41 65 82 72 125 159
58162+101 161 196 101 161 196 101 161 196 90 154 193 90 154 193 101 161 196
58163+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58164+136 185 209 136 185 209 80 127 157 55 98 126 101 161 196 146 190 211
58165+136 185 209 136 185 209 136 185 209 101 161 196 136 185 209 101 161 196
58166+136 185 209 101 161 196 35 83 115 22 30 35 101 161 196 172 205 220
58167+90 154 193 28 67 93 7 11 13 2 5 5 3 4 3 13 16 17
58168+85 115 134 167 166 167 174 174 174 174 174 174 174 174 174 174 174 174
58169+167 166 167 60 74 84 13 16 17 4 0 0 4 0 0 4 3 3
58170+6 6 6 5 5 5 4 4 4 5 5 5 4 4 4 5 5 5
58171+5 5 5 5 5 5
58172+1 1 1 4 0 0 41 54 63 137 136 137 137 136 137 125 124 125
58173+131 129 131 167 166 167 157 156 157 37 38 37 6 6 6 4 0 0
58174+6 6 6 5 5 5 4 4 4 4 4 4 4 5 5 2 2 1
58175+0 0 0 0 0 0 26 37 45 58 111 146 101 161 196 101 161 196
58176+101 161 196 90 154 193 90 154 193 90 154 193 101 161 196 101 161 196
58177+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58178+101 161 196 136 185 209 136 185 209 136 185 209 146 190 211 136 185 209
58179+136 185 209 101 161 196 136 185 209 136 185 209 101 161 196 136 185 209
58180+101 161 196 136 185 209 136 185 209 136 185 209 136 185 209 16 89 141
58181+7 11 13 2 5 5 2 5 5 13 16 17 60 73 81 154 154 154
58182+174 174 174 174 174 174 174 174 174 174 174 174 163 162 163 125 124 125
58183+24 26 27 4 0 0 4 0 0 4 0 0 5 5 5 5 5 5
58184+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
58185+5 5 5 4 4 4
58186+4 0 0 6 6 6 37 38 37 137 136 137 137 136 137 131 129 131
58187+131 129 131 153 152 153 131 129 131 26 28 28 4 0 0 4 3 3
58188+6 6 6 4 4 4 4 4 4 4 4 4 0 0 0 0 0 0
58189+13 20 25 51 88 114 90 154 193 101 161 196 101 161 196 90 154 193
58190+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58191+101 161 196 101 161 196 101 161 196 101 161 196 136 185 209 101 161 196
58192+101 161 196 136 185 209 101 161 196 136 185 209 136 185 209 101 161 196
58193+136 185 209 101 161 196 136 185 209 101 161 196 101 161 196 101 161 196
58194+136 185 209 136 185 209 136 185 209 37 112 160 21 29 34 5 7 8
58195+2 5 5 13 16 17 43 57 68 131 129 131 174 174 174 174 174 174
58196+174 174 174 167 166 167 157 156 157 125 124 125 37 38 37 4 0 0
58197+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
58198+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58199+4 4 4 4 4 4
58200+1 1 1 4 0 0 41 54 63 153 152 153 137 136 137 137 136 137
58201+137 136 137 153 152 153 125 124 125 24 26 27 4 0 0 3 2 2
58202+4 4 4 4 4 4 4 3 3 4 0 0 3 6 7 43 61 72
58203+64 123 161 101 161 196 90 154 193 90 154 193 90 154 193 90 154 193
58204+90 154 193 90 154 193 90 154 193 90 154 193 101 161 196 90 154 193
58205+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58206+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58207+136 185 209 101 161 196 101 161 196 136 185 209 136 185 209 101 161 196
58208+101 161 196 90 154 193 28 67 93 13 16 17 7 11 13 3 6 7
58209+37 51 59 125 124 125 163 162 163 174 174 174 167 166 167 166 165 166
58210+167 166 167 131 129 131 60 73 81 4 0 0 4 0 0 4 0 0
58211+3 3 3 5 5 5 6 6 6 4 4 4 4 4 4 4 4 4
58212+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58213+4 4 4 4 4 4
58214+4 0 0 4 0 0 41 54 63 137 136 137 153 152 153 137 136 137
58215+153 152 153 157 156 157 125 124 125 24 26 27 0 0 0 2 2 2
58216+4 4 4 4 4 4 2 0 0 0 0 0 28 67 93 90 154 193
58217+90 154 193 90 154 193 90 154 193 90 154 193 64 123 161 90 154 193
58218+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58219+90 154 193 101 161 196 101 161 196 101 161 196 90 154 193 136 185 209
58220+101 161 196 101 161 196 136 185 209 101 161 196 136 185 209 101 161 196
58221+101 161 196 101 161 196 136 185 209 101 161 196 101 161 196 90 154 193
58222+35 83 115 13 16 17 3 6 7 2 5 5 13 16 17 60 74 84
58223+154 154 154 166 165 166 165 164 165 158 157 158 163 162 163 157 156 157
58224+60 74 84 13 16 17 4 0 0 4 0 0 3 2 2 4 4 4
58225+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58226+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58227+4 4 4 4 4 4
58228+1 1 1 4 0 0 41 54 63 157 156 157 155 154 155 137 136 137
58229+153 152 153 158 157 158 137 136 137 26 28 28 2 0 0 2 2 2
58230+4 4 4 4 4 4 1 0 0 6 10 14 34 86 122 90 154 193
58231+64 123 161 90 154 193 64 123 161 90 154 193 90 154 193 90 154 193
58232+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58233+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58234+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 101 161 196
58235+136 185 209 101 161 196 136 185 209 90 154 193 26 108 161 22 40 52
58236+13 16 17 5 7 8 2 5 5 2 5 5 37 38 37 165 164 165
58237+174 174 174 163 162 163 154 154 154 165 164 165 167 166 167 60 73 81
58238+6 6 6 4 0 0 4 0 0 4 4 4 4 4 4 4 4 4
58239+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58240+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58241+4 4 4 4 4 4
58242+4 0 0 6 6 6 41 54 63 156 155 156 158 157 158 153 152 153
58243+156 155 156 165 164 165 137 136 137 26 28 28 0 0 0 2 2 2
58244+4 4 5 4 4 4 2 0 0 7 12 15 31 96 139 64 123 161
58245+90 154 193 64 123 161 90 154 193 90 154 193 64 123 161 90 154 193
58246+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58247+90 154 193 90 154 193 90 154 193 101 161 196 101 161 196 101 161 196
58248+101 161 196 101 161 196 101 161 196 101 161 196 101 161 196 136 185 209
58249+101 161 196 136 185 209 26 108 161 22 40 52 7 11 13 5 7 8
58250+2 5 5 2 5 5 2 5 5 2 2 1 37 38 37 158 157 158
58251+174 174 174 154 154 154 156 155 156 167 166 167 165 164 165 37 38 37
58252+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58253+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58254+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58255+4 4 4 4 4 4
58256+3 1 0 4 0 0 60 73 81 157 156 157 163 162 163 153 152 153
58257+158 157 158 167 166 167 137 136 137 26 28 28 2 0 0 2 2 2
58258+4 5 5 4 4 4 4 0 0 7 12 15 24 86 132 26 108 161
58259+37 112 160 64 123 161 90 154 193 64 123 161 90 154 193 90 154 193
58260+90 154 193 90 154 193 90 154 193 90 154 193 90 154 193 90 154 193
58261+90 154 193 101 161 196 90 154 193 101 161 196 101 161 196 101 161 196
58262+101 161 196 101 161 196 101 161 196 136 185 209 101 161 196 136 185 209
58263+90 154 193 35 83 115 13 16 17 13 16 17 7 11 13 3 6 7
58264+5 7 8 6 6 6 3 4 3 2 2 1 30 32 34 154 154 154
58265+167 166 167 154 154 154 154 154 154 174 174 174 165 164 165 37 38 37
58266+6 6 6 4 0 0 6 6 6 4 4 4 4 4 4 4 4 4
58267+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58268+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58269+4 4 4 4 4 4
58270+4 0 0 4 0 0 41 54 63 163 162 163 166 165 166 154 154 154
58271+163 162 163 174 174 174 137 136 137 26 28 28 0 0 0 2 2 2
58272+4 5 5 4 4 5 1 1 2 6 10 14 28 67 93 18 97 151
58273+18 97 151 18 97 151 26 108 161 37 112 160 37 112 160 90 154 193
58274+64 123 161 90 154 193 90 154 193 90 154 193 90 154 193 101 161 196
58275+90 154 193 101 161 196 101 161 196 90 154 193 101 161 196 101 161 196
58276+101 161 196 101 161 196 101 161 196 136 185 209 90 154 193 16 89 141
58277+13 20 25 7 11 13 5 7 8 5 7 8 2 5 5 4 5 5
58278+3 4 3 4 5 5 3 4 3 0 0 0 37 38 37 158 157 158
58279+174 174 174 158 157 158 158 157 158 167 166 167 174 174 174 41 54 63
58280+4 0 0 3 2 2 5 5 5 4 4 4 4 4 4 4 4 4
58281+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58282+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58283+4 4 4 4 4 4
58284+1 1 1 4 0 0 60 73 81 165 164 165 174 174 174 158 157 158
58285+167 166 167 174 174 174 153 152 153 26 28 28 2 0 0 2 2 2
58286+4 5 5 4 4 4 4 0 0 7 12 15 10 87 144 10 87 144
58287+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
58288+26 108 161 37 112 160 53 118 160 90 154 193 90 154 193 90 154 193
58289+90 154 193 90 154 193 101 161 196 101 161 196 101 161 196 101 161 196
58290+101 161 196 136 185 209 90 154 193 26 108 161 22 40 52 13 16 17
58291+7 11 13 3 6 7 5 7 8 5 7 8 2 5 5 4 5 5
58292+4 5 5 6 6 6 3 4 3 0 0 0 30 32 34 158 157 158
58293+174 174 174 156 155 156 155 154 155 165 164 165 154 153 154 37 38 37
58294+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58295+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58296+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58297+4 4 4 4 4 4
58298+4 0 0 4 0 0 60 73 81 167 166 167 174 174 174 163 162 163
58299+174 174 174 174 174 174 153 152 153 26 28 28 0 0 0 3 3 3
58300+5 5 5 4 4 4 1 1 2 7 12 15 28 67 93 18 97 151
58301+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
58302+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58303+90 154 193 26 108 161 90 154 193 90 154 193 90 154 193 101 161 196
58304+101 161 196 26 108 161 22 40 52 13 16 17 7 11 13 2 5 5
58305+2 5 5 6 6 6 2 5 5 4 5 5 4 5 5 4 5 5
58306+3 4 3 5 5 5 3 4 3 2 0 0 30 32 34 137 136 137
58307+153 152 153 137 136 137 131 129 131 137 136 137 131 129 131 37 38 37
58308+4 0 0 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58309+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58310+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58311+4 4 4 4 4 4
58312+1 1 1 4 0 0 60 73 81 167 166 167 174 174 174 166 165 166
58313+174 174 174 177 184 187 153 152 153 30 32 34 1 0 0 3 3 3
58314+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
58315+18 97 151 18 97 151 18 97 151 26 108 161 26 108 161 26 108 161
58316+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58317+26 108 161 26 108 161 26 108 161 90 154 193 90 154 193 26 108 161
58318+35 83 115 13 16 17 7 11 13 5 7 8 3 6 7 5 7 8
58319+2 5 5 6 6 6 4 5 5 4 5 5 3 4 3 4 5 5
58320+3 4 3 6 6 6 3 4 3 0 0 0 26 28 28 125 124 125
58321+131 129 131 125 124 125 125 124 125 131 129 131 131 129 131 37 38 37
58322+4 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58323+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58324+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58325+4 4 4 4 4 4
58326+3 1 0 4 0 0 60 73 81 174 174 174 177 184 187 167 166 167
58327+174 174 174 177 184 187 153 152 153 30 32 34 0 0 0 3 3 3
58328+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
58329+18 97 151 18 97 151 18 97 151 18 97 151 18 97 151 26 108 161
58330+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58331+26 108 161 90 154 193 26 108 161 26 108 161 24 86 132 13 20 25
58332+7 11 13 13 20 25 22 40 52 5 7 8 3 4 3 3 4 3
58333+4 5 5 3 4 3 4 5 5 3 4 3 4 5 5 3 4 3
58334+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
58335+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58336+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58337+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58338+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58339+4 4 4 4 4 4
58340+1 1 1 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
58341+174 174 174 190 197 201 157 156 157 30 32 34 1 0 0 3 3 3
58342+5 5 5 4 3 3 4 0 0 7 12 15 10 87 144 10 87 144
58343+18 97 151 19 95 150 19 95 150 18 97 151 18 97 151 26 108 161
58344+18 97 151 26 108 161 26 108 161 26 108 161 26 108 161 90 154 193
58345+26 108 161 26 108 161 26 108 161 22 40 52 2 5 5 3 4 3
58346+28 67 93 37 112 160 34 86 122 2 5 5 3 4 3 3 4 3
58347+3 4 3 3 4 3 3 4 3 2 2 1 3 4 3 4 4 4
58348+4 5 5 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58349+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58350+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58351+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58352+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58353+4 4 4 4 4 4
58354+4 0 0 4 0 0 60 73 81 174 174 174 177 184 187 174 174 174
58355+174 174 174 190 197 201 158 157 158 30 32 34 0 0 0 2 2 2
58356+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 18 97 151
58357+10 87 144 19 95 150 19 95 150 18 97 151 18 97 151 18 97 151
58358+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58359+18 97 151 22 40 52 2 5 5 2 2 1 22 40 52 26 108 161
58360+90 154 193 37 112 160 22 40 52 3 4 3 13 20 25 22 30 35
58361+3 6 7 1 1 1 2 2 2 6 9 11 5 5 5 4 3 3
58362+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
58363+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58364+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58365+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58366+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58367+4 4 4 4 4 4
58368+1 1 1 4 0 0 60 73 81 177 184 187 193 200 203 174 174 174
58369+177 184 187 193 200 203 163 162 163 30 32 34 4 0 0 2 2 2
58370+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
58371+10 87 144 10 87 144 19 95 150 19 95 150 19 95 150 18 97 151
58372+26 108 161 26 108 161 26 108 161 90 154 193 26 108 161 28 67 93
58373+6 10 14 2 5 5 13 20 25 24 86 132 37 112 160 90 154 193
58374+10 87 144 7 12 15 2 5 5 28 67 93 37 112 160 28 67 93
58375+2 2 1 7 12 15 35 83 115 28 67 93 3 6 7 1 0 0
58376+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58377+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58378+0 0 0 3 3 3 5 5 5 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 4 4 4 4 4 4 4 4 4 4 4 4
58381+4 4 4 4 4 4
58382+4 0 0 4 0 0 60 73 81 174 174 174 190 197 201 174 174 174
58383+177 184 187 193 200 203 163 162 163 30 32 34 0 0 0 2 2 2
58384+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58385+10 87 144 16 89 141 19 95 150 10 87 144 26 108 161 26 108 161
58386+26 108 161 26 108 161 26 108 161 28 67 93 6 10 14 1 1 2
58387+7 12 15 28 67 93 26 108 161 16 89 141 24 86 132 21 29 34
58388+3 4 3 21 29 34 37 112 160 37 112 160 27 99 146 21 29 34
58389+21 29 34 26 108 161 90 154 193 35 83 115 1 1 2 2 0 0
58390+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 125 124 125
58391+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58392+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58393+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58394+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58395+4 4 4 4 4 4
58396+3 1 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
58397+190 197 201 193 200 203 165 164 165 37 38 37 4 0 0 2 2 2
58398+5 5 5 4 3 3 4 0 0 6 10 14 24 86 132 10 87 144
58399+10 87 144 10 87 144 16 89 141 18 97 151 18 97 151 10 87 144
58400+24 86 132 24 86 132 13 20 25 4 5 7 4 5 7 22 40 52
58401+18 97 151 37 112 160 26 108 161 7 12 15 1 1 1 0 0 0
58402+28 67 93 37 112 160 26 108 161 28 67 93 22 40 52 28 67 93
58403+26 108 161 90 154 193 26 108 161 10 87 144 0 0 0 2 0 0
58404+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58405+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58406+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58407+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58408+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58409+4 4 4 4 4 4
58410+4 0 0 6 6 6 60 73 81 174 174 174 193 200 203 174 174 174
58411+190 197 201 193 200 203 165 164 165 30 32 34 0 0 0 2 2 2
58412+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58413+10 87 144 10 87 144 10 87 144 18 97 151 28 67 93 6 10 14
58414+0 0 0 1 1 2 4 5 7 13 20 25 16 89 141 26 108 161
58415+26 108 161 26 108 161 24 86 132 6 9 11 2 3 3 22 40 52
58416+37 112 160 16 89 141 22 40 52 28 67 93 26 108 161 26 108 161
58417+90 154 193 26 108 161 26 108 161 28 67 93 1 1 1 4 0 0
58418+4 4 4 5 5 5 3 3 3 4 0 0 26 28 28 124 126 130
58419+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58420+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58421+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58422+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58423+4 4 4 4 4 4
58424+4 0 0 4 0 0 60 73 81 193 200 203 193 200 203 174 174 174
58425+193 200 203 193 200 203 167 166 167 37 38 37 4 0 0 2 2 2
58426+5 5 5 4 4 4 4 0 0 6 10 14 28 67 93 10 87 144
58427+10 87 144 10 87 144 18 97 151 10 87 144 13 20 25 4 5 7
58428+1 1 2 1 1 1 22 40 52 26 108 161 26 108 161 26 108 161
58429+26 108 161 26 108 161 26 108 161 24 86 132 22 40 52 22 40 52
58430+22 40 52 22 40 52 10 87 144 26 108 161 26 108 161 26 108 161
58431+26 108 161 26 108 161 90 154 193 10 87 144 0 0 0 4 0 0
58432+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58433+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58434+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58435+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58436+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58437+4 4 4 4 4 4
58438+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58439+190 197 201 205 212 215 167 166 167 30 32 34 0 0 0 2 2 2
58440+5 5 5 4 4 4 1 1 2 6 10 14 28 67 93 10 87 144
58441+10 87 144 10 87 144 10 87 144 10 87 144 22 40 52 1 1 2
58442+2 0 0 1 1 2 24 86 132 26 108 161 26 108 161 26 108 161
58443+26 108 161 19 95 150 16 89 141 10 87 144 22 40 52 22 40 52
58444+10 87 144 26 108 161 37 112 160 26 108 161 26 108 161 26 108 161
58445+26 108 161 26 108 161 26 108 161 28 67 93 2 0 0 3 1 0
58446+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
58447+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58448+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58449+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58450+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58451+4 4 4 4 4 4
58452+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
58453+193 200 203 193 200 203 174 174 174 37 38 37 4 0 0 2 2 2
58454+5 5 5 4 4 4 3 2 2 1 1 2 13 20 25 10 87 144
58455+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 13 20 25
58456+13 20 25 22 40 52 10 87 144 18 97 151 18 97 151 26 108 161
58457+10 87 144 13 20 25 6 10 14 21 29 34 24 86 132 18 97 151
58458+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58459+26 108 161 90 154 193 18 97 151 13 20 25 0 0 0 4 3 3
58460+4 4 4 5 5 5 3 3 3 0 0 0 26 28 28 131 129 131
58461+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58462+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58463+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58464+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58465+4 4 4 4 4 4
58466+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58467+190 197 201 220 221 221 167 166 167 30 32 34 1 0 0 2 2 2
58468+5 5 5 4 4 4 4 4 5 2 5 5 4 5 7 13 20 25
58469+28 67 93 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
58470+10 87 144 10 87 144 18 97 151 10 87 144 18 97 151 18 97 151
58471+28 67 93 2 3 3 0 0 0 28 67 93 26 108 161 26 108 161
58472+26 108 161 26 108 161 26 108 161 26 108 161 26 108 161 26 108 161
58473+26 108 161 10 87 144 13 20 25 1 1 2 3 2 2 4 4 4
58474+4 4 4 5 5 5 3 3 3 2 0 0 26 28 28 131 129 131
58475+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58476+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58477+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58478+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58479+4 4 4 4 4 4
58480+4 0 0 4 0 0 60 73 81 220 221 221 190 197 201 174 174 174
58481+193 200 203 193 200 203 174 174 174 26 28 28 4 0 0 4 3 3
58482+5 5 5 4 4 4 4 4 4 4 4 5 1 1 2 2 5 5
58483+4 5 7 22 40 52 10 87 144 10 87 144 18 97 151 10 87 144
58484+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 18 97 151
58485+10 87 144 28 67 93 22 40 52 10 87 144 26 108 161 18 97 151
58486+18 97 151 18 97 151 26 108 161 26 108 161 26 108 161 26 108 161
58487+22 40 52 1 1 2 0 0 0 2 3 3 4 4 4 4 4 4
58488+4 4 4 5 5 5 4 4 4 0 0 0 26 28 28 131 129 131
58489+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58490+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58491+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58492+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58493+4 4 4 4 4 4
58494+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58495+190 197 201 220 221 221 190 197 201 41 54 63 4 0 0 2 2 2
58496+6 6 6 4 4 4 4 4 4 4 4 5 4 4 5 3 3 3
58497+1 1 2 1 1 2 6 10 14 22 40 52 10 87 144 18 97 151
58498+18 97 151 10 87 144 10 87 144 10 87 144 18 97 151 10 87 144
58499+10 87 144 18 97 151 26 108 161 18 97 151 18 97 151 10 87 144
58500+26 108 161 26 108 161 26 108 161 10 87 144 28 67 93 6 10 14
58501+1 1 2 1 1 2 4 3 3 4 4 5 4 4 4 4 4 4
58502+5 5 5 5 5 5 1 1 1 4 0 0 37 51 59 137 136 137
58503+137 136 137 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58504+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58505+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58506+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58507+4 4 4 4 4 4
58508+4 0 0 4 0 0 60 73 81 220 221 221 193 200 203 174 174 174
58509+193 200 203 193 200 203 220 221 221 137 136 137 13 16 17 4 0 0
58510+2 2 2 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5
58511+4 4 5 4 3 3 1 1 2 4 5 7 13 20 25 28 67 93
58512+10 87 144 10 87 144 10 87 144 10 87 144 10 87 144 10 87 144
58513+10 87 144 18 97 151 18 97 151 10 87 144 18 97 151 26 108 161
58514+26 108 161 18 97 151 28 67 93 6 10 14 0 0 0 0 0 0
58515+2 3 3 4 5 5 4 4 5 4 4 4 4 4 4 5 5 5
58516+3 3 3 1 1 1 0 0 0 16 19 21 125 124 125 137 136 137
58517+131 129 131 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58518+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58519+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58520+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58521+4 4 4 4 4 4
58522+4 0 0 6 6 6 60 73 81 174 174 174 220 221 221 174 174 174
58523+193 200 203 190 197 201 220 221 221 220 221 221 153 152 153 30 32 34
58524+0 0 0 0 0 0 2 2 2 4 4 4 4 4 4 4 4 4
58525+4 4 4 4 5 5 4 5 7 1 1 2 1 1 2 4 5 7
58526+13 20 25 28 67 93 10 87 144 18 97 151 10 87 144 10 87 144
58527+10 87 144 10 87 144 10 87 144 18 97 151 26 108 161 18 97 151
58528+28 67 93 7 12 15 0 0 0 0 0 0 2 2 1 4 4 4
58529+4 5 5 4 5 5 4 4 4 4 4 4 3 3 3 0 0 0
58530+0 0 0 0 0 0 37 38 37 125 124 125 158 157 158 131 129 131
58531+125 124 125 125 124 125 125 124 125 137 136 137 131 129 131 37 38 37
58532+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58533+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58534+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58535+4 4 4 4 4 4
58536+4 3 3 4 0 0 41 54 63 193 200 203 220 221 221 174 174 174
58537+193 200 203 193 200 203 193 200 203 220 221 221 244 246 246 193 200 203
58538+120 125 127 5 5 5 1 0 0 0 0 0 1 1 1 4 4 4
58539+4 4 4 4 4 4 4 5 5 4 5 5 4 4 5 1 1 2
58540+4 5 7 4 5 7 22 40 52 10 87 144 10 87 144 10 87 144
58541+10 87 144 10 87 144 18 97 151 10 87 144 10 87 144 13 20 25
58542+4 5 7 2 3 3 1 1 2 4 4 4 4 5 5 4 4 4
58543+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 1 2
58544+24 26 27 60 74 84 153 152 153 163 162 163 137 136 137 125 124 125
58545+125 124 125 125 124 125 125 124 125 137 136 137 125 124 125 26 28 28
58546+0 0 0 3 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58547+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58548+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58549+4 4 4 4 4 4
58550+4 0 0 6 6 6 26 28 28 156 155 156 220 221 221 220 221 221
58551+174 174 174 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
58552+220 221 221 167 166 167 60 73 81 7 11 13 0 0 0 0 0 0
58553+3 3 3 4 4 4 4 4 4 4 4 4 4 4 5 4 4 5
58554+4 4 5 1 1 2 1 1 2 4 5 7 22 40 52 10 87 144
58555+10 87 144 10 87 144 10 87 144 22 40 52 4 5 7 1 1 2
58556+1 1 2 4 4 5 4 4 4 4 4 4 4 4 4 4 4 4
58557+5 5 5 2 2 2 0 0 0 4 0 0 16 19 21 60 73 81
58558+137 136 137 167 166 167 158 157 158 137 136 137 131 129 131 131 129 131
58559+125 124 125 125 124 125 131 129 131 155 154 155 60 74 84 5 7 8
58560+0 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58561+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58562+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58563+4 4 4 4 4 4
58564+5 5 5 4 0 0 4 0 0 60 73 81 193 200 203 220 221 221
58565+193 200 203 193 200 203 193 200 203 193 200 203 205 212 215 220 221 221
58566+220 221 221 220 221 221 220 221 221 137 136 137 43 57 68 6 6 6
58567+4 0 0 1 1 1 4 4 4 4 4 4 4 4 4 4 4 4
58568+4 4 5 4 4 5 3 2 2 1 1 2 2 5 5 13 20 25
58569+22 40 52 22 40 52 13 20 25 2 3 3 1 1 2 3 3 3
58570+4 5 7 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58571+1 1 1 0 0 0 2 3 3 41 54 63 131 129 131 166 165 166
58572+166 165 166 155 154 155 153 152 153 137 136 137 137 136 137 125 124 125
58573+125 124 125 137 136 137 137 136 137 125 124 125 37 38 37 4 3 3
58574+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58575+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58576+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58577+4 4 4 4 4 4
58578+4 3 3 6 6 6 6 6 6 13 16 17 60 73 81 167 166 167
58579+220 221 221 220 221 221 220 221 221 193 200 203 193 200 203 193 200 203
58580+205 212 215 220 221 221 220 221 221 244 246 246 205 212 215 125 124 125
58581+24 26 27 0 0 0 0 0 0 2 2 2 5 5 5 5 5 5
58582+4 4 4 4 4 4 4 4 4 4 4 5 1 1 2 4 5 7
58583+4 5 7 4 5 7 1 1 2 3 2 2 4 4 5 4 4 4
58584+4 4 4 4 4 4 5 5 5 4 4 4 0 0 0 0 0 0
58585+2 0 0 26 28 28 125 124 125 174 174 174 174 174 174 166 165 166
58586+156 155 156 153 152 153 137 136 137 137 136 137 131 129 131 137 136 137
58587+137 136 137 137 136 137 60 74 84 30 32 34 4 0 0 4 0 0
58588+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58589+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58590+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58591+4 4 4 4 4 4
58592+5 5 5 6 6 6 4 0 0 4 0 0 6 6 6 26 28 28
58593+125 124 125 174 174 174 220 221 221 220 221 221 220 221 221 193 200 203
58594+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
58595+193 200 203 60 74 84 13 16 17 4 0 0 0 0 0 3 3 3
58596+5 5 5 5 5 5 4 4 4 4 4 4 4 4 5 3 3 3
58597+1 1 2 3 3 3 4 4 5 4 4 5 4 4 4 4 4 4
58598+5 5 5 5 5 5 2 2 2 0 0 0 0 0 0 13 16 17
58599+60 74 84 174 174 174 193 200 203 174 174 174 167 166 167 163 162 163
58600+153 152 153 153 152 153 137 136 137 137 136 137 153 152 153 137 136 137
58601+125 124 125 41 54 63 24 26 27 4 0 0 4 0 0 5 5 5
58602+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58603+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58604+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58605+4 4 4 4 4 4
58606+4 3 3 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
58607+6 6 6 37 38 37 131 129 131 220 221 221 220 221 221 220 221 221
58608+193 200 203 193 200 203 220 221 221 205 212 215 220 221 221 244 246 246
58609+244 246 246 244 246 246 174 174 174 41 54 63 0 0 0 0 0 0
58610+0 0 0 4 4 4 5 5 5 5 5 5 4 4 4 4 4 5
58611+4 4 5 4 4 5 4 4 4 4 4 4 6 6 6 6 6 6
58612+3 3 3 0 0 0 2 0 0 13 16 17 60 73 81 156 155 156
58613+220 221 221 193 200 203 174 174 174 165 164 165 163 162 163 154 153 154
58614+153 152 153 153 152 153 158 157 158 163 162 163 137 136 137 60 73 81
58615+13 16 17 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
58616+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58617+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58618+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58619+4 4 4 4 4 4
58620+5 5 5 4 3 3 4 3 3 6 6 6 6 6 6 6 6 6
58621+6 6 6 6 6 6 6 6 6 37 38 37 167 166 167 244 246 246
58622+244 246 246 220 221 221 205 212 215 205 212 215 220 221 221 193 200 203
58623+220 221 221 244 246 246 244 246 246 244 246 246 137 136 137 37 38 37
58624+3 2 2 0 0 0 1 1 1 5 5 5 5 5 5 4 4 4
58625+4 4 4 4 4 4 4 4 4 5 5 5 4 4 4 1 1 1
58626+0 0 0 5 5 5 43 57 68 153 152 153 193 200 203 220 221 221
58627+177 184 187 174 174 174 167 166 167 166 165 166 158 157 158 157 156 157
58628+158 157 158 166 165 166 156 155 156 85 115 134 13 16 17 4 0 0
58629+4 0 0 4 0 0 5 5 5 5 5 5 4 4 4 4 4 4
58630+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58631+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58632+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58633+4 4 4 4 4 4
58634+5 5 5 4 3 3 6 6 6 6 6 6 4 0 0 6 6 6
58635+6 6 6 6 6 6 6 6 6 6 6 6 13 16 17 60 73 81
58636+177 184 187 220 221 221 220 221 221 220 221 221 205 212 215 220 221 221
58637+220 221 221 205 212 215 220 221 221 244 246 246 244 246 246 205 212 215
58638+125 124 125 30 32 34 0 0 0 0 0 0 2 2 2 5 5 5
58639+4 4 4 4 4 4 4 4 4 1 1 1 0 0 0 1 0 0
58640+37 38 37 131 129 131 205 212 215 220 221 221 193 200 203 174 174 174
58641+174 174 174 174 174 174 167 166 167 165 164 165 166 165 166 167 166 167
58642+158 157 158 125 124 125 37 38 37 4 0 0 4 0 0 4 0 0
58643+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58644+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58645+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58646+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58647+4 4 4 4 4 4
58648+4 4 4 5 5 5 4 3 3 4 3 3 6 6 6 6 6 6
58649+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
58650+26 28 28 125 124 125 205 212 215 220 221 221 220 221 221 220 221 221
58651+205 212 215 220 221 221 205 212 215 220 221 221 220 221 221 244 246 246
58652+244 246 246 190 197 201 60 74 84 16 19 21 4 0 0 0 0 0
58653+0 0 0 0 0 0 0 0 0 0 0 0 16 19 21 120 125 127
58654+177 184 187 220 221 221 205 212 215 177 184 187 174 174 174 177 184 187
58655+174 174 174 174 174 174 167 166 167 174 174 174 166 165 166 137 136 137
58656+60 73 81 13 16 17 4 0 0 4 0 0 4 3 3 6 6 6
58657+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58658+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58659+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58660+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58661+4 4 4 4 4 4
58662+5 5 5 4 3 3 5 5 5 4 3 3 6 6 6 4 0 0
58663+6 6 6 6 6 6 4 0 0 6 6 6 4 0 0 6 6 6
58664+6 6 6 6 6 6 37 38 37 137 136 137 193 200 203 220 221 221
58665+220 221 221 205 212 215 220 221 221 205 212 215 205 212 215 220 221 221
58666+220 221 221 220 221 221 244 246 246 166 165 166 43 57 68 2 2 2
58667+0 0 0 4 0 0 16 19 21 60 73 81 157 156 157 202 210 214
58668+220 221 221 193 200 203 177 184 187 177 184 187 177 184 187 174 174 174
58669+174 174 174 174 174 174 174 174 174 157 156 157 60 74 84 24 26 27
58670+4 0 0 4 0 0 4 0 0 6 6 6 4 4 4 4 4 4
58671+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58672+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58673+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58674+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58675+4 4 4 4 4 4
58676+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
58677+6 6 6 4 0 0 6 6 6 6 6 6 6 6 6 4 0 0
58678+4 0 0 4 0 0 6 6 6 24 26 27 60 73 81 167 166 167
58679+220 221 221 220 221 221 220 221 221 205 212 215 205 212 215 205 212 215
58680+205 212 215 220 221 221 220 221 221 220 221 221 205 212 215 137 136 137
58681+60 74 84 125 124 125 137 136 137 190 197 201 220 221 221 193 200 203
58682+177 184 187 177 184 187 177 184 187 174 174 174 174 174 174 177 184 187
58683+190 197 201 174 174 174 125 124 125 37 38 37 6 6 6 4 0 0
58684+4 0 0 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58685+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58686+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58687+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58688+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58689+4 4 4 4 4 4
58690+4 4 4 4 4 4 5 5 5 5 5 5 4 3 3 6 6 6
58691+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 6 6 6
58692+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
58693+125 124 125 193 200 203 244 246 246 220 221 221 205 212 215 205 212 215
58694+205 212 215 193 200 203 205 212 215 205 212 215 220 221 221 220 221 221
58695+193 200 203 193 200 203 205 212 215 193 200 203 193 200 203 177 184 187
58696+190 197 201 190 197 201 174 174 174 190 197 201 193 200 203 190 197 201
58697+153 152 153 60 73 81 4 0 0 4 0 0 4 0 0 3 2 2
58698+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58699+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58700+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58701+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58702+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58703+4 4 4 4 4 4
58704+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
58705+6 6 6 4 3 3 4 3 3 4 3 3 6 6 6 6 6 6
58706+4 0 0 6 6 6 6 6 6 6 6 6 4 0 0 4 0 0
58707+4 0 0 26 28 28 131 129 131 220 221 221 244 246 246 220 221 221
58708+205 212 215 193 200 203 205 212 215 193 200 203 193 200 203 205 212 215
58709+220 221 221 193 200 203 193 200 203 193 200 203 190 197 201 174 174 174
58710+174 174 174 190 197 201 193 200 203 193 200 203 167 166 167 125 124 125
58711+6 6 6 4 0 0 4 0 0 4 3 3 4 4 4 4 4 4
58712+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58713+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58714+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58715+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58716+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58717+4 4 4 4 4 4
58718+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58719+5 5 5 4 3 3 5 5 5 6 6 6 4 3 3 5 5 5
58720+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
58721+4 0 0 4 0 0 6 6 6 41 54 63 158 157 158 220 221 221
58722+220 221 221 220 221 221 193 200 203 193 200 203 193 200 203 190 197 201
58723+190 197 201 190 197 201 190 197 201 190 197 201 174 174 174 193 200 203
58724+193 200 203 220 221 221 174 174 174 125 124 125 37 38 37 4 0 0
58725+4 0 0 4 3 3 6 6 6 4 4 4 4 4 4 4 4 4
58726+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58727+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58728+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58729+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58730+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58731+4 4 4 4 4 4
58732+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58733+4 4 4 5 5 5 4 3 3 4 3 3 4 3 3 5 5 5
58734+4 3 3 6 6 6 5 5 5 4 3 3 6 6 6 6 6 6
58735+6 6 6 6 6 6 4 0 0 4 0 0 13 16 17 60 73 81
58736+174 174 174 220 221 221 220 221 221 205 212 215 190 197 201 174 174 174
58737+193 200 203 174 174 174 190 197 201 174 174 174 193 200 203 220 221 221
58738+193 200 203 131 129 131 37 38 37 6 6 6 4 0 0 4 0 0
58739+6 6 6 6 6 6 4 3 3 5 5 5 4 4 4 4 4 4
58740+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58741+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58742+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58743+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58744+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58745+4 4 4 4 4 4
58746+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58747+4 4 4 4 4 4 4 4 4 5 5 5 5 5 5 5 5 5
58748+5 5 5 4 3 3 4 3 3 5 5 5 4 3 3 4 3 3
58749+5 5 5 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
58750+6 6 6 125 124 125 174 174 174 220 221 221 220 221 221 193 200 203
58751+193 200 203 193 200 203 193 200 203 193 200 203 220 221 221 158 157 158
58752+60 73 81 6 6 6 4 0 0 4 0 0 5 5 5 6 6 6
58753+5 5 5 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58754+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58755+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58756+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58757+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58758+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58759+4 4 4 4 4 4
58760+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58761+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58762+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
58763+5 5 5 5 5 5 6 6 6 6 6 6 4 0 0 4 0 0
58764+4 0 0 4 0 0 26 28 28 125 124 125 174 174 174 193 200 203
58765+193 200 203 174 174 174 193 200 203 167 166 167 125 124 125 6 6 6
58766+6 6 6 6 6 6 4 0 0 6 6 6 6 6 6 5 5 5
58767+4 3 3 5 5 5 4 4 4 4 4 4 4 4 4 4 4 4
58768+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58769+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58770+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58771+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58772+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58773+4 4 4 4 4 4
58774+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58775+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58776+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58777+4 3 3 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
58778+6 6 6 4 0 0 4 0 0 6 6 6 37 38 37 125 124 125
58779+153 152 153 131 129 131 125 124 125 37 38 37 6 6 6 6 6 6
58780+6 6 6 4 0 0 6 6 6 6 6 6 4 3 3 5 5 5
58781+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58782+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58783+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58784+4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
58787+4 4 4 4 4 4
58788+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58789+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58790+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58791+4 4 4 5 5 5 5 5 5 4 3 3 5 5 5 4 3 3
58792+6 6 6 6 6 6 4 0 0 4 0 0 6 6 6 6 6 6
58793+24 26 27 24 26 27 6 6 6 6 6 6 6 6 6 4 0 0
58794+6 6 6 6 6 6 4 0 0 6 6 6 5 5 5 4 3 3
58795+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58796+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58797+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58798+4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
58801+4 4 4 4 4 4
58802+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58803+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58804+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58805+4 4 4 4 4 4 5 5 5 4 3 3 5 5 5 6 6 6
58806+4 0 0 6 6 6 6 6 6 6 6 6 6 6 6 6 6 6
58807+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 6 6 6
58808+4 0 0 6 6 6 6 6 6 4 3 3 5 5 5 4 4 4
58809+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58810+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58811+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
58815+4 4 4 4 4 4
58816+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58817+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58818+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58819+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 5 5 5
58820+5 5 5 5 5 5 4 0 0 6 6 6 4 0 0 6 6 6
58821+6 6 6 6 6 6 6 6 6 4 0 0 6 6 6 4 0 0
58822+6 6 6 4 3 3 5 5 5 4 3 3 5 5 5 4 4 4
58823+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58824+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58825+4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
58829+4 4 4 4 4 4
58830+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58831+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58832+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58833+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 5 5 5
58834+4 3 3 6 6 6 4 3 3 6 6 6 6 6 6 6 6 6
58835+4 0 0 6 6 6 4 0 0 6 6 6 6 6 6 6 6 6
58836+6 6 6 4 3 3 5 5 5 4 4 4 4 4 4 4 4 4
58837+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58838+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58839+4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
58843+4 4 4 4 4 4
58844+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58845+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58846+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58847+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58848+4 4 4 5 5 5 4 3 3 5 5 5 4 0 0 6 6 6
58849+6 6 6 4 0 0 6 6 6 6 6 6 4 0 0 6 6 6
58850+4 3 3 5 5 5 5 5 5 4 4 4 4 4 4 4 4 4
58851+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58852+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58853+4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
58857+4 4 4 4 4 4
58858+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58859+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58860+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58861+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58862+4 4 4 5 5 5 4 3 3 5 5 5 6 6 6 4 3 3
58863+4 3 3 6 6 6 6 6 6 4 3 3 6 6 6 4 3 3
58864+5 5 5 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58865+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58866+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58867+4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
58871+4 4 4 4 4 4
58872+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58873+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58874+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58875+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58876+4 4 4 4 4 4 4 4 4 5 5 5 4 3 3 6 6 6
58877+5 5 5 4 3 3 4 3 3 4 3 3 5 5 5 5 5 5
58878+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58879+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58880+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58881+4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
58885+4 4 4 4 4 4
58886+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58887+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58888+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58889+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58890+4 4 4 4 4 4 4 4 4 4 4 4 5 5 5 4 3 3
58891+5 5 5 4 3 3 5 5 5 5 5 5 4 4 4 4 4 4
58892+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58893+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58894+4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4 4
58895+4 4 4 4 4 4 4 4 4 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 4 4 4 4 4 4 4 4 4 4 4 4
58899+4 4 4 4 4 4
58900diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c
58901index 70fba97..8ec7f86 100644
58902--- a/drivers/xen/events/events_base.c
58903+++ b/drivers/xen/events/events_base.c
58904@@ -1563,7 +1563,7 @@ void xen_irq_resume(void)
58905 restore_pirqs();
58906 }
58907
58908-static struct irq_chip xen_dynamic_chip __read_mostly = {
58909+static struct irq_chip xen_dynamic_chip = {
58910 .name = "xen-dyn",
58911
58912 .irq_disable = disable_dynirq,
58913@@ -1577,7 +1577,7 @@ static struct irq_chip xen_dynamic_chip __read_mostly = {
58914 .irq_retrigger = retrigger_dynirq,
58915 };
58916
58917-static struct irq_chip xen_pirq_chip __read_mostly = {
58918+static struct irq_chip xen_pirq_chip = {
58919 .name = "xen-pirq",
58920
58921 .irq_startup = startup_pirq,
58922@@ -1597,7 +1597,7 @@ static struct irq_chip xen_pirq_chip __read_mostly = {
58923 .irq_retrigger = retrigger_dynirq,
58924 };
58925
58926-static struct irq_chip xen_percpu_chip __read_mostly = {
58927+static struct irq_chip xen_percpu_chip = {
58928 .name = "xen-percpu",
58929
58930 .irq_disable = disable_dynirq,
58931diff --git a/drivers/xen/xenfs/xenstored.c b/drivers/xen/xenfs/xenstored.c
58932index fef20db..d28b1ab 100644
58933--- a/drivers/xen/xenfs/xenstored.c
58934+++ b/drivers/xen/xenfs/xenstored.c
58935@@ -24,7 +24,12 @@ static int xsd_release(struct inode *inode, struct file *file)
58936 static int xsd_kva_open(struct inode *inode, struct file *file)
58937 {
58938 file->private_data = (void *)kasprintf(GFP_KERNEL, "0x%p",
58939+#ifdef CONFIG_GRKERNSEC_HIDESYM
58940+ NULL);
58941+#else
58942 xen_store_interface);
58943+#endif
58944+
58945 if (!file->private_data)
58946 return -ENOMEM;
58947 return 0;
58948diff --git a/fs/9p/vfs_addr.c b/fs/9p/vfs_addr.c
58949index eb14e05..5156de7 100644
58950--- a/fs/9p/vfs_addr.c
58951+++ b/fs/9p/vfs_addr.c
58952@@ -187,7 +187,7 @@ static int v9fs_vfs_writepage_locked(struct page *page)
58953
58954 retval = v9fs_file_write_internal(inode,
58955 v9inode->writeback_fid,
58956- (__force const char __user *)buffer,
58957+ (const char __force_user *)buffer,
58958 len, &offset, 0);
58959 if (retval > 0)
58960 retval = 0;
58961diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
58962index 3662f1d..90558b5 100644
58963--- a/fs/9p/vfs_inode.c
58964+++ b/fs/9p/vfs_inode.c
58965@@ -1312,7 +1312,7 @@ static void *v9fs_vfs_follow_link(struct dentry *dentry, struct nameidata *nd)
58966 void
58967 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
58968 {
58969- char *s = nd_get_link(nd);
58970+ const char *s = nd_get_link(nd);
58971
58972 p9_debug(P9_DEBUG_VFS, " %pd %s\n",
58973 dentry, IS_ERR(s) ? "<error>" : s);
58974diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
58975index 270c481..0d8a962 100644
58976--- a/fs/Kconfig.binfmt
58977+++ b/fs/Kconfig.binfmt
58978@@ -106,7 +106,7 @@ config HAVE_AOUT
58979
58980 config BINFMT_AOUT
58981 tristate "Kernel support for a.out and ECOFF binaries"
58982- depends on HAVE_AOUT
58983+ depends on HAVE_AOUT && BROKEN
58984 ---help---
58985 A.out (Assembler.OUTput) is a set of formats for libraries and
58986 executables used in the earliest versions of UNIX. Linux used
58987diff --git a/fs/afs/inode.c b/fs/afs/inode.c
58988index 8a1d38e..300a14e 100644
58989--- a/fs/afs/inode.c
58990+++ b/fs/afs/inode.c
58991@@ -141,7 +141,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
58992 struct afs_vnode *vnode;
58993 struct super_block *sb;
58994 struct inode *inode;
58995- static atomic_t afs_autocell_ino;
58996+ static atomic_unchecked_t afs_autocell_ino;
58997
58998 _enter("{%x:%u},%*.*s,",
58999 AFS_FS_I(dir)->fid.vid, AFS_FS_I(dir)->fid.vnode,
59000@@ -154,7 +154,7 @@ struct inode *afs_iget_autocell(struct inode *dir, const char *dev_name,
59001 data.fid.unique = 0;
59002 data.fid.vnode = 0;
59003
59004- inode = iget5_locked(sb, atomic_inc_return(&afs_autocell_ino),
59005+ inode = iget5_locked(sb, atomic_inc_return_unchecked(&afs_autocell_ino),
59006 afs_iget5_autocell_test, afs_iget5_set,
59007 &data);
59008 if (!inode) {
59009diff --git a/fs/aio.c b/fs/aio.c
59010index a793f70..46f45af 100644
59011--- a/fs/aio.c
59012+++ b/fs/aio.c
59013@@ -404,7 +404,7 @@ static int aio_setup_ring(struct kioctx *ctx)
59014 size += sizeof(struct io_event) * nr_events;
59015
59016 nr_pages = PFN_UP(size);
59017- if (nr_pages < 0)
59018+ if (nr_pages <= 0)
59019 return -EINVAL;
59020
59021 file = aio_private_file(ctx, nr_pages);
59022diff --git a/fs/attr.c b/fs/attr.c
59023index 6530ced..4a827e2 100644
59024--- a/fs/attr.c
59025+++ b/fs/attr.c
59026@@ -102,6 +102,7 @@ int inode_newsize_ok(const struct inode *inode, loff_t offset)
59027 unsigned long limit;
59028
59029 limit = rlimit(RLIMIT_FSIZE);
59030+ gr_learn_resource(current, RLIMIT_FSIZE, (unsigned long)offset, 1);
59031 if (limit != RLIM_INFINITY && offset > limit)
59032 goto out_sig;
59033 if (offset > inode->i_sb->s_maxbytes)
59034diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c
59035index 116fd38..c04182da 100644
59036--- a/fs/autofs4/waitq.c
59037+++ b/fs/autofs4/waitq.c
59038@@ -59,7 +59,7 @@ static int autofs4_write(struct autofs_sb_info *sbi,
59039 {
59040 unsigned long sigpipe, flags;
59041 mm_segment_t fs;
59042- const char *data = (const char *)addr;
59043+ const char __user *data = (const char __force_user *)addr;
59044 ssize_t wr = 0;
59045
59046 sigpipe = sigismember(&current->pending.signal, SIGPIPE);
59047@@ -340,6 +340,10 @@ static int validate_request(struct autofs_wait_queue **wait,
59048 return 1;
59049 }
59050
59051+#ifdef CONFIG_GRKERNSEC_HIDESYM
59052+static atomic_unchecked_t autofs_dummy_name_id = ATOMIC_INIT(0);
59053+#endif
59054+
59055 int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
59056 enum autofs_notify notify)
59057 {
59058@@ -385,7 +389,12 @@ int autofs4_wait(struct autofs_sb_info *sbi, struct dentry *dentry,
59059
59060 /* If this is a direct mount request create a dummy name */
59061 if (IS_ROOT(dentry) && autofs_type_trigger(sbi->type))
59062+#ifdef CONFIG_GRKERNSEC_HIDESYM
59063+ /* this name does get written to userland via autofs4_write() */
59064+ qstr.len = sprintf(name, "%08x", atomic_inc_return_unchecked(&autofs_dummy_name_id));
59065+#else
59066 qstr.len = sprintf(name, "%p", dentry);
59067+#endif
59068 else {
59069 qstr.len = autofs4_getpath(sbi, dentry, &name);
59070 if (!qstr.len) {
59071diff --git a/fs/befs/endian.h b/fs/befs/endian.h
59072index 2722387..56059b5 100644
59073--- a/fs/befs/endian.h
59074+++ b/fs/befs/endian.h
59075@@ -11,7 +11,7 @@
59076
59077 #include <asm/byteorder.h>
59078
59079-static inline u64
59080+static inline u64 __intentional_overflow(-1)
59081 fs64_to_cpu(const struct super_block *sb, fs64 n)
59082 {
59083 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
59084@@ -29,7 +29,7 @@ cpu_to_fs64(const struct super_block *sb, u64 n)
59085 return (__force fs64)cpu_to_be64(n);
59086 }
59087
59088-static inline u32
59089+static inline u32 __intentional_overflow(-1)
59090 fs32_to_cpu(const struct super_block *sb, fs32 n)
59091 {
59092 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
59093@@ -47,7 +47,7 @@ cpu_to_fs32(const struct super_block *sb, u32 n)
59094 return (__force fs32)cpu_to_be32(n);
59095 }
59096
59097-static inline u16
59098+static inline u16 __intentional_overflow(-1)
59099 fs16_to_cpu(const struct super_block *sb, fs16 n)
59100 {
59101 if (BEFS_SB(sb)->byte_order == BEFS_BYTESEX_LE)
59102diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c
59103index 4c55668..eeae150 100644
59104--- a/fs/binfmt_aout.c
59105+++ b/fs/binfmt_aout.c
59106@@ -16,6 +16,7 @@
59107 #include <linux/string.h>
59108 #include <linux/fs.h>
59109 #include <linux/file.h>
59110+#include <linux/security.h>
59111 #include <linux/stat.h>
59112 #include <linux/fcntl.h>
59113 #include <linux/ptrace.h>
59114@@ -58,6 +59,8 @@ static int aout_core_dump(struct coredump_params *cprm)
59115 #endif
59116 # define START_STACK(u) ((void __user *)u.start_stack)
59117
59118+ memset(&dump, 0, sizeof(dump));
59119+
59120 fs = get_fs();
59121 set_fs(KERNEL_DS);
59122 has_dumped = 1;
59123@@ -68,10 +71,12 @@ static int aout_core_dump(struct coredump_params *cprm)
59124
59125 /* If the size of the dump file exceeds the rlimit, then see what would happen
59126 if we wrote the stack, but not the data area. */
59127+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE, 1);
59128 if ((dump.u_dsize + dump.u_ssize+1) * PAGE_SIZE > cprm->limit)
59129 dump.u_dsize = 0;
59130
59131 /* Make sure we have enough room to write the stack and data areas. */
59132+ gr_learn_resource(current, RLIMIT_CORE, (dump.u_ssize + 1) * PAGE_SIZE, 1);
59133 if ((dump.u_ssize + 1) * PAGE_SIZE > cprm->limit)
59134 dump.u_ssize = 0;
59135
59136@@ -232,6 +237,8 @@ static int load_aout_binary(struct linux_binprm * bprm)
59137 rlim = rlimit(RLIMIT_DATA);
59138 if (rlim >= RLIM_INFINITY)
59139 rlim = ~0;
59140+
59141+ gr_learn_resource(current, RLIMIT_DATA, ex.a_data + ex.a_bss, 1);
59142 if (ex.a_data + ex.a_bss > rlim)
59143 return -ENOMEM;
59144
59145@@ -261,6 +268,27 @@ static int load_aout_binary(struct linux_binprm * bprm)
59146
59147 install_exec_creds(bprm);
59148
59149+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
59150+ current->mm->pax_flags = 0UL;
59151+#endif
59152+
59153+#ifdef CONFIG_PAX_PAGEEXEC
59154+ if (!(N_FLAGS(ex) & F_PAX_PAGEEXEC)) {
59155+ current->mm->pax_flags |= MF_PAX_PAGEEXEC;
59156+
59157+#ifdef CONFIG_PAX_EMUTRAMP
59158+ if (N_FLAGS(ex) & F_PAX_EMUTRAMP)
59159+ current->mm->pax_flags |= MF_PAX_EMUTRAMP;
59160+#endif
59161+
59162+#ifdef CONFIG_PAX_MPROTECT
59163+ if (!(N_FLAGS(ex) & F_PAX_MPROTECT))
59164+ current->mm->pax_flags |= MF_PAX_MPROTECT;
59165+#endif
59166+
59167+ }
59168+#endif
59169+
59170 if (N_MAGIC(ex) == OMAGIC) {
59171 unsigned long text_addr, map_size;
59172 loff_t pos;
59173@@ -312,7 +340,7 @@ static int load_aout_binary(struct linux_binprm * bprm)
59174 return error;
59175
59176 error = vm_mmap(bprm->file, N_DATADDR(ex), ex.a_data,
59177- PROT_READ | PROT_WRITE | PROT_EXEC,
59178+ PROT_READ | PROT_WRITE,
59179 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
59180 fd_offset + ex.a_text);
59181 if (error != N_DATADDR(ex))
59182diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
59183index d925f55..d31f527 100644
59184--- a/fs/binfmt_elf.c
59185+++ b/fs/binfmt_elf.c
59186@@ -34,6 +34,7 @@
59187 #include <linux/utsname.h>
59188 #include <linux/coredump.h>
59189 #include <linux/sched.h>
59190+#include <linux/xattr.h>
59191 #include <asm/uaccess.h>
59192 #include <asm/param.h>
59193 #include <asm/page.h>
59194@@ -47,7 +48,7 @@
59195
59196 static int load_elf_binary(struct linux_binprm *bprm);
59197 static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *,
59198- int, int, unsigned long);
59199+ int, int, unsigned long) __intentional_overflow(-1);
59200
59201 #ifdef CONFIG_USELIB
59202 static int load_elf_library(struct file *);
59203@@ -65,6 +66,14 @@ static int elf_core_dump(struct coredump_params *cprm);
59204 #define elf_core_dump NULL
59205 #endif
59206
59207+#ifdef CONFIG_PAX_MPROTECT
59208+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags);
59209+#endif
59210+
59211+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59212+static void elf_handle_mmap(struct file *file);
59213+#endif
59214+
59215 #if ELF_EXEC_PAGESIZE > PAGE_SIZE
59216 #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE
59217 #else
59218@@ -84,6 +93,15 @@ static struct linux_binfmt elf_format = {
59219 .load_binary = load_elf_binary,
59220 .load_shlib = load_elf_library,
59221 .core_dump = elf_core_dump,
59222+
59223+#ifdef CONFIG_PAX_MPROTECT
59224+ .handle_mprotect= elf_handle_mprotect,
59225+#endif
59226+
59227+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
59228+ .handle_mmap = elf_handle_mmap,
59229+#endif
59230+
59231 .min_coredump = ELF_EXEC_PAGESIZE,
59232 };
59233
59234@@ -91,6 +109,8 @@ static struct linux_binfmt elf_format = {
59235
59236 static int set_brk(unsigned long start, unsigned long end)
59237 {
59238+ unsigned long e = end;
59239+
59240 start = ELF_PAGEALIGN(start);
59241 end = ELF_PAGEALIGN(end);
59242 if (end > start) {
59243@@ -99,7 +119,7 @@ static int set_brk(unsigned long start, unsigned long end)
59244 if (BAD_ADDR(addr))
59245 return addr;
59246 }
59247- current->mm->start_brk = current->mm->brk = end;
59248+ current->mm->start_brk = current->mm->brk = e;
59249 return 0;
59250 }
59251
59252@@ -160,12 +180,13 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
59253 elf_addr_t __user *u_rand_bytes;
59254 const char *k_platform = ELF_PLATFORM;
59255 const char *k_base_platform = ELF_BASE_PLATFORM;
59256- unsigned char k_rand_bytes[16];
59257+ u32 k_rand_bytes[4];
59258 int items;
59259 elf_addr_t *elf_info;
59260 int ei_index = 0;
59261 const struct cred *cred = current_cred();
59262 struct vm_area_struct *vma;
59263+ unsigned long saved_auxv[AT_VECTOR_SIZE];
59264
59265 /*
59266 * In some cases (e.g. Hyper-Threading), we want to avoid L1
59267@@ -207,8 +228,12 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
59268 * Generate 16 random bytes for userspace PRNG seeding.
59269 */
59270 get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes));
59271- u_rand_bytes = (elf_addr_t __user *)
59272- STACK_ALLOC(p, sizeof(k_rand_bytes));
59273+ prandom_seed(k_rand_bytes[0] ^ prandom_u32());
59274+ prandom_seed(k_rand_bytes[1] ^ prandom_u32());
59275+ prandom_seed(k_rand_bytes[2] ^ prandom_u32());
59276+ prandom_seed(k_rand_bytes[3] ^ prandom_u32());
59277+ p = STACK_ROUND(p, sizeof(k_rand_bytes));
59278+ u_rand_bytes = (elf_addr_t __user *) p;
59279 if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes)))
59280 return -EFAULT;
59281
59282@@ -323,9 +348,11 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
59283 return -EFAULT;
59284 current->mm->env_end = p;
59285
59286+ memcpy(saved_auxv, elf_info, ei_index * sizeof(elf_addr_t));
59287+
59288 /* Put the elf_info on the stack in the right place. */
59289 sp = (elf_addr_t __user *)envp + 1;
59290- if (copy_to_user(sp, elf_info, ei_index * sizeof(elf_addr_t)))
59291+ if (copy_to_user(sp, saved_auxv, ei_index * sizeof(elf_addr_t)))
59292 return -EFAULT;
59293 return 0;
59294 }
59295@@ -514,14 +541,14 @@ static inline int arch_check_elf(struct elfhdr *ehdr, bool has_interp,
59296 an ELF header */
59297
59298 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
59299- struct file *interpreter, unsigned long *interp_map_addr,
59300+ struct file *interpreter,
59301 unsigned long no_base, struct elf_phdr *interp_elf_phdata)
59302 {
59303 struct elf_phdr *eppnt;
59304- unsigned long load_addr = 0;
59305+ unsigned long load_addr = 0, pax_task_size = TASK_SIZE;
59306 int load_addr_set = 0;
59307 unsigned long last_bss = 0, elf_bss = 0;
59308- unsigned long error = ~0UL;
59309+ unsigned long error = -EINVAL;
59310 unsigned long total_size;
59311 int i;
59312
59313@@ -541,6 +568,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
59314 goto out;
59315 }
59316
59317+#ifdef CONFIG_PAX_SEGMEXEC
59318+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC)
59319+ pax_task_size = SEGMEXEC_TASK_SIZE;
59320+#endif
59321+
59322 eppnt = interp_elf_phdata;
59323 for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
59324 if (eppnt->p_type == PT_LOAD) {
59325@@ -564,8 +596,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
59326 map_addr = elf_map(interpreter, load_addr + vaddr,
59327 eppnt, elf_prot, elf_type, total_size);
59328 total_size = 0;
59329- if (!*interp_map_addr)
59330- *interp_map_addr = map_addr;
59331 error = map_addr;
59332 if (BAD_ADDR(map_addr))
59333 goto out;
59334@@ -584,8 +614,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
59335 k = load_addr + eppnt->p_vaddr;
59336 if (BAD_ADDR(k) ||
59337 eppnt->p_filesz > eppnt->p_memsz ||
59338- eppnt->p_memsz > TASK_SIZE ||
59339- TASK_SIZE - eppnt->p_memsz < k) {
59340+ eppnt->p_memsz > pax_task_size ||
59341+ pax_task_size - eppnt->p_memsz < k) {
59342 error = -ENOMEM;
59343 goto out;
59344 }
59345@@ -624,9 +654,11 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
59346 elf_bss = ELF_PAGESTART(elf_bss + ELF_MIN_ALIGN - 1);
59347
59348 /* Map the last of the bss segment */
59349- error = vm_brk(elf_bss, last_bss - elf_bss);
59350- if (BAD_ADDR(error))
59351- goto out;
59352+ if (last_bss > elf_bss) {
59353+ error = vm_brk(elf_bss, last_bss - elf_bss);
59354+ if (BAD_ADDR(error))
59355+ goto out;
59356+ }
59357 }
59358
59359 error = load_addr;
59360@@ -634,6 +666,336 @@ out:
59361 return error;
59362 }
59363
59364+#ifdef CONFIG_PAX_PT_PAX_FLAGS
59365+#ifdef CONFIG_PAX_SOFTMODE
59366+static unsigned long pax_parse_pt_pax_softmode(const struct elf_phdr * const elf_phdata)
59367+{
59368+ unsigned long pax_flags = 0UL;
59369+
59370+#ifdef CONFIG_PAX_PAGEEXEC
59371+ if (elf_phdata->p_flags & PF_PAGEEXEC)
59372+ pax_flags |= MF_PAX_PAGEEXEC;
59373+#endif
59374+
59375+#ifdef CONFIG_PAX_SEGMEXEC
59376+ if (elf_phdata->p_flags & PF_SEGMEXEC)
59377+ pax_flags |= MF_PAX_SEGMEXEC;
59378+#endif
59379+
59380+#ifdef CONFIG_PAX_EMUTRAMP
59381+ if ((elf_phdata->p_flags & PF_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
59382+ pax_flags |= MF_PAX_EMUTRAMP;
59383+#endif
59384+
59385+#ifdef CONFIG_PAX_MPROTECT
59386+ if (elf_phdata->p_flags & PF_MPROTECT)
59387+ pax_flags |= MF_PAX_MPROTECT;
59388+#endif
59389+
59390+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
59391+ if (randomize_va_space && (elf_phdata->p_flags & PF_RANDMMAP))
59392+ pax_flags |= MF_PAX_RANDMMAP;
59393+#endif
59394+
59395+ return pax_flags;
59396+}
59397+#endif
59398+
59399+static unsigned long pax_parse_pt_pax_hardmode(const struct elf_phdr * const elf_phdata)
59400+{
59401+ unsigned long pax_flags = 0UL;
59402+
59403+#ifdef CONFIG_PAX_PAGEEXEC
59404+ if (!(elf_phdata->p_flags & PF_NOPAGEEXEC))
59405+ pax_flags |= MF_PAX_PAGEEXEC;
59406+#endif
59407+
59408+#ifdef CONFIG_PAX_SEGMEXEC
59409+ if (!(elf_phdata->p_flags & PF_NOSEGMEXEC))
59410+ pax_flags |= MF_PAX_SEGMEXEC;
59411+#endif
59412+
59413+#ifdef CONFIG_PAX_EMUTRAMP
59414+ if (!(elf_phdata->p_flags & PF_NOEMUTRAMP))
59415+ pax_flags |= MF_PAX_EMUTRAMP;
59416+#endif
59417+
59418+#ifdef CONFIG_PAX_MPROTECT
59419+ if (!(elf_phdata->p_flags & PF_NOMPROTECT))
59420+ pax_flags |= MF_PAX_MPROTECT;
59421+#endif
59422+
59423+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
59424+ if (randomize_va_space && !(elf_phdata->p_flags & PF_NORANDMMAP))
59425+ pax_flags |= MF_PAX_RANDMMAP;
59426+#endif
59427+
59428+ return pax_flags;
59429+}
59430+#endif
59431+
59432+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
59433+#ifdef CONFIG_PAX_SOFTMODE
59434+static unsigned long pax_parse_xattr_pax_softmode(unsigned long pax_flags_softmode)
59435+{
59436+ unsigned long pax_flags = 0UL;
59437+
59438+#ifdef CONFIG_PAX_PAGEEXEC
59439+ if (pax_flags_softmode & MF_PAX_PAGEEXEC)
59440+ pax_flags |= MF_PAX_PAGEEXEC;
59441+#endif
59442+
59443+#ifdef CONFIG_PAX_SEGMEXEC
59444+ if (pax_flags_softmode & MF_PAX_SEGMEXEC)
59445+ pax_flags |= MF_PAX_SEGMEXEC;
59446+#endif
59447+
59448+#ifdef CONFIG_PAX_EMUTRAMP
59449+ if ((pax_flags_softmode & MF_PAX_EMUTRAMP) && (pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)))
59450+ pax_flags |= MF_PAX_EMUTRAMP;
59451+#endif
59452+
59453+#ifdef CONFIG_PAX_MPROTECT
59454+ if (pax_flags_softmode & MF_PAX_MPROTECT)
59455+ pax_flags |= MF_PAX_MPROTECT;
59456+#endif
59457+
59458+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
59459+ if (randomize_va_space && (pax_flags_softmode & MF_PAX_RANDMMAP))
59460+ pax_flags |= MF_PAX_RANDMMAP;
59461+#endif
59462+
59463+ return pax_flags;
59464+}
59465+#endif
59466+
59467+static unsigned long pax_parse_xattr_pax_hardmode(unsigned long pax_flags_hardmode)
59468+{
59469+ unsigned long pax_flags = 0UL;
59470+
59471+#ifdef CONFIG_PAX_PAGEEXEC
59472+ if (!(pax_flags_hardmode & MF_PAX_PAGEEXEC))
59473+ pax_flags |= MF_PAX_PAGEEXEC;
59474+#endif
59475+
59476+#ifdef CONFIG_PAX_SEGMEXEC
59477+ if (!(pax_flags_hardmode & MF_PAX_SEGMEXEC))
59478+ pax_flags |= MF_PAX_SEGMEXEC;
59479+#endif
59480+
59481+#ifdef CONFIG_PAX_EMUTRAMP
59482+ if (!(pax_flags_hardmode & MF_PAX_EMUTRAMP))
59483+ pax_flags |= MF_PAX_EMUTRAMP;
59484+#endif
59485+
59486+#ifdef CONFIG_PAX_MPROTECT
59487+ if (!(pax_flags_hardmode & MF_PAX_MPROTECT))
59488+ pax_flags |= MF_PAX_MPROTECT;
59489+#endif
59490+
59491+#if defined(CONFIG_PAX_RANDMMAP) || defined(CONFIG_PAX_RANDUSTACK)
59492+ if (randomize_va_space && !(pax_flags_hardmode & MF_PAX_RANDMMAP))
59493+ pax_flags |= MF_PAX_RANDMMAP;
59494+#endif
59495+
59496+ return pax_flags;
59497+}
59498+#endif
59499+
59500+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
59501+static unsigned long pax_parse_defaults(void)
59502+{
59503+ unsigned long pax_flags = 0UL;
59504+
59505+#ifdef CONFIG_PAX_SOFTMODE
59506+ if (pax_softmode)
59507+ return pax_flags;
59508+#endif
59509+
59510+#ifdef CONFIG_PAX_PAGEEXEC
59511+ pax_flags |= MF_PAX_PAGEEXEC;
59512+#endif
59513+
59514+#ifdef CONFIG_PAX_SEGMEXEC
59515+ pax_flags |= MF_PAX_SEGMEXEC;
59516+#endif
59517+
59518+#ifdef CONFIG_PAX_MPROTECT
59519+ pax_flags |= MF_PAX_MPROTECT;
59520+#endif
59521+
59522+#ifdef CONFIG_PAX_RANDMMAP
59523+ if (randomize_va_space)
59524+ pax_flags |= MF_PAX_RANDMMAP;
59525+#endif
59526+
59527+ return pax_flags;
59528+}
59529+
59530+static unsigned long pax_parse_ei_pax(const struct elfhdr * const elf_ex)
59531+{
59532+ unsigned long pax_flags = PAX_PARSE_FLAGS_FALLBACK;
59533+
59534+#ifdef CONFIG_PAX_EI_PAX
59535+
59536+#ifdef CONFIG_PAX_SOFTMODE
59537+ if (pax_softmode)
59538+ return pax_flags;
59539+#endif
59540+
59541+ pax_flags = 0UL;
59542+
59543+#ifdef CONFIG_PAX_PAGEEXEC
59544+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_PAGEEXEC))
59545+ pax_flags |= MF_PAX_PAGEEXEC;
59546+#endif
59547+
59548+#ifdef CONFIG_PAX_SEGMEXEC
59549+ if (!(elf_ex->e_ident[EI_PAX] & EF_PAX_SEGMEXEC))
59550+ pax_flags |= MF_PAX_SEGMEXEC;
59551+#endif
59552+
59553+#ifdef CONFIG_PAX_EMUTRAMP
59554+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && (elf_ex->e_ident[EI_PAX] & EF_PAX_EMUTRAMP))
59555+ pax_flags |= MF_PAX_EMUTRAMP;
59556+#endif
59557+
59558+#ifdef CONFIG_PAX_MPROTECT
59559+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) && !(elf_ex->e_ident[EI_PAX] & EF_PAX_MPROTECT))
59560+ pax_flags |= MF_PAX_MPROTECT;
59561+#endif
59562+
59563+#ifdef CONFIG_PAX_ASLR
59564+ if (randomize_va_space && !(elf_ex->e_ident[EI_PAX] & EF_PAX_RANDMMAP))
59565+ pax_flags |= MF_PAX_RANDMMAP;
59566+#endif
59567+
59568+#endif
59569+
59570+ return pax_flags;
59571+
59572+}
59573+
59574+static unsigned long pax_parse_pt_pax(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata)
59575+{
59576+
59577+#ifdef CONFIG_PAX_PT_PAX_FLAGS
59578+ unsigned long i;
59579+
59580+ for (i = 0UL; i < elf_ex->e_phnum; i++)
59581+ if (elf_phdata[i].p_type == PT_PAX_FLAGS) {
59582+ if (((elf_phdata[i].p_flags & PF_PAGEEXEC) && (elf_phdata[i].p_flags & PF_NOPAGEEXEC)) ||
59583+ ((elf_phdata[i].p_flags & PF_SEGMEXEC) && (elf_phdata[i].p_flags & PF_NOSEGMEXEC)) ||
59584+ ((elf_phdata[i].p_flags & PF_EMUTRAMP) && (elf_phdata[i].p_flags & PF_NOEMUTRAMP)) ||
59585+ ((elf_phdata[i].p_flags & PF_MPROTECT) && (elf_phdata[i].p_flags & PF_NOMPROTECT)) ||
59586+ ((elf_phdata[i].p_flags & PF_RANDMMAP) && (elf_phdata[i].p_flags & PF_NORANDMMAP)))
59587+ return PAX_PARSE_FLAGS_FALLBACK;
59588+
59589+#ifdef CONFIG_PAX_SOFTMODE
59590+ if (pax_softmode)
59591+ return pax_parse_pt_pax_softmode(&elf_phdata[i]);
59592+ else
59593+#endif
59594+
59595+ return pax_parse_pt_pax_hardmode(&elf_phdata[i]);
59596+ break;
59597+ }
59598+#endif
59599+
59600+ return PAX_PARSE_FLAGS_FALLBACK;
59601+}
59602+
59603+static unsigned long pax_parse_xattr_pax(struct file * const file)
59604+{
59605+
59606+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
59607+ ssize_t xattr_size, i;
59608+ unsigned char xattr_value[sizeof("pemrs") - 1];
59609+ unsigned long pax_flags_hardmode = 0UL, pax_flags_softmode = 0UL;
59610+
59611+ xattr_size = pax_getxattr(file->f_path.dentry, xattr_value, sizeof xattr_value);
59612+ if (xattr_size < 0 || xattr_size > sizeof xattr_value)
59613+ return PAX_PARSE_FLAGS_FALLBACK;
59614+
59615+ for (i = 0; i < xattr_size; i++)
59616+ switch (xattr_value[i]) {
59617+ default:
59618+ return PAX_PARSE_FLAGS_FALLBACK;
59619+
59620+#define parse_flag(option1, option2, flag) \
59621+ case option1: \
59622+ if (pax_flags_hardmode & MF_PAX_##flag) \
59623+ return PAX_PARSE_FLAGS_FALLBACK;\
59624+ pax_flags_hardmode |= MF_PAX_##flag; \
59625+ break; \
59626+ case option2: \
59627+ if (pax_flags_softmode & MF_PAX_##flag) \
59628+ return PAX_PARSE_FLAGS_FALLBACK;\
59629+ pax_flags_softmode |= MF_PAX_##flag; \
59630+ break;
59631+
59632+ parse_flag('p', 'P', PAGEEXEC);
59633+ parse_flag('e', 'E', EMUTRAMP);
59634+ parse_flag('m', 'M', MPROTECT);
59635+ parse_flag('r', 'R', RANDMMAP);
59636+ parse_flag('s', 'S', SEGMEXEC);
59637+
59638+#undef parse_flag
59639+ }
59640+
59641+ if (pax_flags_hardmode & pax_flags_softmode)
59642+ return PAX_PARSE_FLAGS_FALLBACK;
59643+
59644+#ifdef CONFIG_PAX_SOFTMODE
59645+ if (pax_softmode)
59646+ return pax_parse_xattr_pax_softmode(pax_flags_softmode);
59647+ else
59648+#endif
59649+
59650+ return pax_parse_xattr_pax_hardmode(pax_flags_hardmode);
59651+#else
59652+ return PAX_PARSE_FLAGS_FALLBACK;
59653+#endif
59654+
59655+}
59656+
59657+static long pax_parse_pax_flags(const struct elfhdr * const elf_ex, const struct elf_phdr * const elf_phdata, struct file * const file)
59658+{
59659+ unsigned long pax_flags, ei_pax_flags, pt_pax_flags, xattr_pax_flags;
59660+
59661+ pax_flags = pax_parse_defaults();
59662+ ei_pax_flags = pax_parse_ei_pax(elf_ex);
59663+ pt_pax_flags = pax_parse_pt_pax(elf_ex, elf_phdata);
59664+ xattr_pax_flags = pax_parse_xattr_pax(file);
59665+
59666+ if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
59667+ xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK &&
59668+ pt_pax_flags != xattr_pax_flags)
59669+ return -EINVAL;
59670+ if (xattr_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
59671+ pax_flags = xattr_pax_flags;
59672+ else if (pt_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
59673+ pax_flags = pt_pax_flags;
59674+ else if (ei_pax_flags != PAX_PARSE_FLAGS_FALLBACK)
59675+ pax_flags = ei_pax_flags;
59676+
59677+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_PAX_SEGMEXEC)
59678+ if ((pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) == (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
59679+ if ((__supported_pte_mask & _PAGE_NX))
59680+ pax_flags &= ~MF_PAX_SEGMEXEC;
59681+ else
59682+ pax_flags &= ~MF_PAX_PAGEEXEC;
59683+ }
59684+#endif
59685+
59686+ if (0 > pax_check_flags(&pax_flags))
59687+ return -EINVAL;
59688+
59689+ current->mm->pax_flags = pax_flags;
59690+ return 0;
59691+}
59692+#endif
59693+
59694 /*
59695 * These are the functions used to load ELF style executables and shared
59696 * libraries. There is no binary dependent code anywhere else.
59697@@ -647,6 +1009,11 @@ static unsigned long randomize_stack_top(unsigned long stack_top)
59698 {
59699 unsigned long random_variable = 0;
59700
59701+#ifdef CONFIG_PAX_RANDUSTACK
59702+ if (current->mm->pax_flags & MF_PAX_RANDMMAP)
59703+ return stack_top - current->mm->delta_stack;
59704+#endif
59705+
59706 if ((current->flags & PF_RANDOMIZE) &&
59707 !(current->personality & ADDR_NO_RANDOMIZE)) {
59708 random_variable = (unsigned long) get_random_int();
59709@@ -666,7 +1033,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
59710 unsigned long load_addr = 0, load_bias = 0;
59711 int load_addr_set = 0;
59712 char * elf_interpreter = NULL;
59713- unsigned long error;
59714+ unsigned long error = 0;
59715 struct elf_phdr *elf_ppnt, *elf_phdata, *interp_elf_phdata = NULL;
59716 unsigned long elf_bss, elf_brk;
59717 int retval, i;
59718@@ -681,6 +1048,7 @@ static int load_elf_binary(struct linux_binprm *bprm)
59719 struct elfhdr interp_elf_ex;
59720 } *loc;
59721 struct arch_elf_state arch_state = INIT_ARCH_ELF_STATE;
59722+ unsigned long pax_task_size;
59723
59724 loc = kmalloc(sizeof(*loc), GFP_KERNEL);
59725 if (!loc) {
59726@@ -839,6 +1207,77 @@ static int load_elf_binary(struct linux_binprm *bprm)
59727 /* Do this immediately, since STACK_TOP as used in setup_arg_pages
59728 may depend on the personality. */
59729 SET_PERSONALITY2(loc->elf_ex, &arch_state);
59730+
59731+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
59732+ current->mm->pax_flags = 0UL;
59733+#endif
59734+
59735+#ifdef CONFIG_PAX_DLRESOLVE
59736+ current->mm->call_dl_resolve = 0UL;
59737+#endif
59738+
59739+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
59740+ current->mm->call_syscall = 0UL;
59741+#endif
59742+
59743+#ifdef CONFIG_PAX_ASLR
59744+ current->mm->delta_mmap = 0UL;
59745+ current->mm->delta_stack = 0UL;
59746+#endif
59747+
59748+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
59749+ if (0 > pax_parse_pax_flags(&loc->elf_ex, elf_phdata, bprm->file)) {
59750+ send_sig(SIGKILL, current, 0);
59751+ goto out_free_dentry;
59752+ }
59753+#endif
59754+
59755+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
59756+ pax_set_initial_flags(bprm);
59757+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
59758+ if (pax_set_initial_flags_func)
59759+ (pax_set_initial_flags_func)(bprm);
59760+#endif
59761+
59762+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
59763+ if ((current->mm->pax_flags & MF_PAX_PAGEEXEC) && !(__supported_pte_mask & _PAGE_NX)) {
59764+ current->mm->context.user_cs_limit = PAGE_SIZE;
59765+ current->mm->def_flags |= VM_PAGEEXEC | VM_NOHUGEPAGE;
59766+ }
59767+#endif
59768+
59769+#ifdef CONFIG_PAX_SEGMEXEC
59770+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
59771+ current->mm->context.user_cs_base = SEGMEXEC_TASK_SIZE;
59772+ current->mm->context.user_cs_limit = TASK_SIZE-SEGMEXEC_TASK_SIZE;
59773+ pax_task_size = SEGMEXEC_TASK_SIZE;
59774+ current->mm->def_flags |= VM_NOHUGEPAGE;
59775+ } else
59776+#endif
59777+
59778+ pax_task_size = TASK_SIZE;
59779+
59780+#if defined(CONFIG_ARCH_TRACK_EXEC_LIMIT) || defined(CONFIG_PAX_SEGMEXEC)
59781+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
59782+ set_user_cs(current->mm->context.user_cs_base, current->mm->context.user_cs_limit, get_cpu());
59783+ put_cpu();
59784+ }
59785+#endif
59786+
59787+#ifdef CONFIG_PAX_ASLR
59788+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
59789+ current->mm->delta_mmap = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN)-1)) << PAGE_SHIFT;
59790+ current->mm->delta_stack = (pax_get_random_long() & ((1UL << PAX_DELTA_STACK_LEN)-1)) << PAGE_SHIFT;
59791+ }
59792+#endif
59793+
59794+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
59795+ if (current->mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
59796+ executable_stack = EXSTACK_DISABLE_X;
59797+ current->personality &= ~READ_IMPLIES_EXEC;
59798+ } else
59799+#endif
59800+
59801 if (elf_read_implies_exec(loc->elf_ex, executable_stack))
59802 current->personality |= READ_IMPLIES_EXEC;
59803
59804@@ -925,12 +1364,21 @@ static int load_elf_binary(struct linux_binprm *bprm)
59805 #else
59806 load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
59807 #endif
59808- total_size = total_mapping_size(elf_phdata,
59809- loc->elf_ex.e_phnum);
59810- if (!total_size) {
59811- error = -EINVAL;
59812- goto out_free_dentry;
59813+
59814+#ifdef CONFIG_PAX_RANDMMAP
59815+ /* PaX: randomize base address at the default exe base if requested */
59816+ if ((current->mm->pax_flags & MF_PAX_RANDMMAP) && elf_interpreter) {
59817+#ifdef CONFIG_SPARC64
59818+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << (PAGE_SHIFT+1);
59819+#else
59820+ load_bias = (pax_get_random_long() & ((1UL << PAX_DELTA_MMAP_LEN) - 1)) << PAGE_SHIFT;
59821+#endif
59822+ load_bias = ELF_PAGESTART(PAX_ELF_ET_DYN_BASE - vaddr + load_bias);
59823+ elf_flags |= MAP_FIXED;
59824 }
59825+#endif
59826+
59827+ total_size = total_mapping_size(elf_phdata, loc->elf_ex.e_phnum);
59828 }
59829
59830 error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
59831@@ -962,9 +1410,9 @@ static int load_elf_binary(struct linux_binprm *bprm)
59832 * allowed task size. Note that p_filesz must always be
59833 * <= p_memsz so it is only necessary to check p_memsz.
59834 */
59835- if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
59836- elf_ppnt->p_memsz > TASK_SIZE ||
59837- TASK_SIZE - elf_ppnt->p_memsz < k) {
59838+ if (k >= pax_task_size || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
59839+ elf_ppnt->p_memsz > pax_task_size ||
59840+ pax_task_size - elf_ppnt->p_memsz < k) {
59841 /* set_brk can never work. Avoid overflows. */
59842 retval = -EINVAL;
59843 goto out_free_dentry;
59844@@ -1000,16 +1448,43 @@ static int load_elf_binary(struct linux_binprm *bprm)
59845 if (retval)
59846 goto out_free_dentry;
59847 if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) {
59848- retval = -EFAULT; /* Nobody gets to see this, but.. */
59849- goto out_free_dentry;
59850+ /*
59851+ * This bss-zeroing can fail if the ELF
59852+ * file specifies odd protections. So
59853+ * we don't check the return value
59854+ */
59855 }
59856
59857+#ifdef CONFIG_PAX_RANDMMAP
59858+ if (current->mm->pax_flags & MF_PAX_RANDMMAP) {
59859+ unsigned long start, size, flags;
59860+ vm_flags_t vm_flags;
59861+
59862+ start = ELF_PAGEALIGN(elf_brk);
59863+ size = PAGE_SIZE + ((pax_get_random_long() & ((1UL << 22) - 1UL)) << 4);
59864+ flags = MAP_FIXED | MAP_PRIVATE;
59865+ vm_flags = VM_DONTEXPAND | VM_DONTDUMP;
59866+
59867+ down_write(&current->mm->mmap_sem);
59868+ start = get_unmapped_area(NULL, start, PAGE_ALIGN(size), 0, flags);
59869+ retval = -ENOMEM;
59870+ if (!IS_ERR_VALUE(start) && !find_vma_intersection(current->mm, start, start + size + PAGE_SIZE)) {
59871+// if (current->personality & ADDR_NO_RANDOMIZE)
59872+// vm_flags |= VM_READ | VM_MAYREAD;
59873+ start = mmap_region(NULL, start, PAGE_ALIGN(size), vm_flags, 0);
59874+ retval = IS_ERR_VALUE(start) ? start : 0;
59875+ }
59876+ up_write(&current->mm->mmap_sem);
59877+ if (retval == 0)
59878+ retval = set_brk(start + size, start + size + PAGE_SIZE);
59879+ if (retval < 0)
59880+ goto out_free_dentry;
59881+ }
59882+#endif
59883+
59884 if (elf_interpreter) {
59885- unsigned long interp_map_addr = 0;
59886-
59887 elf_entry = load_elf_interp(&loc->interp_elf_ex,
59888 interpreter,
59889- &interp_map_addr,
59890 load_bias, interp_elf_phdata);
59891 if (!IS_ERR((void *)elf_entry)) {
59892 /*
59893@@ -1237,7 +1712,7 @@ static bool always_dump_vma(struct vm_area_struct *vma)
59894 * Decide what to dump of a segment, part, all or none.
59895 */
59896 static unsigned long vma_dump_size(struct vm_area_struct *vma,
59897- unsigned long mm_flags)
59898+ unsigned long mm_flags, long signr)
59899 {
59900 #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type))
59901
59902@@ -1275,7 +1750,7 @@ static unsigned long vma_dump_size(struct vm_area_struct *vma,
59903 if (vma->vm_file == NULL)
59904 return 0;
59905
59906- if (FILTER(MAPPED_PRIVATE))
59907+ if (signr == SIGKILL || FILTER(MAPPED_PRIVATE))
59908 goto whole;
59909
59910 /*
59911@@ -1482,9 +1957,9 @@ static void fill_auxv_note(struct memelfnote *note, struct mm_struct *mm)
59912 {
59913 elf_addr_t *auxv = (elf_addr_t *) mm->saved_auxv;
59914 int i = 0;
59915- do
59916+ do {
59917 i += 2;
59918- while (auxv[i - 2] != AT_NULL);
59919+ } while (auxv[i - 2] != AT_NULL);
59920 fill_note(note, "CORE", NT_AUXV, i * sizeof(elf_addr_t), auxv);
59921 }
59922
59923@@ -1493,7 +1968,7 @@ static void fill_siginfo_note(struct memelfnote *note, user_siginfo_t *csigdata,
59924 {
59925 mm_segment_t old_fs = get_fs();
59926 set_fs(KERNEL_DS);
59927- copy_siginfo_to_user((user_siginfo_t __user *) csigdata, siginfo);
59928+ copy_siginfo_to_user((user_siginfo_t __force_user *) csigdata, siginfo);
59929 set_fs(old_fs);
59930 fill_note(note, "CORE", NT_SIGINFO, sizeof(*csigdata), csigdata);
59931 }
59932@@ -2213,7 +2688,7 @@ static int elf_core_dump(struct coredump_params *cprm)
59933 vma = next_vma(vma, gate_vma)) {
59934 unsigned long dump_size;
59935
59936- dump_size = vma_dump_size(vma, cprm->mm_flags);
59937+ dump_size = vma_dump_size(vma, cprm->mm_flags, cprm->siginfo->si_signo);
59938 vma_filesz[i++] = dump_size;
59939 vma_data_size += dump_size;
59940 }
59941@@ -2321,6 +2796,167 @@ out:
59942
59943 #endif /* CONFIG_ELF_CORE */
59944
59945+#ifdef CONFIG_PAX_MPROTECT
59946+/* PaX: non-PIC ELF libraries need relocations on their executable segments
59947+ * therefore we'll grant them VM_MAYWRITE once during their life. Similarly
59948+ * we'll remove VM_MAYWRITE for good on RELRO segments.
59949+ *
59950+ * The checks favour ld-linux.so behaviour which operates on a per ELF segment
59951+ * basis because we want to allow the common case and not the special ones.
59952+ */
59953+static void elf_handle_mprotect(struct vm_area_struct *vma, unsigned long newflags)
59954+{
59955+ struct elfhdr elf_h;
59956+ struct elf_phdr elf_p;
59957+ unsigned long i;
59958+ unsigned long oldflags;
59959+ bool is_textrel_rw, is_textrel_rx, is_relro;
59960+
59961+ if (!(vma->vm_mm->pax_flags & MF_PAX_MPROTECT) || !vma->vm_file)
59962+ return;
59963+
59964+ oldflags = vma->vm_flags & (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ);
59965+ newflags &= VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_EXEC | VM_WRITE | VM_READ;
59966+
59967+#ifdef CONFIG_PAX_ELFRELOCS
59968+ /* possible TEXTREL */
59969+ is_textrel_rw = !vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYREAD | VM_EXEC | VM_READ) && newflags == (VM_WRITE | VM_READ);
59970+ is_textrel_rx = vma->anon_vma && oldflags == (VM_MAYEXEC | VM_MAYWRITE | VM_MAYREAD | VM_WRITE | VM_READ) && newflags == (VM_EXEC | VM_READ);
59971+#else
59972+ is_textrel_rw = false;
59973+ is_textrel_rx = false;
59974+#endif
59975+
59976+ /* possible RELRO */
59977+ is_relro = vma->anon_vma && oldflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ) && newflags == (VM_MAYWRITE | VM_MAYREAD | VM_READ);
59978+
59979+ if (!is_textrel_rw && !is_textrel_rx && !is_relro)
59980+ return;
59981+
59982+ if (sizeof(elf_h) != kernel_read(vma->vm_file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
59983+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
59984+
59985+#ifdef CONFIG_PAX_ETEXECRELOCS
59986+ ((is_textrel_rw || is_textrel_rx) && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59987+#else
59988+ ((is_textrel_rw || is_textrel_rx) && elf_h.e_type != ET_DYN) ||
59989+#endif
59990+
59991+ (is_relro && (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC)) ||
59992+ !elf_check_arch(&elf_h) ||
59993+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
59994+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
59995+ return;
59996+
59997+ for (i = 0UL; i < elf_h.e_phnum; i++) {
59998+ if (sizeof(elf_p) != kernel_read(vma->vm_file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
59999+ return;
60000+ switch (elf_p.p_type) {
60001+ case PT_DYNAMIC:
60002+ if (!is_textrel_rw && !is_textrel_rx)
60003+ continue;
60004+ i = 0UL;
60005+ while ((i+1) * sizeof(elf_dyn) <= elf_p.p_filesz) {
60006+ elf_dyn dyn;
60007+
60008+ if (sizeof(dyn) != kernel_read(vma->vm_file, elf_p.p_offset + i*sizeof(dyn), (char *)&dyn, sizeof(dyn)))
60009+ break;
60010+ if (dyn.d_tag == DT_NULL)
60011+ break;
60012+ if (dyn.d_tag == DT_TEXTREL || (dyn.d_tag == DT_FLAGS && (dyn.d_un.d_val & DF_TEXTREL))) {
60013+ gr_log_textrel(vma);
60014+ if (is_textrel_rw)
60015+ vma->vm_flags |= VM_MAYWRITE;
60016+ else
60017+ /* PaX: disallow write access after relocs are done, hopefully noone else needs it... */
60018+ vma->vm_flags &= ~VM_MAYWRITE;
60019+ break;
60020+ }
60021+ i++;
60022+ }
60023+ is_textrel_rw = false;
60024+ is_textrel_rx = false;
60025+ continue;
60026+
60027+ case PT_GNU_RELRO:
60028+ if (!is_relro)
60029+ continue;
60030+ if ((elf_p.p_offset >> PAGE_SHIFT) == vma->vm_pgoff && ELF_PAGEALIGN(elf_p.p_memsz) == vma->vm_end - vma->vm_start)
60031+ vma->vm_flags &= ~VM_MAYWRITE;
60032+ is_relro = false;
60033+ continue;
60034+
60035+#ifdef CONFIG_PAX_PT_PAX_FLAGS
60036+ case PT_PAX_FLAGS: {
60037+ const char *msg_mprotect = "", *msg_emutramp = "";
60038+ char *buffer_lib, *buffer_exe;
60039+
60040+ if (elf_p.p_flags & PF_NOMPROTECT)
60041+ msg_mprotect = "MPROTECT disabled";
60042+
60043+#ifdef CONFIG_PAX_EMUTRAMP
60044+ if (!(vma->vm_mm->pax_flags & MF_PAX_EMUTRAMP) && !(elf_p.p_flags & PF_NOEMUTRAMP))
60045+ msg_emutramp = "EMUTRAMP enabled";
60046+#endif
60047+
60048+ if (!msg_mprotect[0] && !msg_emutramp[0])
60049+ continue;
60050+
60051+ if (!printk_ratelimit())
60052+ continue;
60053+
60054+ buffer_lib = (char *)__get_free_page(GFP_KERNEL);
60055+ buffer_exe = (char *)__get_free_page(GFP_KERNEL);
60056+ if (buffer_lib && buffer_exe) {
60057+ char *path_lib, *path_exe;
60058+
60059+ path_lib = pax_get_path(&vma->vm_file->f_path, buffer_lib, PAGE_SIZE);
60060+ path_exe = pax_get_path(&vma->vm_mm->exe_file->f_path, buffer_exe, PAGE_SIZE);
60061+
60062+ pr_info("PAX: %s wants %s%s%s on %s\n", path_lib, msg_mprotect,
60063+ (msg_mprotect[0] && msg_emutramp[0] ? " and " : ""), msg_emutramp, path_exe);
60064+
60065+ }
60066+ free_page((unsigned long)buffer_exe);
60067+ free_page((unsigned long)buffer_lib);
60068+ continue;
60069+ }
60070+#endif
60071+
60072+ }
60073+ }
60074+}
60075+#endif
60076+
60077+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
60078+
60079+extern int grsec_enable_log_rwxmaps;
60080+
60081+static void elf_handle_mmap(struct file *file)
60082+{
60083+ struct elfhdr elf_h;
60084+ struct elf_phdr elf_p;
60085+ unsigned long i;
60086+
60087+ if (!grsec_enable_log_rwxmaps)
60088+ return;
60089+
60090+ if (sizeof(elf_h) != kernel_read(file, 0UL, (char *)&elf_h, sizeof(elf_h)) ||
60091+ memcmp(elf_h.e_ident, ELFMAG, SELFMAG) ||
60092+ (elf_h.e_type != ET_DYN && elf_h.e_type != ET_EXEC) || !elf_check_arch(&elf_h) ||
60093+ elf_h.e_phentsize != sizeof(struct elf_phdr) ||
60094+ elf_h.e_phnum > 65536UL / sizeof(struct elf_phdr))
60095+ return;
60096+
60097+ for (i = 0UL; i < elf_h.e_phnum; i++) {
60098+ if (sizeof(elf_p) != kernel_read(file, elf_h.e_phoff + i*sizeof(elf_p), (char *)&elf_p, sizeof(elf_p)))
60099+ return;
60100+ if (elf_p.p_type == PT_GNU_STACK && (elf_p.p_flags & PF_X))
60101+ gr_log_ptgnustack(file);
60102+ }
60103+}
60104+#endif
60105+
60106 static int __init init_elf_binfmt(void)
60107 {
60108 register_binfmt(&elf_format);
60109diff --git a/fs/block_dev.c b/fs/block_dev.c
60110index 975266b..c3d1856 100644
60111--- a/fs/block_dev.c
60112+++ b/fs/block_dev.c
60113@@ -734,7 +734,7 @@ static bool bd_may_claim(struct block_device *bdev, struct block_device *whole,
60114 else if (bdev->bd_contains == bdev)
60115 return true; /* is a whole device which isn't held */
60116
60117- else if (whole->bd_holder == bd_may_claim)
60118+ else if (whole->bd_holder == (void *)bd_may_claim)
60119 return true; /* is a partition of a device that is being partitioned */
60120 else if (whole->bd_holder != NULL)
60121 return false; /* is a partition of a held device */
60122diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
60123index 6d67f32..8f33187 100644
60124--- a/fs/btrfs/ctree.c
60125+++ b/fs/btrfs/ctree.c
60126@@ -1181,9 +1181,12 @@ static noinline int __btrfs_cow_block(struct btrfs_trans_handle *trans,
60127 free_extent_buffer(buf);
60128 add_root_to_dirty_list(root);
60129 } else {
60130- if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID)
60131- parent_start = parent->start;
60132- else
60133+ if (root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) {
60134+ if (parent)
60135+ parent_start = parent->start;
60136+ else
60137+ parent_start = 0;
60138+ } else
60139 parent_start = 0;
60140
60141 WARN_ON(trans->transid != btrfs_header_generation(parent));
60142diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
60143index 82f0c7c..dff78a8 100644
60144--- a/fs/btrfs/delayed-inode.c
60145+++ b/fs/btrfs/delayed-inode.c
60146@@ -462,7 +462,7 @@ static int __btrfs_add_delayed_deletion_item(struct btrfs_delayed_node *node,
60147
60148 static void finish_one_item(struct btrfs_delayed_root *delayed_root)
60149 {
60150- int seq = atomic_inc_return(&delayed_root->items_seq);
60151+ int seq = atomic_inc_return_unchecked(&delayed_root->items_seq);
60152 if ((atomic_dec_return(&delayed_root->items) <
60153 BTRFS_DELAYED_BACKGROUND || seq % BTRFS_DELAYED_BATCH == 0) &&
60154 waitqueue_active(&delayed_root->wait))
60155@@ -1412,7 +1412,7 @@ void btrfs_assert_delayed_root_empty(struct btrfs_root *root)
60156
60157 static int could_end_wait(struct btrfs_delayed_root *delayed_root, int seq)
60158 {
60159- int val = atomic_read(&delayed_root->items_seq);
60160+ int val = atomic_read_unchecked(&delayed_root->items_seq);
60161
60162 if (val < seq || val >= seq + BTRFS_DELAYED_BATCH)
60163 return 1;
60164@@ -1436,7 +1436,7 @@ void btrfs_balance_delayed_items(struct btrfs_root *root)
60165 int seq;
60166 int ret;
60167
60168- seq = atomic_read(&delayed_root->items_seq);
60169+ seq = atomic_read_unchecked(&delayed_root->items_seq);
60170
60171 ret = btrfs_wq_run_delayed_node(delayed_root, root, 0);
60172 if (ret)
60173diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h
60174index f70119f..ab5894d 100644
60175--- a/fs/btrfs/delayed-inode.h
60176+++ b/fs/btrfs/delayed-inode.h
60177@@ -43,7 +43,7 @@ struct btrfs_delayed_root {
60178 */
60179 struct list_head prepare_list;
60180 atomic_t items; /* for delayed items */
60181- atomic_t items_seq; /* for delayed items */
60182+ atomic_unchecked_t items_seq; /* for delayed items */
60183 int nodes; /* for delayed nodes */
60184 wait_queue_head_t wait;
60185 };
60186@@ -90,7 +90,7 @@ static inline void btrfs_init_delayed_root(
60187 struct btrfs_delayed_root *delayed_root)
60188 {
60189 atomic_set(&delayed_root->items, 0);
60190- atomic_set(&delayed_root->items_seq, 0);
60191+ atomic_set_unchecked(&delayed_root->items_seq, 0);
60192 delayed_root->nodes = 0;
60193 spin_lock_init(&delayed_root->lock);
60194 init_waitqueue_head(&delayed_root->wait);
60195diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
60196index 05fef19..f3774b8 100644
60197--- a/fs/btrfs/super.c
60198+++ b/fs/btrfs/super.c
60199@@ -271,7 +271,7 @@ void __btrfs_abort_transaction(struct btrfs_trans_handle *trans,
60200 function, line, errstr);
60201 return;
60202 }
60203- ACCESS_ONCE(trans->transaction->aborted) = errno;
60204+ ACCESS_ONCE_RW(trans->transaction->aborted) = errno;
60205 /* Wake up anybody who may be waiting on this transaction */
60206 wake_up(&root->fs_info->transaction_wait);
60207 wake_up(&root->fs_info->transaction_blocked_wait);
60208diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
60209index 94edb0a..e94dc93 100644
60210--- a/fs/btrfs/sysfs.c
60211+++ b/fs/btrfs/sysfs.c
60212@@ -472,7 +472,7 @@ static int addrm_unknown_feature_attrs(struct btrfs_fs_info *fs_info, bool add)
60213 for (set = 0; set < FEAT_MAX; set++) {
60214 int i;
60215 struct attribute *attrs[2];
60216- struct attribute_group agroup = {
60217+ attribute_group_no_const agroup = {
60218 .name = "features",
60219 .attrs = attrs,
60220 };
60221diff --git a/fs/btrfs/tests/free-space-tests.c b/fs/btrfs/tests/free-space-tests.c
60222index 2299bfd..4098e72 100644
60223--- a/fs/btrfs/tests/free-space-tests.c
60224+++ b/fs/btrfs/tests/free-space-tests.c
60225@@ -463,7 +463,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
60226 * extent entry.
60227 */
60228 use_bitmap_op = cache->free_space_ctl->op->use_bitmap;
60229- cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
60230+ pax_open_kernel();
60231+ *(void **)&cache->free_space_ctl->op->use_bitmap = test_use_bitmap;
60232+ pax_close_kernel();
60233
60234 /*
60235 * Extent entry covering free space range [128Mb - 256Kb, 128Mb - 128Kb[
60236@@ -870,7 +872,9 @@ test_steal_space_from_bitmap_to_extent(struct btrfs_block_group_cache *cache)
60237 if (ret)
60238 return ret;
60239
60240- cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
60241+ pax_open_kernel();
60242+ *(void **)&cache->free_space_ctl->op->use_bitmap = use_bitmap_op;
60243+ pax_close_kernel();
60244 __btrfs_remove_free_space_cache(cache->free_space_ctl);
60245
60246 return 0;
60247diff --git a/fs/btrfs/tree-log.h b/fs/btrfs/tree-log.h
60248index 154990c..d0cf699 100644
60249--- a/fs/btrfs/tree-log.h
60250+++ b/fs/btrfs/tree-log.h
60251@@ -43,7 +43,7 @@ static inline void btrfs_init_log_ctx(struct btrfs_log_ctx *ctx)
60252 static inline void btrfs_set_log_full_commit(struct btrfs_fs_info *fs_info,
60253 struct btrfs_trans_handle *trans)
60254 {
60255- ACCESS_ONCE(fs_info->last_trans_log_full_commit) = trans->transid;
60256+ ACCESS_ONCE_RW(fs_info->last_trans_log_full_commit) = trans->transid;
60257 }
60258
60259 static inline int btrfs_need_log_full_commit(struct btrfs_fs_info *fs_info,
60260diff --git a/fs/buffer.c b/fs/buffer.c
60261index 20805db..2e8fc69 100644
60262--- a/fs/buffer.c
60263+++ b/fs/buffer.c
60264@@ -3417,7 +3417,7 @@ void __init buffer_init(void)
60265 bh_cachep = kmem_cache_create("buffer_head",
60266 sizeof(struct buffer_head), 0,
60267 (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
60268- SLAB_MEM_SPREAD),
60269+ SLAB_MEM_SPREAD|SLAB_NO_SANITIZE),
60270 NULL);
60271
60272 /*
60273diff --git a/fs/cachefiles/bind.c b/fs/cachefiles/bind.c
60274index fbb08e9..0fda764 100644
60275--- a/fs/cachefiles/bind.c
60276+++ b/fs/cachefiles/bind.c
60277@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args)
60278 args);
60279
60280 /* start by checking things over */
60281- ASSERT(cache->fstop_percent >= 0 &&
60282- cache->fstop_percent < cache->fcull_percent &&
60283+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
60284 cache->fcull_percent < cache->frun_percent &&
60285 cache->frun_percent < 100);
60286
60287- ASSERT(cache->bstop_percent >= 0 &&
60288- cache->bstop_percent < cache->bcull_percent &&
60289+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
60290 cache->bcull_percent < cache->brun_percent &&
60291 cache->brun_percent < 100);
60292
60293diff --git a/fs/cachefiles/daemon.c b/fs/cachefiles/daemon.c
60294index f601def..b2cf704 100644
60295--- a/fs/cachefiles/daemon.c
60296+++ b/fs/cachefiles/daemon.c
60297@@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(struct file *file, char __user *_buffer,
60298 if (n > buflen)
60299 return -EMSGSIZE;
60300
60301- if (copy_to_user(_buffer, buffer, n) != 0)
60302+ if (n > sizeof(buffer) || copy_to_user(_buffer, buffer, n) != 0)
60303 return -EFAULT;
60304
60305 return n;
60306@@ -222,7 +222,7 @@ static ssize_t cachefiles_daemon_write(struct file *file,
60307 if (test_bit(CACHEFILES_DEAD, &cache->flags))
60308 return -EIO;
60309
60310- if (datalen < 0 || datalen > PAGE_SIZE - 1)
60311+ if (datalen > PAGE_SIZE - 1)
60312 return -EOPNOTSUPP;
60313
60314 /* drag the command string into the kernel so we can parse it */
60315@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struct cachefiles_cache *cache, char *args)
60316 if (args[0] != '%' || args[1] != '\0')
60317 return -EINVAL;
60318
60319- if (fstop < 0 || fstop >= cache->fcull_percent)
60320+ if (fstop >= cache->fcull_percent)
60321 return cachefiles_daemon_range_error(cache, args);
60322
60323 cache->fstop_percent = fstop;
60324@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struct cachefiles_cache *cache, char *args)
60325 if (args[0] != '%' || args[1] != '\0')
60326 return -EINVAL;
60327
60328- if (bstop < 0 || bstop >= cache->bcull_percent)
60329+ if (bstop >= cache->bcull_percent)
60330 return cachefiles_daemon_range_error(cache, args);
60331
60332 cache->bstop_percent = bstop;
60333diff --git a/fs/cachefiles/internal.h b/fs/cachefiles/internal.h
60334index 8c52472..c4e3a69 100644
60335--- a/fs/cachefiles/internal.h
60336+++ b/fs/cachefiles/internal.h
60337@@ -66,7 +66,7 @@ struct cachefiles_cache {
60338 wait_queue_head_t daemon_pollwq; /* poll waitqueue for daemon */
60339 struct rb_root active_nodes; /* active nodes (can't be culled) */
60340 rwlock_t active_lock; /* lock for active_nodes */
60341- atomic_t gravecounter; /* graveyard uniquifier */
60342+ atomic_unchecked_t gravecounter; /* graveyard uniquifier */
60343 unsigned frun_percent; /* when to stop culling (% files) */
60344 unsigned fcull_percent; /* when to start culling (% files) */
60345 unsigned fstop_percent; /* when to stop allocating (% files) */
60346@@ -178,19 +178,19 @@ extern int cachefiles_check_in_use(struct cachefiles_cache *cache,
60347 * proc.c
60348 */
60349 #ifdef CONFIG_CACHEFILES_HISTOGRAM
60350-extern atomic_t cachefiles_lookup_histogram[HZ];
60351-extern atomic_t cachefiles_mkdir_histogram[HZ];
60352-extern atomic_t cachefiles_create_histogram[HZ];
60353+extern atomic_unchecked_t cachefiles_lookup_histogram[HZ];
60354+extern atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
60355+extern atomic_unchecked_t cachefiles_create_histogram[HZ];
60356
60357 extern int __init cachefiles_proc_init(void);
60358 extern void cachefiles_proc_cleanup(void);
60359 static inline
60360-void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)
60361+void cachefiles_hist(atomic_unchecked_t histogram[], unsigned long start_jif)
60362 {
60363 unsigned long jif = jiffies - start_jif;
60364 if (jif >= HZ)
60365 jif = HZ - 1;
60366- atomic_inc(&histogram[jif]);
60367+ atomic_inc_unchecked(&histogram[jif]);
60368 }
60369
60370 #else
60371diff --git a/fs/cachefiles/namei.c b/fs/cachefiles/namei.c
60372index 1e51714..411eded 100644
60373--- a/fs/cachefiles/namei.c
60374+++ b/fs/cachefiles/namei.c
60375@@ -309,7 +309,7 @@ try_again:
60376 /* first step is to make up a grave dentry in the graveyard */
60377 sprintf(nbuffer, "%08x%08x",
60378 (uint32_t) get_seconds(),
60379- (uint32_t) atomic_inc_return(&cache->gravecounter));
60380+ (uint32_t) atomic_inc_return_unchecked(&cache->gravecounter));
60381
60382 /* do the multiway lock magic */
60383 trap = lock_rename(cache->graveyard, dir);
60384diff --git a/fs/cachefiles/proc.c b/fs/cachefiles/proc.c
60385index eccd339..4c1d995 100644
60386--- a/fs/cachefiles/proc.c
60387+++ b/fs/cachefiles/proc.c
60388@@ -14,9 +14,9 @@
60389 #include <linux/seq_file.h>
60390 #include "internal.h"
60391
60392-atomic_t cachefiles_lookup_histogram[HZ];
60393-atomic_t cachefiles_mkdir_histogram[HZ];
60394-atomic_t cachefiles_create_histogram[HZ];
60395+atomic_unchecked_t cachefiles_lookup_histogram[HZ];
60396+atomic_unchecked_t cachefiles_mkdir_histogram[HZ];
60397+atomic_unchecked_t cachefiles_create_histogram[HZ];
60398
60399 /*
60400 * display the latency histogram
60401@@ -35,9 +35,9 @@ static int cachefiles_histogram_show(struct seq_file *m, void *v)
60402 return 0;
60403 default:
60404 index = (unsigned long) v - 3;
60405- x = atomic_read(&cachefiles_lookup_histogram[index]);
60406- y = atomic_read(&cachefiles_mkdir_histogram[index]);
60407- z = atomic_read(&cachefiles_create_histogram[index]);
60408+ x = atomic_read_unchecked(&cachefiles_lookup_histogram[index]);
60409+ y = atomic_read_unchecked(&cachefiles_mkdir_histogram[index]);
60410+ z = atomic_read_unchecked(&cachefiles_create_histogram[index]);
60411 if (x == 0 && y == 0 && z == 0)
60412 return 0;
60413
60414diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
60415index 83e9976..bfd1eee 100644
60416--- a/fs/ceph/dir.c
60417+++ b/fs/ceph/dir.c
60418@@ -127,6 +127,8 @@ static int __dcache_readdir(struct file *file, struct dir_context *ctx,
60419 struct dentry *dentry, *last;
60420 struct ceph_dentry_info *di;
60421 int err = 0;
60422+ char d_name[DNAME_INLINE_LEN];
60423+ const unsigned char *name;
60424
60425 /* claim ref on last dentry we returned */
60426 last = fi->dentry;
60427@@ -190,7 +192,12 @@ more:
60428
60429 dout(" %llu (%llu) dentry %p %pd %p\n", di->offset, ctx->pos,
60430 dentry, dentry, dentry->d_inode);
60431- if (!dir_emit(ctx, dentry->d_name.name,
60432+ name = dentry->d_name.name;
60433+ if (name == dentry->d_iname) {
60434+ memcpy(d_name, name, dentry->d_name.len);
60435+ name = d_name;
60436+ }
60437+ if (!dir_emit(ctx, name,
60438 dentry->d_name.len,
60439 ceph_translate_ino(dentry->d_sb, dentry->d_inode->i_ino),
60440 dentry->d_inode->i_mode >> 12)) {
60441@@ -248,7 +255,7 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)
60442 struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
60443 struct ceph_mds_client *mdsc = fsc->mdsc;
60444 unsigned frag = fpos_frag(ctx->pos);
60445- int off = fpos_off(ctx->pos);
60446+ unsigned int off = fpos_off(ctx->pos);
60447 int err;
60448 u32 ftype;
60449 struct ceph_mds_reply_info_parsed *rinfo;
60450diff --git a/fs/ceph/super.c b/fs/ceph/super.c
60451index a63997b..ddc0577 100644
60452--- a/fs/ceph/super.c
60453+++ b/fs/ceph/super.c
60454@@ -889,7 +889,7 @@ static int ceph_compare_super(struct super_block *sb, void *data)
60455 /*
60456 * construct our own bdi so we can control readahead, etc.
60457 */
60458-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
60459+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
60460
60461 static int ceph_register_bdi(struct super_block *sb,
60462 struct ceph_fs_client *fsc)
60463@@ -906,7 +906,7 @@ static int ceph_register_bdi(struct super_block *sb,
60464 VM_MAX_READAHEAD * 1024 / PAGE_CACHE_SIZE;
60465
60466 err = bdi_register(&fsc->backing_dev_info, NULL, "ceph-%ld",
60467- atomic_long_inc_return(&bdi_seq));
60468+ atomic_long_inc_return_unchecked(&bdi_seq));
60469 if (!err)
60470 sb->s_bdi = &fsc->backing_dev_info;
60471 return err;
60472diff --git a/fs/cifs/cifs_debug.c b/fs/cifs/cifs_debug.c
60473index 7febcf2..62a5721 100644
60474--- a/fs/cifs/cifs_debug.c
60475+++ b/fs/cifs/cifs_debug.c
60476@@ -269,8 +269,8 @@ static ssize_t cifs_stats_proc_write(struct file *file,
60477
60478 if (strtobool(&c, &bv) == 0) {
60479 #ifdef CONFIG_CIFS_STATS2
60480- atomic_set(&totBufAllocCount, 0);
60481- atomic_set(&totSmBufAllocCount, 0);
60482+ atomic_set_unchecked(&totBufAllocCount, 0);
60483+ atomic_set_unchecked(&totSmBufAllocCount, 0);
60484 #endif /* CONFIG_CIFS_STATS2 */
60485 spin_lock(&cifs_tcp_ses_lock);
60486 list_for_each(tmp1, &cifs_tcp_ses_list) {
60487@@ -283,7 +283,7 @@ static ssize_t cifs_stats_proc_write(struct file *file,
60488 tcon = list_entry(tmp3,
60489 struct cifs_tcon,
60490 tcon_list);
60491- atomic_set(&tcon->num_smbs_sent, 0);
60492+ atomic_set_unchecked(&tcon->num_smbs_sent, 0);
60493 if (server->ops->clear_stats)
60494 server->ops->clear_stats(tcon);
60495 }
60496@@ -315,8 +315,8 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
60497 smBufAllocCount.counter, cifs_min_small);
60498 #ifdef CONFIG_CIFS_STATS2
60499 seq_printf(m, "Total Large %d Small %d Allocations\n",
60500- atomic_read(&totBufAllocCount),
60501- atomic_read(&totSmBufAllocCount));
60502+ atomic_read_unchecked(&totBufAllocCount),
60503+ atomic_read_unchecked(&totSmBufAllocCount));
60504 #endif /* CONFIG_CIFS_STATS2 */
60505
60506 seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
60507@@ -345,7 +345,7 @@ static int cifs_stats_proc_show(struct seq_file *m, void *v)
60508 if (tcon->need_reconnect)
60509 seq_puts(m, "\tDISCONNECTED ");
60510 seq_printf(m, "\nSMBs: %d",
60511- atomic_read(&tcon->num_smbs_sent));
60512+ atomic_read_unchecked(&tcon->num_smbs_sent));
60513 if (server->ops->print_stats)
60514 server->ops->print_stats(m, tcon);
60515 }
60516diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
60517index d72fe37..ded5511 100644
60518--- a/fs/cifs/cifsfs.c
60519+++ b/fs/cifs/cifsfs.c
60520@@ -1092,7 +1092,7 @@ cifs_init_request_bufs(void)
60521 */
60522 cifs_req_cachep = kmem_cache_create("cifs_request",
60523 CIFSMaxBufSize + max_hdr_size, 0,
60524- SLAB_HWCACHE_ALIGN, NULL);
60525+ SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
60526 if (cifs_req_cachep == NULL)
60527 return -ENOMEM;
60528
60529@@ -1119,7 +1119,7 @@ cifs_init_request_bufs(void)
60530 efficient to alloc 1 per page off the slab compared to 17K (5page)
60531 alloc of large cifs buffers even when page debugging is on */
60532 cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
60533- MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
60534+ MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
60535 NULL);
60536 if (cifs_sm_req_cachep == NULL) {
60537 mempool_destroy(cifs_req_poolp);
60538@@ -1204,8 +1204,8 @@ init_cifs(void)
60539 atomic_set(&bufAllocCount, 0);
60540 atomic_set(&smBufAllocCount, 0);
60541 #ifdef CONFIG_CIFS_STATS2
60542- atomic_set(&totBufAllocCount, 0);
60543- atomic_set(&totSmBufAllocCount, 0);
60544+ atomic_set_unchecked(&totBufAllocCount, 0);
60545+ atomic_set_unchecked(&totSmBufAllocCount, 0);
60546 #endif /* CONFIG_CIFS_STATS2 */
60547
60548 atomic_set(&midCount, 0);
60549diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h
60550index 22b289a..bbbba08 100644
60551--- a/fs/cifs/cifsglob.h
60552+++ b/fs/cifs/cifsglob.h
60553@@ -823,35 +823,35 @@ struct cifs_tcon {
60554 __u16 Flags; /* optional support bits */
60555 enum statusEnum tidStatus;
60556 #ifdef CONFIG_CIFS_STATS
60557- atomic_t num_smbs_sent;
60558+ atomic_unchecked_t num_smbs_sent;
60559 union {
60560 struct {
60561- atomic_t num_writes;
60562- atomic_t num_reads;
60563- atomic_t num_flushes;
60564- atomic_t num_oplock_brks;
60565- atomic_t num_opens;
60566- atomic_t num_closes;
60567- atomic_t num_deletes;
60568- atomic_t num_mkdirs;
60569- atomic_t num_posixopens;
60570- atomic_t num_posixmkdirs;
60571- atomic_t num_rmdirs;
60572- atomic_t num_renames;
60573- atomic_t num_t2renames;
60574- atomic_t num_ffirst;
60575- atomic_t num_fnext;
60576- atomic_t num_fclose;
60577- atomic_t num_hardlinks;
60578- atomic_t num_symlinks;
60579- atomic_t num_locks;
60580- atomic_t num_acl_get;
60581- atomic_t num_acl_set;
60582+ atomic_unchecked_t num_writes;
60583+ atomic_unchecked_t num_reads;
60584+ atomic_unchecked_t num_flushes;
60585+ atomic_unchecked_t num_oplock_brks;
60586+ atomic_unchecked_t num_opens;
60587+ atomic_unchecked_t num_closes;
60588+ atomic_unchecked_t num_deletes;
60589+ atomic_unchecked_t num_mkdirs;
60590+ atomic_unchecked_t num_posixopens;
60591+ atomic_unchecked_t num_posixmkdirs;
60592+ atomic_unchecked_t num_rmdirs;
60593+ atomic_unchecked_t num_renames;
60594+ atomic_unchecked_t num_t2renames;
60595+ atomic_unchecked_t num_ffirst;
60596+ atomic_unchecked_t num_fnext;
60597+ atomic_unchecked_t num_fclose;
60598+ atomic_unchecked_t num_hardlinks;
60599+ atomic_unchecked_t num_symlinks;
60600+ atomic_unchecked_t num_locks;
60601+ atomic_unchecked_t num_acl_get;
60602+ atomic_unchecked_t num_acl_set;
60603 } cifs_stats;
60604 #ifdef CONFIG_CIFS_SMB2
60605 struct {
60606- atomic_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
60607- atomic_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
60608+ atomic_unchecked_t smb2_com_sent[NUMBER_OF_SMB2_COMMANDS];
60609+ atomic_unchecked_t smb2_com_failed[NUMBER_OF_SMB2_COMMANDS];
60610 } smb2_stats;
60611 #endif /* CONFIG_CIFS_SMB2 */
60612 } stats;
60613@@ -1198,7 +1198,7 @@ convert_delimiter(char *path, char delim)
60614 }
60615
60616 #ifdef CONFIG_CIFS_STATS
60617-#define cifs_stats_inc atomic_inc
60618+#define cifs_stats_inc atomic_inc_unchecked
60619
60620 static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
60621 unsigned int bytes)
60622@@ -1565,8 +1565,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnectCount;
60623 /* Various Debug counters */
60624 GLOBAL_EXTERN atomic_t bufAllocCount; /* current number allocated */
60625 #ifdef CONFIG_CIFS_STATS2
60626-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
60627-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
60628+GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
60629+GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
60630 #endif
60631 GLOBAL_EXTERN atomic_t smBufAllocCount;
60632 GLOBAL_EXTERN atomic_t midCount;
60633diff --git a/fs/cifs/file.c b/fs/cifs/file.c
60634index ca30c39..570fb94 100644
60635--- a/fs/cifs/file.c
60636+++ b/fs/cifs/file.c
60637@@ -2055,10 +2055,14 @@ static int cifs_writepages(struct address_space *mapping,
60638 index = mapping->writeback_index; /* Start from prev offset */
60639 end = -1;
60640 } else {
60641- index = wbc->range_start >> PAGE_CACHE_SHIFT;
60642- end = wbc->range_end >> PAGE_CACHE_SHIFT;
60643- if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX)
60644+ if (wbc->range_start == 0 && wbc->range_end == LLONG_MAX) {
60645 range_whole = true;
60646+ index = 0;
60647+ end = ULONG_MAX;
60648+ } else {
60649+ index = wbc->range_start >> PAGE_CACHE_SHIFT;
60650+ end = wbc->range_end >> PAGE_CACHE_SHIFT;
60651+ }
60652 scanned = true;
60653 }
60654 server = cifs_sb_master_tcon(cifs_sb)->ses->server;
60655diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c
60656index 3379463..3af418a 100644
60657--- a/fs/cifs/misc.c
60658+++ b/fs/cifs/misc.c
60659@@ -170,7 +170,7 @@ cifs_buf_get(void)
60660 memset(ret_buf, 0, buf_size + 3);
60661 atomic_inc(&bufAllocCount);
60662 #ifdef CONFIG_CIFS_STATS2
60663- atomic_inc(&totBufAllocCount);
60664+ atomic_inc_unchecked(&totBufAllocCount);
60665 #endif /* CONFIG_CIFS_STATS2 */
60666 }
60667
60668@@ -205,7 +205,7 @@ cifs_small_buf_get(void)
60669 /* memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
60670 atomic_inc(&smBufAllocCount);
60671 #ifdef CONFIG_CIFS_STATS2
60672- atomic_inc(&totSmBufAllocCount);
60673+ atomic_inc_unchecked(&totSmBufAllocCount);
60674 #endif /* CONFIG_CIFS_STATS2 */
60675
60676 }
60677diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c
60678index d297903..1cb7516 100644
60679--- a/fs/cifs/smb1ops.c
60680+++ b/fs/cifs/smb1ops.c
60681@@ -622,27 +622,27 @@ static void
60682 cifs_clear_stats(struct cifs_tcon *tcon)
60683 {
60684 #ifdef CONFIG_CIFS_STATS
60685- atomic_set(&tcon->stats.cifs_stats.num_writes, 0);
60686- atomic_set(&tcon->stats.cifs_stats.num_reads, 0);
60687- atomic_set(&tcon->stats.cifs_stats.num_flushes, 0);
60688- atomic_set(&tcon->stats.cifs_stats.num_oplock_brks, 0);
60689- atomic_set(&tcon->stats.cifs_stats.num_opens, 0);
60690- atomic_set(&tcon->stats.cifs_stats.num_posixopens, 0);
60691- atomic_set(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
60692- atomic_set(&tcon->stats.cifs_stats.num_closes, 0);
60693- atomic_set(&tcon->stats.cifs_stats.num_deletes, 0);
60694- atomic_set(&tcon->stats.cifs_stats.num_mkdirs, 0);
60695- atomic_set(&tcon->stats.cifs_stats.num_rmdirs, 0);
60696- atomic_set(&tcon->stats.cifs_stats.num_renames, 0);
60697- atomic_set(&tcon->stats.cifs_stats.num_t2renames, 0);
60698- atomic_set(&tcon->stats.cifs_stats.num_ffirst, 0);
60699- atomic_set(&tcon->stats.cifs_stats.num_fnext, 0);
60700- atomic_set(&tcon->stats.cifs_stats.num_fclose, 0);
60701- atomic_set(&tcon->stats.cifs_stats.num_hardlinks, 0);
60702- atomic_set(&tcon->stats.cifs_stats.num_symlinks, 0);
60703- atomic_set(&tcon->stats.cifs_stats.num_locks, 0);
60704- atomic_set(&tcon->stats.cifs_stats.num_acl_get, 0);
60705- atomic_set(&tcon->stats.cifs_stats.num_acl_set, 0);
60706+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_writes, 0);
60707+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_reads, 0);
60708+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_flushes, 0);
60709+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_oplock_brks, 0);
60710+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_opens, 0);
60711+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixopens, 0);
60712+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs, 0);
60713+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_closes, 0);
60714+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_deletes, 0);
60715+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_mkdirs, 0);
60716+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_rmdirs, 0);
60717+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_renames, 0);
60718+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_t2renames, 0);
60719+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_ffirst, 0);
60720+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fnext, 0);
60721+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_fclose, 0);
60722+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_hardlinks, 0);
60723+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_symlinks, 0);
60724+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_locks, 0);
60725+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_get, 0);
60726+ atomic_set_unchecked(&tcon->stats.cifs_stats.num_acl_set, 0);
60727 #endif
60728 }
60729
60730@@ -651,36 +651,36 @@ cifs_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
60731 {
60732 #ifdef CONFIG_CIFS_STATS
60733 seq_printf(m, " Oplocks breaks: %d",
60734- atomic_read(&tcon->stats.cifs_stats.num_oplock_brks));
60735+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_oplock_brks));
60736 seq_printf(m, "\nReads: %d Bytes: %llu",
60737- atomic_read(&tcon->stats.cifs_stats.num_reads),
60738+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_reads),
60739 (long long)(tcon->bytes_read));
60740 seq_printf(m, "\nWrites: %d Bytes: %llu",
60741- atomic_read(&tcon->stats.cifs_stats.num_writes),
60742+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_writes),
60743 (long long)(tcon->bytes_written));
60744 seq_printf(m, "\nFlushes: %d",
60745- atomic_read(&tcon->stats.cifs_stats.num_flushes));
60746+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_flushes));
60747 seq_printf(m, "\nLocks: %d HardLinks: %d Symlinks: %d",
60748- atomic_read(&tcon->stats.cifs_stats.num_locks),
60749- atomic_read(&tcon->stats.cifs_stats.num_hardlinks),
60750- atomic_read(&tcon->stats.cifs_stats.num_symlinks));
60751+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_locks),
60752+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_hardlinks),
60753+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_symlinks));
60754 seq_printf(m, "\nOpens: %d Closes: %d Deletes: %d",
60755- atomic_read(&tcon->stats.cifs_stats.num_opens),
60756- atomic_read(&tcon->stats.cifs_stats.num_closes),
60757- atomic_read(&tcon->stats.cifs_stats.num_deletes));
60758+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_opens),
60759+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_closes),
60760+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_deletes));
60761 seq_printf(m, "\nPosix Opens: %d Posix Mkdirs: %d",
60762- atomic_read(&tcon->stats.cifs_stats.num_posixopens),
60763- atomic_read(&tcon->stats.cifs_stats.num_posixmkdirs));
60764+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixopens),
60765+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_posixmkdirs));
60766 seq_printf(m, "\nMkdirs: %d Rmdirs: %d",
60767- atomic_read(&tcon->stats.cifs_stats.num_mkdirs),
60768- atomic_read(&tcon->stats.cifs_stats.num_rmdirs));
60769+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_mkdirs),
60770+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_rmdirs));
60771 seq_printf(m, "\nRenames: %d T2 Renames %d",
60772- atomic_read(&tcon->stats.cifs_stats.num_renames),
60773- atomic_read(&tcon->stats.cifs_stats.num_t2renames));
60774+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_renames),
60775+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_t2renames));
60776 seq_printf(m, "\nFindFirst: %d FNext %d FClose %d",
60777- atomic_read(&tcon->stats.cifs_stats.num_ffirst),
60778- atomic_read(&tcon->stats.cifs_stats.num_fnext),
60779- atomic_read(&tcon->stats.cifs_stats.num_fclose));
60780+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_ffirst),
60781+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fnext),
60782+ atomic_read_unchecked(&tcon->stats.cifs_stats.num_fclose));
60783 #endif
60784 }
60785
60786diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
60787index eab05e1..ffe5ea4 100644
60788--- a/fs/cifs/smb2ops.c
60789+++ b/fs/cifs/smb2ops.c
60790@@ -418,8 +418,8 @@ smb2_clear_stats(struct cifs_tcon *tcon)
60791 #ifdef CONFIG_CIFS_STATS
60792 int i;
60793 for (i = 0; i < NUMBER_OF_SMB2_COMMANDS; i++) {
60794- atomic_set(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
60795- atomic_set(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
60796+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_sent[i], 0);
60797+ atomic_set_unchecked(&tcon->stats.smb2_stats.smb2_com_failed[i], 0);
60798 }
60799 #endif
60800 }
60801@@ -459,65 +459,65 @@ static void
60802 smb2_print_stats(struct seq_file *m, struct cifs_tcon *tcon)
60803 {
60804 #ifdef CONFIG_CIFS_STATS
60805- atomic_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
60806- atomic_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
60807+ atomic_unchecked_t *sent = tcon->stats.smb2_stats.smb2_com_sent;
60808+ atomic_unchecked_t *failed = tcon->stats.smb2_stats.smb2_com_failed;
60809 seq_printf(m, "\nNegotiates: %d sent %d failed",
60810- atomic_read(&sent[SMB2_NEGOTIATE_HE]),
60811- atomic_read(&failed[SMB2_NEGOTIATE_HE]));
60812+ atomic_read_unchecked(&sent[SMB2_NEGOTIATE_HE]),
60813+ atomic_read_unchecked(&failed[SMB2_NEGOTIATE_HE]));
60814 seq_printf(m, "\nSessionSetups: %d sent %d failed",
60815- atomic_read(&sent[SMB2_SESSION_SETUP_HE]),
60816- atomic_read(&failed[SMB2_SESSION_SETUP_HE]));
60817+ atomic_read_unchecked(&sent[SMB2_SESSION_SETUP_HE]),
60818+ atomic_read_unchecked(&failed[SMB2_SESSION_SETUP_HE]));
60819 seq_printf(m, "\nLogoffs: %d sent %d failed",
60820- atomic_read(&sent[SMB2_LOGOFF_HE]),
60821- atomic_read(&failed[SMB2_LOGOFF_HE]));
60822+ atomic_read_unchecked(&sent[SMB2_LOGOFF_HE]),
60823+ atomic_read_unchecked(&failed[SMB2_LOGOFF_HE]));
60824 seq_printf(m, "\nTreeConnects: %d sent %d failed",
60825- atomic_read(&sent[SMB2_TREE_CONNECT_HE]),
60826- atomic_read(&failed[SMB2_TREE_CONNECT_HE]));
60827+ atomic_read_unchecked(&sent[SMB2_TREE_CONNECT_HE]),
60828+ atomic_read_unchecked(&failed[SMB2_TREE_CONNECT_HE]));
60829 seq_printf(m, "\nTreeDisconnects: %d sent %d failed",
60830- atomic_read(&sent[SMB2_TREE_DISCONNECT_HE]),
60831- atomic_read(&failed[SMB2_TREE_DISCONNECT_HE]));
60832+ atomic_read_unchecked(&sent[SMB2_TREE_DISCONNECT_HE]),
60833+ atomic_read_unchecked(&failed[SMB2_TREE_DISCONNECT_HE]));
60834 seq_printf(m, "\nCreates: %d sent %d failed",
60835- atomic_read(&sent[SMB2_CREATE_HE]),
60836- atomic_read(&failed[SMB2_CREATE_HE]));
60837+ atomic_read_unchecked(&sent[SMB2_CREATE_HE]),
60838+ atomic_read_unchecked(&failed[SMB2_CREATE_HE]));
60839 seq_printf(m, "\nCloses: %d sent %d failed",
60840- atomic_read(&sent[SMB2_CLOSE_HE]),
60841- atomic_read(&failed[SMB2_CLOSE_HE]));
60842+ atomic_read_unchecked(&sent[SMB2_CLOSE_HE]),
60843+ atomic_read_unchecked(&failed[SMB2_CLOSE_HE]));
60844 seq_printf(m, "\nFlushes: %d sent %d failed",
60845- atomic_read(&sent[SMB2_FLUSH_HE]),
60846- atomic_read(&failed[SMB2_FLUSH_HE]));
60847+ atomic_read_unchecked(&sent[SMB2_FLUSH_HE]),
60848+ atomic_read_unchecked(&failed[SMB2_FLUSH_HE]));
60849 seq_printf(m, "\nReads: %d sent %d failed",
60850- atomic_read(&sent[SMB2_READ_HE]),
60851- atomic_read(&failed[SMB2_READ_HE]));
60852+ atomic_read_unchecked(&sent[SMB2_READ_HE]),
60853+ atomic_read_unchecked(&failed[SMB2_READ_HE]));
60854 seq_printf(m, "\nWrites: %d sent %d failed",
60855- atomic_read(&sent[SMB2_WRITE_HE]),
60856- atomic_read(&failed[SMB2_WRITE_HE]));
60857+ atomic_read_unchecked(&sent[SMB2_WRITE_HE]),
60858+ atomic_read_unchecked(&failed[SMB2_WRITE_HE]));
60859 seq_printf(m, "\nLocks: %d sent %d failed",
60860- atomic_read(&sent[SMB2_LOCK_HE]),
60861- atomic_read(&failed[SMB2_LOCK_HE]));
60862+ atomic_read_unchecked(&sent[SMB2_LOCK_HE]),
60863+ atomic_read_unchecked(&failed[SMB2_LOCK_HE]));
60864 seq_printf(m, "\nIOCTLs: %d sent %d failed",
60865- atomic_read(&sent[SMB2_IOCTL_HE]),
60866- atomic_read(&failed[SMB2_IOCTL_HE]));
60867+ atomic_read_unchecked(&sent[SMB2_IOCTL_HE]),
60868+ atomic_read_unchecked(&failed[SMB2_IOCTL_HE]));
60869 seq_printf(m, "\nCancels: %d sent %d failed",
60870- atomic_read(&sent[SMB2_CANCEL_HE]),
60871- atomic_read(&failed[SMB2_CANCEL_HE]));
60872+ atomic_read_unchecked(&sent[SMB2_CANCEL_HE]),
60873+ atomic_read_unchecked(&failed[SMB2_CANCEL_HE]));
60874 seq_printf(m, "\nEchos: %d sent %d failed",
60875- atomic_read(&sent[SMB2_ECHO_HE]),
60876- atomic_read(&failed[SMB2_ECHO_HE]));
60877+ atomic_read_unchecked(&sent[SMB2_ECHO_HE]),
60878+ atomic_read_unchecked(&failed[SMB2_ECHO_HE]));
60879 seq_printf(m, "\nQueryDirectories: %d sent %d failed",
60880- atomic_read(&sent[SMB2_QUERY_DIRECTORY_HE]),
60881- atomic_read(&failed[SMB2_QUERY_DIRECTORY_HE]));
60882+ atomic_read_unchecked(&sent[SMB2_QUERY_DIRECTORY_HE]),
60883+ atomic_read_unchecked(&failed[SMB2_QUERY_DIRECTORY_HE]));
60884 seq_printf(m, "\nChangeNotifies: %d sent %d failed",
60885- atomic_read(&sent[SMB2_CHANGE_NOTIFY_HE]),
60886- atomic_read(&failed[SMB2_CHANGE_NOTIFY_HE]));
60887+ atomic_read_unchecked(&sent[SMB2_CHANGE_NOTIFY_HE]),
60888+ atomic_read_unchecked(&failed[SMB2_CHANGE_NOTIFY_HE]));
60889 seq_printf(m, "\nQueryInfos: %d sent %d failed",
60890- atomic_read(&sent[SMB2_QUERY_INFO_HE]),
60891- atomic_read(&failed[SMB2_QUERY_INFO_HE]));
60892+ atomic_read_unchecked(&sent[SMB2_QUERY_INFO_HE]),
60893+ atomic_read_unchecked(&failed[SMB2_QUERY_INFO_HE]));
60894 seq_printf(m, "\nSetInfos: %d sent %d failed",
60895- atomic_read(&sent[SMB2_SET_INFO_HE]),
60896- atomic_read(&failed[SMB2_SET_INFO_HE]));
60897+ atomic_read_unchecked(&sent[SMB2_SET_INFO_HE]),
60898+ atomic_read_unchecked(&failed[SMB2_SET_INFO_HE]));
60899 seq_printf(m, "\nOplockBreaks: %d sent %d failed",
60900- atomic_read(&sent[SMB2_OPLOCK_BREAK_HE]),
60901- atomic_read(&failed[SMB2_OPLOCK_BREAK_HE]));
60902+ atomic_read_unchecked(&sent[SMB2_OPLOCK_BREAK_HE]),
60903+ atomic_read_unchecked(&failed[SMB2_OPLOCK_BREAK_HE]));
60904 #endif
60905 }
60906
60907diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
60908index 65cd7a8..3518676 100644
60909--- a/fs/cifs/smb2pdu.c
60910+++ b/fs/cifs/smb2pdu.c
60911@@ -2147,8 +2147,7 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,
60912 default:
60913 cifs_dbg(VFS, "info level %u isn't supported\n",
60914 srch_inf->info_level);
60915- rc = -EINVAL;
60916- goto qdir_exit;
60917+ return -EINVAL;
60918 }
60919
60920 req->FileIndex = cpu_to_le32(index);
60921diff --git a/fs/coda/cache.c b/fs/coda/cache.c
60922index 46ee6f2..89a9e7f 100644
60923--- a/fs/coda/cache.c
60924+++ b/fs/coda/cache.c
60925@@ -24,7 +24,7 @@
60926 #include "coda_linux.h"
60927 #include "coda_cache.h"
60928
60929-static atomic_t permission_epoch = ATOMIC_INIT(0);
60930+static atomic_unchecked_t permission_epoch = ATOMIC_INIT(0);
60931
60932 /* replace or extend an acl cache hit */
60933 void coda_cache_enter(struct inode *inode, int mask)
60934@@ -32,7 +32,7 @@ void coda_cache_enter(struct inode *inode, int mask)
60935 struct coda_inode_info *cii = ITOC(inode);
60936
60937 spin_lock(&cii->c_lock);
60938- cii->c_cached_epoch = atomic_read(&permission_epoch);
60939+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch);
60940 if (!uid_eq(cii->c_uid, current_fsuid())) {
60941 cii->c_uid = current_fsuid();
60942 cii->c_cached_perm = mask;
60943@@ -46,14 +46,14 @@ void coda_cache_clear_inode(struct inode *inode)
60944 {
60945 struct coda_inode_info *cii = ITOC(inode);
60946 spin_lock(&cii->c_lock);
60947- cii->c_cached_epoch = atomic_read(&permission_epoch) - 1;
60948+ cii->c_cached_epoch = atomic_read_unchecked(&permission_epoch) - 1;
60949 spin_unlock(&cii->c_lock);
60950 }
60951
60952 /* remove all acl caches */
60953 void coda_cache_clear_all(struct super_block *sb)
60954 {
60955- atomic_inc(&permission_epoch);
60956+ atomic_inc_unchecked(&permission_epoch);
60957 }
60958
60959
60960@@ -66,7 +66,7 @@ int coda_cache_check(struct inode *inode, int mask)
60961 spin_lock(&cii->c_lock);
60962 hit = (mask & cii->c_cached_perm) == mask &&
60963 uid_eq(cii->c_uid, current_fsuid()) &&
60964- cii->c_cached_epoch == atomic_read(&permission_epoch);
60965+ cii->c_cached_epoch == atomic_read_unchecked(&permission_epoch);
60966 spin_unlock(&cii->c_lock);
60967
60968 return hit;
60969diff --git a/fs/compat.c b/fs/compat.c
60970index 6fd272d..dd34ba2 100644
60971--- a/fs/compat.c
60972+++ b/fs/compat.c
60973@@ -54,7 +54,7 @@
60974 #include <asm/ioctls.h>
60975 #include "internal.h"
60976
60977-int compat_log = 1;
60978+int compat_log = 0;
60979
60980 int compat_printk(const char *fmt, ...)
60981 {
60982@@ -512,7 +512,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_reqs, u32 __user *, ctx32p)
60983
60984 set_fs(KERNEL_DS);
60985 /* The __user pointer cast is valid because of the set_fs() */
60986- ret = sys_io_setup(nr_reqs, (aio_context_t __user *) &ctx64);
60987+ ret = sys_io_setup(nr_reqs, (aio_context_t __force_user *) &ctx64);
60988 set_fs(oldfs);
60989 /* truncating is ok because it's a user address */
60990 if (!ret)
60991@@ -562,7 +562,7 @@ ssize_t compat_rw_copy_check_uvector(int type,
60992 goto out;
60993
60994 ret = -EINVAL;
60995- if (nr_segs > UIO_MAXIOV || nr_segs < 0)
60996+ if (nr_segs > UIO_MAXIOV)
60997 goto out;
60998 if (nr_segs > fast_segs) {
60999 ret = -ENOMEM;
61000@@ -844,6 +844,7 @@ struct compat_old_linux_dirent {
61001 struct compat_readdir_callback {
61002 struct dir_context ctx;
61003 struct compat_old_linux_dirent __user *dirent;
61004+ struct file * file;
61005 int result;
61006 };
61007
61008@@ -863,6 +864,10 @@ static int compat_fillonedir(struct dir_context *ctx, const char *name,
61009 buf->result = -EOVERFLOW;
61010 return -EOVERFLOW;
61011 }
61012+
61013+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
61014+ return 0;
61015+
61016 buf->result++;
61017 dirent = buf->dirent;
61018 if (!access_ok(VERIFY_WRITE, dirent,
61019@@ -894,6 +899,7 @@ COMPAT_SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
61020 if (!f.file)
61021 return -EBADF;
61022
61023+ buf.file = f.file;
61024 error = iterate_dir(f.file, &buf.ctx);
61025 if (buf.result)
61026 error = buf.result;
61027@@ -913,6 +919,7 @@ struct compat_getdents_callback {
61028 struct dir_context ctx;
61029 struct compat_linux_dirent __user *current_dir;
61030 struct compat_linux_dirent __user *previous;
61031+ struct file * file;
61032 int count;
61033 int error;
61034 };
61035@@ -935,6 +942,10 @@ static int compat_filldir(struct dir_context *ctx, const char *name, int namlen,
61036 buf->error = -EOVERFLOW;
61037 return -EOVERFLOW;
61038 }
61039+
61040+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
61041+ return 0;
61042+
61043 dirent = buf->previous;
61044 if (dirent) {
61045 if (__put_user(offset, &dirent->d_off))
61046@@ -980,6 +991,7 @@ COMPAT_SYSCALL_DEFINE3(getdents, unsigned int, fd,
61047 if (!f.file)
61048 return -EBADF;
61049
61050+ buf.file = f.file;
61051 error = iterate_dir(f.file, &buf.ctx);
61052 if (error >= 0)
61053 error = buf.error;
61054@@ -1000,6 +1012,7 @@ struct compat_getdents_callback64 {
61055 struct dir_context ctx;
61056 struct linux_dirent64 __user *current_dir;
61057 struct linux_dirent64 __user *previous;
61058+ struct file * file;
61059 int count;
61060 int error;
61061 };
61062@@ -1018,6 +1031,10 @@ static int compat_filldir64(struct dir_context *ctx, const char *name,
61063 buf->error = -EINVAL; /* only used if we fail.. */
61064 if (reclen > buf->count)
61065 return -EINVAL;
61066+
61067+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
61068+ return 0;
61069+
61070 dirent = buf->previous;
61071
61072 if (dirent) {
61073@@ -1067,6 +1084,7 @@ COMPAT_SYSCALL_DEFINE3(getdents64, unsigned int, fd,
61074 if (!f.file)
61075 return -EBADF;
61076
61077+ buf.file = f.file;
61078 error = iterate_dir(f.file, &buf.ctx);
61079 if (error >= 0)
61080 error = buf.error;
61081diff --git a/fs/compat_binfmt_elf.c b/fs/compat_binfmt_elf.c
61082index 4d24d17..4f8c09e 100644
61083--- a/fs/compat_binfmt_elf.c
61084+++ b/fs/compat_binfmt_elf.c
61085@@ -30,11 +30,13 @@
61086 #undef elf_phdr
61087 #undef elf_shdr
61088 #undef elf_note
61089+#undef elf_dyn
61090 #undef elf_addr_t
61091 #define elfhdr elf32_hdr
61092 #define elf_phdr elf32_phdr
61093 #define elf_shdr elf32_shdr
61094 #define elf_note elf32_note
61095+#define elf_dyn Elf32_Dyn
61096 #define elf_addr_t Elf32_Addr
61097
61098 /*
61099diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c
61100index afec645..9c65620 100644
61101--- a/fs/compat_ioctl.c
61102+++ b/fs/compat_ioctl.c
61103@@ -621,7 +621,7 @@ static int serial_struct_ioctl(unsigned fd, unsigned cmd,
61104 return -EFAULT;
61105 if (__get_user(udata, &ss32->iomem_base))
61106 return -EFAULT;
61107- ss.iomem_base = compat_ptr(udata);
61108+ ss.iomem_base = (unsigned char __force_kernel *)compat_ptr(udata);
61109 if (__get_user(ss.iomem_reg_shift, &ss32->iomem_reg_shift) ||
61110 __get_user(ss.port_high, &ss32->port_high))
61111 return -EFAULT;
61112@@ -703,8 +703,8 @@ static int do_i2c_rdwr_ioctl(unsigned int fd, unsigned int cmd,
61113 for (i = 0; i < nmsgs; i++) {
61114 if (copy_in_user(&tmsgs[i].addr, &umsgs[i].addr, 3*sizeof(u16)))
61115 return -EFAULT;
61116- if (get_user(datap, &umsgs[i].buf) ||
61117- put_user(compat_ptr(datap), &tmsgs[i].buf))
61118+ if (get_user(datap, (compat_caddr_t __user *)&umsgs[i].buf) ||
61119+ put_user(compat_ptr(datap), (u8 __user * __user *)&tmsgs[i].buf))
61120 return -EFAULT;
61121 }
61122 return sys_ioctl(fd, cmd, (unsigned long)tdata);
61123@@ -797,7 +797,7 @@ static int compat_ioctl_preallocate(struct file *file,
61124 copy_in_user(&p->l_len, &p32->l_len, sizeof(s64)) ||
61125 copy_in_user(&p->l_sysid, &p32->l_sysid, sizeof(s32)) ||
61126 copy_in_user(&p->l_pid, &p32->l_pid, sizeof(u32)) ||
61127- copy_in_user(&p->l_pad, &p32->l_pad, 4*sizeof(u32)))
61128+ copy_in_user(p->l_pad, p32->l_pad, 4*sizeof(u32)))
61129 return -EFAULT;
61130
61131 return ioctl_preallocate(file, p);
61132@@ -1618,8 +1618,8 @@ COMPAT_SYSCALL_DEFINE3(ioctl, unsigned int, fd, unsigned int, cmd,
61133 static int __init init_sys32_ioctl_cmp(const void *p, const void *q)
61134 {
61135 unsigned int a, b;
61136- a = *(unsigned int *)p;
61137- b = *(unsigned int *)q;
61138+ a = *(const unsigned int *)p;
61139+ b = *(const unsigned int *)q;
61140 if (a > b)
61141 return 1;
61142 if (a < b)
61143diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
61144index cf0db00..c7f70e8 100644
61145--- a/fs/configfs/dir.c
61146+++ b/fs/configfs/dir.c
61147@@ -1540,7 +1540,8 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
61148 }
61149 for (p = q->next; p != &parent_sd->s_children; p = p->next) {
61150 struct configfs_dirent *next;
61151- const char *name;
61152+ const unsigned char * name;
61153+ char d_name[sizeof(next->s_dentry->d_iname)];
61154 int len;
61155 struct inode *inode = NULL;
61156
61157@@ -1549,7 +1550,12 @@ static int configfs_readdir(struct file *file, struct dir_context *ctx)
61158 continue;
61159
61160 name = configfs_get_name(next);
61161- len = strlen(name);
61162+ if (next->s_dentry && name == next->s_dentry->d_iname) {
61163+ len = next->s_dentry->d_name.len;
61164+ memcpy(d_name, name, len);
61165+ name = d_name;
61166+ } else
61167+ len = strlen(name);
61168
61169 /*
61170 * We'll have a dentry and an inode for
61171diff --git a/fs/coredump.c b/fs/coredump.c
61172index f319926..55f4ec2 100644
61173--- a/fs/coredump.c
61174+++ b/fs/coredump.c
61175@@ -450,8 +450,8 @@ static void wait_for_dump_helpers(struct file *file)
61176 struct pipe_inode_info *pipe = file->private_data;
61177
61178 pipe_lock(pipe);
61179- pipe->readers++;
61180- pipe->writers--;
61181+ atomic_inc(&pipe->readers);
61182+ atomic_dec(&pipe->writers);
61183 wake_up_interruptible_sync(&pipe->wait);
61184 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
61185 pipe_unlock(pipe);
61186@@ -460,11 +460,11 @@ static void wait_for_dump_helpers(struct file *file)
61187 * We actually want wait_event_freezable() but then we need
61188 * to clear TIF_SIGPENDING and improve dump_interrupted().
61189 */
61190- wait_event_interruptible(pipe->wait, pipe->readers == 1);
61191+ wait_event_interruptible(pipe->wait, atomic_read(&pipe->readers) == 1);
61192
61193 pipe_lock(pipe);
61194- pipe->readers--;
61195- pipe->writers++;
61196+ atomic_dec(&pipe->readers);
61197+ atomic_inc(&pipe->writers);
61198 pipe_unlock(pipe);
61199 }
61200
61201@@ -511,7 +511,9 @@ void do_coredump(const siginfo_t *siginfo)
61202 struct files_struct *displaced;
61203 bool need_nonrelative = false;
61204 bool core_dumped = false;
61205- static atomic_t core_dump_count = ATOMIC_INIT(0);
61206+ static atomic_unchecked_t core_dump_count = ATOMIC_INIT(0);
61207+ long signr = siginfo->si_signo;
61208+ int dumpable;
61209 struct coredump_params cprm = {
61210 .siginfo = siginfo,
61211 .regs = signal_pt_regs(),
61212@@ -524,12 +526,17 @@ void do_coredump(const siginfo_t *siginfo)
61213 .mm_flags = mm->flags,
61214 };
61215
61216- audit_core_dumps(siginfo->si_signo);
61217+ audit_core_dumps(signr);
61218+
61219+ dumpable = __get_dumpable(cprm.mm_flags);
61220+
61221+ if (signr == SIGSEGV || signr == SIGBUS || signr == SIGKILL || signr == SIGILL)
61222+ gr_handle_brute_attach(dumpable);
61223
61224 binfmt = mm->binfmt;
61225 if (!binfmt || !binfmt->core_dump)
61226 goto fail;
61227- if (!__get_dumpable(cprm.mm_flags))
61228+ if (!dumpable)
61229 goto fail;
61230
61231 cred = prepare_creds();
61232@@ -548,7 +555,7 @@ void do_coredump(const siginfo_t *siginfo)
61233 need_nonrelative = true;
61234 }
61235
61236- retval = coredump_wait(siginfo->si_signo, &core_state);
61237+ retval = coredump_wait(signr, &core_state);
61238 if (retval < 0)
61239 goto fail_creds;
61240
61241@@ -591,7 +598,7 @@ void do_coredump(const siginfo_t *siginfo)
61242 }
61243 cprm.limit = RLIM_INFINITY;
61244
61245- dump_count = atomic_inc_return(&core_dump_count);
61246+ dump_count = atomic_inc_return_unchecked(&core_dump_count);
61247 if (core_pipe_limit && (core_pipe_limit < dump_count)) {
61248 printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
61249 task_tgid_vnr(current), current->comm);
61250@@ -623,6 +630,8 @@ void do_coredump(const siginfo_t *siginfo)
61251 } else {
61252 struct inode *inode;
61253
61254+ gr_learn_resource(current, RLIMIT_CORE, binfmt->min_coredump, 1);
61255+
61256 if (cprm.limit < binfmt->min_coredump)
61257 goto fail_unlock;
61258
61259@@ -681,7 +690,7 @@ close_fail:
61260 filp_close(cprm.file, NULL);
61261 fail_dropcount:
61262 if (ispipe)
61263- atomic_dec(&core_dump_count);
61264+ atomic_dec_unchecked(&core_dump_count);
61265 fail_unlock:
61266 kfree(cn.corename);
61267 coredump_finish(mm, core_dumped);
61268@@ -702,6 +711,8 @@ int dump_emit(struct coredump_params *cprm, const void *addr, int nr)
61269 struct file *file = cprm->file;
61270 loff_t pos = file->f_pos;
61271 ssize_t n;
61272+
61273+ gr_learn_resource(current, RLIMIT_CORE, cprm->written + nr, 1);
61274 if (cprm->written + nr > cprm->limit)
61275 return 0;
61276 while (nr) {
61277diff --git a/fs/dcache.c b/fs/dcache.c
61278index c71e373..5c1f656 100644
61279--- a/fs/dcache.c
61280+++ b/fs/dcache.c
61281@@ -511,7 +511,7 @@ static void __dentry_kill(struct dentry *dentry)
61282 * dentry_iput drops the locks, at which point nobody (except
61283 * transient RCU lookups) can reach this dentry.
61284 */
61285- BUG_ON(dentry->d_lockref.count > 0);
61286+ BUG_ON(__lockref_read(&dentry->d_lockref) > 0);
61287 this_cpu_dec(nr_dentry);
61288 if (dentry->d_op && dentry->d_op->d_release)
61289 dentry->d_op->d_release(dentry);
61290@@ -564,7 +564,7 @@ static inline struct dentry *lock_parent(struct dentry *dentry)
61291 struct dentry *parent = dentry->d_parent;
61292 if (IS_ROOT(dentry))
61293 return NULL;
61294- if (unlikely(dentry->d_lockref.count < 0))
61295+ if (unlikely(__lockref_read(&dentry->d_lockref) < 0))
61296 return NULL;
61297 if (likely(spin_trylock(&parent->d_lock)))
61298 return parent;
61299@@ -626,8 +626,8 @@ static inline bool fast_dput(struct dentry *dentry)
61300 */
61301 if (unlikely(ret < 0)) {
61302 spin_lock(&dentry->d_lock);
61303- if (dentry->d_lockref.count > 1) {
61304- dentry->d_lockref.count--;
61305+ if (__lockref_read(&dentry->d_lockref) > 1) {
61306+ __lockref_dec(&dentry->d_lockref);
61307 spin_unlock(&dentry->d_lock);
61308 return 1;
61309 }
61310@@ -682,7 +682,7 @@ static inline bool fast_dput(struct dentry *dentry)
61311 * else could have killed it and marked it dead. Either way, we
61312 * don't need to do anything else.
61313 */
61314- if (dentry->d_lockref.count) {
61315+ if (__lockref_read(&dentry->d_lockref)) {
61316 spin_unlock(&dentry->d_lock);
61317 return 1;
61318 }
61319@@ -692,7 +692,7 @@ static inline bool fast_dput(struct dentry *dentry)
61320 * lock, and we just tested that it was zero, so we can just
61321 * set it to 1.
61322 */
61323- dentry->d_lockref.count = 1;
61324+ __lockref_set(&dentry->d_lockref, 1);
61325 return 0;
61326 }
61327
61328@@ -751,7 +751,7 @@ repeat:
61329 dentry->d_flags |= DCACHE_REFERENCED;
61330 dentry_lru_add(dentry);
61331
61332- dentry->d_lockref.count--;
61333+ __lockref_dec(&dentry->d_lockref);
61334 spin_unlock(&dentry->d_lock);
61335 return;
61336
61337@@ -766,7 +766,7 @@ EXPORT_SYMBOL(dput);
61338 /* This must be called with d_lock held */
61339 static inline void __dget_dlock(struct dentry *dentry)
61340 {
61341- dentry->d_lockref.count++;
61342+ __lockref_inc(&dentry->d_lockref);
61343 }
61344
61345 static inline void __dget(struct dentry *dentry)
61346@@ -807,8 +807,8 @@ repeat:
61347 goto repeat;
61348 }
61349 rcu_read_unlock();
61350- BUG_ON(!ret->d_lockref.count);
61351- ret->d_lockref.count++;
61352+ BUG_ON(!__lockref_read(&ret->d_lockref));
61353+ __lockref_inc(&ret->d_lockref);
61354 spin_unlock(&ret->d_lock);
61355 return ret;
61356 }
61357@@ -886,9 +886,9 @@ restart:
61358 spin_lock(&inode->i_lock);
61359 hlist_for_each_entry(dentry, &inode->i_dentry, d_u.d_alias) {
61360 spin_lock(&dentry->d_lock);
61361- if (!dentry->d_lockref.count) {
61362+ if (!__lockref_read(&dentry->d_lockref)) {
61363 struct dentry *parent = lock_parent(dentry);
61364- if (likely(!dentry->d_lockref.count)) {
61365+ if (likely(!__lockref_read(&dentry->d_lockref))) {
61366 __dentry_kill(dentry);
61367 dput(parent);
61368 goto restart;
61369@@ -923,7 +923,7 @@ static void shrink_dentry_list(struct list_head *list)
61370 * We found an inuse dentry which was not removed from
61371 * the LRU because of laziness during lookup. Do not free it.
61372 */
61373- if (dentry->d_lockref.count > 0) {
61374+ if (__lockref_read(&dentry->d_lockref) > 0) {
61375 spin_unlock(&dentry->d_lock);
61376 if (parent)
61377 spin_unlock(&parent->d_lock);
61378@@ -961,8 +961,8 @@ static void shrink_dentry_list(struct list_head *list)
61379 dentry = parent;
61380 while (dentry && !lockref_put_or_lock(&dentry->d_lockref)) {
61381 parent = lock_parent(dentry);
61382- if (dentry->d_lockref.count != 1) {
61383- dentry->d_lockref.count--;
61384+ if (__lockref_read(&dentry->d_lockref) != 1) {
61385+ __lockref_inc(&dentry->d_lockref);
61386 spin_unlock(&dentry->d_lock);
61387 if (parent)
61388 spin_unlock(&parent->d_lock);
61389@@ -1002,7 +1002,7 @@ static enum lru_status dentry_lru_isolate(struct list_head *item,
61390 * counts, just remove them from the LRU. Otherwise give them
61391 * another pass through the LRU.
61392 */
61393- if (dentry->d_lockref.count) {
61394+ if (__lockref_read(&dentry->d_lockref)) {
61395 d_lru_isolate(lru, dentry);
61396 spin_unlock(&dentry->d_lock);
61397 return LRU_REMOVED;
61398@@ -1336,7 +1336,7 @@ static enum d_walk_ret select_collect(void *_data, struct dentry *dentry)
61399 } else {
61400 if (dentry->d_flags & DCACHE_LRU_LIST)
61401 d_lru_del(dentry);
61402- if (!dentry->d_lockref.count) {
61403+ if (!__lockref_read(&dentry->d_lockref)) {
61404 d_shrink_add(dentry, &data->dispose);
61405 data->found++;
61406 }
61407@@ -1384,7 +1384,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
61408 return D_WALK_CONTINUE;
61409
61410 /* root with refcount 1 is fine */
61411- if (dentry == _data && dentry->d_lockref.count == 1)
61412+ if (dentry == _data && __lockref_read(&dentry->d_lockref) == 1)
61413 return D_WALK_CONTINUE;
61414
61415 printk(KERN_ERR "BUG: Dentry %p{i=%lx,n=%pd} "
61416@@ -1393,7 +1393,7 @@ static enum d_walk_ret umount_check(void *_data, struct dentry *dentry)
61417 dentry->d_inode ?
61418 dentry->d_inode->i_ino : 0UL,
61419 dentry,
61420- dentry->d_lockref.count,
61421+ __lockref_read(&dentry->d_lockref),
61422 dentry->d_sb->s_type->name,
61423 dentry->d_sb->s_id);
61424 WARN_ON(1);
61425@@ -1534,7 +1534,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
61426 dentry->d_iname[DNAME_INLINE_LEN-1] = 0;
61427 if (name->len > DNAME_INLINE_LEN-1) {
61428 size_t size = offsetof(struct external_name, name[1]);
61429- struct external_name *p = kmalloc(size + name->len, GFP_KERNEL);
61430+ struct external_name *p = kmalloc(round_up(size + name->len, sizeof(unsigned long)), GFP_KERNEL);
61431 if (!p) {
61432 kmem_cache_free(dentry_cache, dentry);
61433 return NULL;
61434@@ -1557,7 +1557,7 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
61435 smp_wmb();
61436 dentry->d_name.name = dname;
61437
61438- dentry->d_lockref.count = 1;
61439+ __lockref_set(&dentry->d_lockref, 1);
61440 dentry->d_flags = 0;
61441 spin_lock_init(&dentry->d_lock);
61442 seqcount_init(&dentry->d_seq);
61443@@ -1566,6 +1566,9 @@ struct dentry *__d_alloc(struct super_block *sb, const struct qstr *name)
61444 dentry->d_sb = sb;
61445 dentry->d_op = NULL;
61446 dentry->d_fsdata = NULL;
61447+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
61448+ atomic_set(&dentry->chroot_refcnt, 0);
61449+#endif
61450 INIT_HLIST_BL_NODE(&dentry->d_hash);
61451 INIT_LIST_HEAD(&dentry->d_lru);
61452 INIT_LIST_HEAD(&dentry->d_subdirs);
61453@@ -2290,7 +2293,7 @@ struct dentry *__d_lookup(const struct dentry *parent, const struct qstr *name)
61454 goto next;
61455 }
61456
61457- dentry->d_lockref.count++;
61458+ __lockref_inc(&dentry->d_lockref);
61459 found = dentry;
61460 spin_unlock(&dentry->d_lock);
61461 break;
61462@@ -2358,7 +2361,7 @@ again:
61463 spin_lock(&dentry->d_lock);
61464 inode = dentry->d_inode;
61465 isdir = S_ISDIR(inode->i_mode);
61466- if (dentry->d_lockref.count == 1) {
61467+ if (__lockref_read(&dentry->d_lockref) == 1) {
61468 if (!spin_trylock(&inode->i_lock)) {
61469 spin_unlock(&dentry->d_lock);
61470 cpu_relax();
61471@@ -3311,7 +3314,7 @@ static enum d_walk_ret d_genocide_kill(void *data, struct dentry *dentry)
61472
61473 if (!(dentry->d_flags & DCACHE_GENOCIDE)) {
61474 dentry->d_flags |= DCACHE_GENOCIDE;
61475- dentry->d_lockref.count--;
61476+ __lockref_dec(&dentry->d_lockref);
61477 }
61478 }
61479 return D_WALK_CONTINUE;
61480@@ -3427,7 +3430,8 @@ void __init vfs_caches_init(unsigned long mempages)
61481 mempages -= reserve;
61482
61483 names_cachep = kmem_cache_create("names_cache", PATH_MAX, 0,
61484- SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL);
61485+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_USERCOPY|
61486+ SLAB_NO_SANITIZE, NULL);
61487
61488 dcache_init();
61489 inode_init();
61490diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
61491index 96400ab..906103d 100644
61492--- a/fs/debugfs/inode.c
61493+++ b/fs/debugfs/inode.c
61494@@ -386,6 +386,10 @@ struct dentry *debugfs_create_file_size(const char *name, umode_t mode,
61495 }
61496 EXPORT_SYMBOL_GPL(debugfs_create_file_size);
61497
61498+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
61499+extern int grsec_enable_sysfs_restrict;
61500+#endif
61501+
61502 /**
61503 * debugfs_create_dir - create a directory in the debugfs filesystem
61504 * @name: a pointer to a string containing the name of the directory to
61505@@ -404,6 +408,10 @@ EXPORT_SYMBOL_GPL(debugfs_create_file_size);
61506 * If debugfs is not enabled in the kernel, the value -%ENODEV will be
61507 * returned.
61508 */
61509+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
61510+extern int grsec_enable_sysfs_restrict;
61511+#endif
61512+
61513 struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
61514 {
61515 struct dentry *dentry = start_creating(name, parent);
61516@@ -416,7 +424,12 @@ struct dentry *debugfs_create_dir(const char *name, struct dentry *parent)
61517 if (unlikely(!inode))
61518 return failed_creating(dentry);
61519
61520- inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
61521+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
61522+ if (grsec_enable_sysfs_restrict)
61523+ inode->i_mode = S_IFDIR | S_IRWXU;
61524+ else
61525+#endif
61526+ inode->i_mode = S_IFDIR | S_IRWXU | S_IRUGO | S_IXUGO;
61527 inode->i_op = &simple_dir_inode_operations;
61528 inode->i_fop = &simple_dir_operations;
61529
61530diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
61531index b08b518..d6acffa 100644
61532--- a/fs/ecryptfs/inode.c
61533+++ b/fs/ecryptfs/inode.c
61534@@ -663,7 +663,7 @@ static char *ecryptfs_readlink_lower(struct dentry *dentry, size_t *bufsiz)
61535 old_fs = get_fs();
61536 set_fs(get_ds());
61537 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry,
61538- (char __user *)lower_buf,
61539+ (char __force_user *)lower_buf,
61540 PATH_MAX);
61541 set_fs(old_fs);
61542 if (rc < 0)
61543diff --git a/fs/ecryptfs/miscdev.c b/fs/ecryptfs/miscdev.c
61544index e4141f2..d8263e8 100644
61545--- a/fs/ecryptfs/miscdev.c
61546+++ b/fs/ecryptfs/miscdev.c
61547@@ -304,7 +304,7 @@ check_list:
61548 goto out_unlock_msg_ctx;
61549 i = PKT_TYPE_SIZE + PKT_CTR_SIZE;
61550 if (msg_ctx->msg) {
61551- if (copy_to_user(&buf[i], packet_length, packet_length_size))
61552+ if (packet_length_size > sizeof(packet_length) || copy_to_user(&buf[i], packet_length, packet_length_size))
61553 goto out_unlock_msg_ctx;
61554 i += packet_length_size;
61555 if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
61556diff --git a/fs/exec.c b/fs/exec.c
61557index 00400cf..b9dca28 100644
61558--- a/fs/exec.c
61559+++ b/fs/exec.c
61560@@ -56,8 +56,20 @@
61561 #include <linux/pipe_fs_i.h>
61562 #include <linux/oom.h>
61563 #include <linux/compat.h>
61564+#include <linux/random.h>
61565+#include <linux/seq_file.h>
61566+#include <linux/coredump.h>
61567+#include <linux/mman.h>
61568+
61569+#ifdef CONFIG_PAX_REFCOUNT
61570+#include <linux/kallsyms.h>
61571+#include <linux/kdebug.h>
61572+#endif
61573+
61574+#include <trace/events/fs.h>
61575
61576 #include <asm/uaccess.h>
61577+#include <asm/sections.h>
61578 #include <asm/mmu_context.h>
61579 #include <asm/tlb.h>
61580
61581@@ -66,19 +78,34 @@
61582
61583 #include <trace/events/sched.h>
61584
61585+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
61586+void __weak pax_set_initial_flags(struct linux_binprm *bprm)
61587+{
61588+ 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");
61589+}
61590+#endif
61591+
61592+#ifdef CONFIG_PAX_HOOK_ACL_FLAGS
61593+void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
61594+EXPORT_SYMBOL(pax_set_initial_flags_func);
61595+#endif
61596+
61597 int suid_dumpable = 0;
61598
61599 static LIST_HEAD(formats);
61600 static DEFINE_RWLOCK(binfmt_lock);
61601
61602+extern int gr_process_kernel_exec_ban(void);
61603+extern int gr_process_suid_exec_ban(const struct linux_binprm *bprm);
61604+
61605 void __register_binfmt(struct linux_binfmt * fmt, int insert)
61606 {
61607 BUG_ON(!fmt);
61608 if (WARN_ON(!fmt->load_binary))
61609 return;
61610 write_lock(&binfmt_lock);
61611- insert ? list_add(&fmt->lh, &formats) :
61612- list_add_tail(&fmt->lh, &formats);
61613+ insert ? pax_list_add((struct list_head *)&fmt->lh, &formats) :
61614+ pax_list_add_tail((struct list_head *)&fmt->lh, &formats);
61615 write_unlock(&binfmt_lock);
61616 }
61617
61618@@ -87,7 +114,7 @@ EXPORT_SYMBOL(__register_binfmt);
61619 void unregister_binfmt(struct linux_binfmt * fmt)
61620 {
61621 write_lock(&binfmt_lock);
61622- list_del(&fmt->lh);
61623+ pax_list_del((struct list_head *)&fmt->lh);
61624 write_unlock(&binfmt_lock);
61625 }
61626
61627@@ -183,18 +210,10 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
61628 int write)
61629 {
61630 struct page *page;
61631- int ret;
61632
61633-#ifdef CONFIG_STACK_GROWSUP
61634- if (write) {
61635- ret = expand_downwards(bprm->vma, pos);
61636- if (ret < 0)
61637- return NULL;
61638- }
61639-#endif
61640- ret = get_user_pages(current, bprm->mm, pos,
61641- 1, write, 1, &page, NULL);
61642- if (ret <= 0)
61643+ if (0 > expand_downwards(bprm->vma, pos))
61644+ return NULL;
61645+ if (0 >= get_user_pages(current, bprm->mm, pos, 1, write, 1, &page, NULL))
61646 return NULL;
61647
61648 if (write) {
61649@@ -210,6 +229,17 @@ static struct page *get_arg_page(struct linux_binprm *bprm, unsigned long pos,
61650 if (size <= ARG_MAX)
61651 return page;
61652
61653+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61654+ // only allow 512KB for argv+env on suid/sgid binaries
61655+ // to prevent easy ASLR exhaustion
61656+ if (((!uid_eq(bprm->cred->euid, current_euid())) ||
61657+ (!gid_eq(bprm->cred->egid, current_egid()))) &&
61658+ (size > (512 * 1024))) {
61659+ put_page(page);
61660+ return NULL;
61661+ }
61662+#endif
61663+
61664 /*
61665 * Limit to 1/4-th the stack size for the argv+env strings.
61666 * This ensures that:
61667@@ -269,6 +299,11 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
61668 vma->vm_end = STACK_TOP_MAX;
61669 vma->vm_start = vma->vm_end - PAGE_SIZE;
61670 vma->vm_flags = VM_SOFTDIRTY | VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;
61671+
61672+#ifdef CONFIG_PAX_SEGMEXEC
61673+ vma->vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
61674+#endif
61675+
61676 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
61677 INIT_LIST_HEAD(&vma->anon_vma_chain);
61678
61679@@ -280,6 +315,12 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
61680 arch_bprm_mm_init(mm, vma);
61681 up_write(&mm->mmap_sem);
61682 bprm->p = vma->vm_end - sizeof(void *);
61683+
61684+#ifdef CONFIG_PAX_RANDUSTACK
61685+ if (randomize_va_space)
61686+ bprm->p ^= prandom_u32() & ~PAGE_MASK;
61687+#endif
61688+
61689 return 0;
61690 err:
61691 up_write(&mm->mmap_sem);
61692@@ -396,7 +437,7 @@ struct user_arg_ptr {
61693 } ptr;
61694 };
61695
61696-static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
61697+const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
61698 {
61699 const char __user *native;
61700
61701@@ -405,14 +446,14 @@ static const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr)
61702 compat_uptr_t compat;
61703
61704 if (get_user(compat, argv.ptr.compat + nr))
61705- return ERR_PTR(-EFAULT);
61706+ return (const char __force_user *)ERR_PTR(-EFAULT);
61707
61708 return compat_ptr(compat);
61709 }
61710 #endif
61711
61712 if (get_user(native, argv.ptr.native + nr))
61713- return ERR_PTR(-EFAULT);
61714+ return (const char __force_user *)ERR_PTR(-EFAULT);
61715
61716 return native;
61717 }
61718@@ -431,7 +472,7 @@ static int count(struct user_arg_ptr argv, int max)
61719 if (!p)
61720 break;
61721
61722- if (IS_ERR(p))
61723+ if (IS_ERR((const char __force_kernel *)p))
61724 return -EFAULT;
61725
61726 if (i >= max)
61727@@ -466,7 +507,7 @@ static int copy_strings(int argc, struct user_arg_ptr argv,
61728
61729 ret = -EFAULT;
61730 str = get_user_arg_ptr(argv, argc);
61731- if (IS_ERR(str))
61732+ if (IS_ERR((const char __force_kernel *)str))
61733 goto out;
61734
61735 len = strnlen_user(str, MAX_ARG_STRLEN);
61736@@ -548,7 +589,7 @@ int copy_strings_kernel(int argc, const char *const *__argv,
61737 int r;
61738 mm_segment_t oldfs = get_fs();
61739 struct user_arg_ptr argv = {
61740- .ptr.native = (const char __user *const __user *)__argv,
61741+ .ptr.native = (const char __user * const __force_user *)__argv,
61742 };
61743
61744 set_fs(KERNEL_DS);
61745@@ -583,7 +624,8 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
61746 unsigned long new_end = old_end - shift;
61747 struct mmu_gather tlb;
61748
61749- BUG_ON(new_start > new_end);
61750+ if (new_start >= new_end || new_start < mmap_min_addr)
61751+ return -ENOMEM;
61752
61753 /*
61754 * ensure there are no vmas between where we want to go
61755@@ -592,6 +634,10 @@ static int shift_arg_pages(struct vm_area_struct *vma, unsigned long shift)
61756 if (vma != find_vma(mm, new_start))
61757 return -EFAULT;
61758
61759+#ifdef CONFIG_PAX_SEGMEXEC
61760+ BUG_ON(pax_find_mirror_vma(vma));
61761+#endif
61762+
61763 /*
61764 * cover the whole range: [new_start, old_end)
61765 */
61766@@ -672,10 +718,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
61767 stack_top = arch_align_stack(stack_top);
61768 stack_top = PAGE_ALIGN(stack_top);
61769
61770- if (unlikely(stack_top < mmap_min_addr) ||
61771- unlikely(vma->vm_end - vma->vm_start >= stack_top - mmap_min_addr))
61772- return -ENOMEM;
61773-
61774 stack_shift = vma->vm_end - stack_top;
61775
61776 bprm->p -= stack_shift;
61777@@ -687,8 +729,28 @@ int setup_arg_pages(struct linux_binprm *bprm,
61778 bprm->exec -= stack_shift;
61779
61780 down_write(&mm->mmap_sem);
61781+
61782+ /* Move stack pages down in memory. */
61783+ if (stack_shift) {
61784+ ret = shift_arg_pages(vma, stack_shift);
61785+ if (ret)
61786+ goto out_unlock;
61787+ }
61788+
61789 vm_flags = VM_STACK_FLAGS;
61790
61791+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
61792+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
61793+ vm_flags &= ~VM_EXEC;
61794+
61795+#ifdef CONFIG_PAX_MPROTECT
61796+ if (mm->pax_flags & MF_PAX_MPROTECT)
61797+ vm_flags &= ~VM_MAYEXEC;
61798+#endif
61799+
61800+ }
61801+#endif
61802+
61803 /*
61804 * Adjust stack execute permissions; explicitly enable for
61805 * EXSTACK_ENABLE_X, disable for EXSTACK_DISABLE_X and leave alone
61806@@ -707,13 +769,6 @@ int setup_arg_pages(struct linux_binprm *bprm,
61807 goto out_unlock;
61808 BUG_ON(prev != vma);
61809
61810- /* Move stack pages down in memory. */
61811- if (stack_shift) {
61812- ret = shift_arg_pages(vma, stack_shift);
61813- if (ret)
61814- goto out_unlock;
61815- }
61816-
61817 /* mprotect_fixup is overkill to remove the temporary stack flags */
61818 vma->vm_flags &= ~VM_STACK_INCOMPLETE_SETUP;
61819
61820@@ -737,6 +792,27 @@ int setup_arg_pages(struct linux_binprm *bprm,
61821 #endif
61822 current->mm->start_stack = bprm->p;
61823 ret = expand_stack(vma, stack_base);
61824+
61825+#if !defined(CONFIG_STACK_GROWSUP) && defined(CONFIG_PAX_RANDMMAP)
61826+ if (!ret && (mm->pax_flags & MF_PAX_RANDMMAP) && STACK_TOP <= 0xFFFFFFFFU && STACK_TOP > vma->vm_end) {
61827+ unsigned long size;
61828+ vm_flags_t vm_flags;
61829+
61830+ size = STACK_TOP - vma->vm_end;
61831+ vm_flags = VM_NONE | VM_DONTEXPAND | VM_DONTDUMP;
61832+
61833+ ret = vma->vm_end != mmap_region(NULL, vma->vm_end, size, vm_flags, 0);
61834+
61835+#ifdef CONFIG_X86
61836+ if (!ret) {
61837+ size = PAGE_SIZE + mmap_min_addr + ((mm->delta_mmap ^ mm->delta_stack) & (0xFFUL << PAGE_SHIFT));
61838+ ret = 0 != mmap_region(NULL, 0, PAGE_ALIGN(size), vm_flags, 0);
61839+ }
61840+#endif
61841+
61842+ }
61843+#endif
61844+
61845 if (ret)
61846 ret = -EFAULT;
61847
61848@@ -781,8 +857,10 @@ static struct file *do_open_execat(int fd, struct filename *name, int flags)
61849 if (err)
61850 goto exit;
61851
61852- if (name->name[0] != '\0')
61853+ if (name->name[0] != '\0') {
61854 fsnotify_open(file);
61855+ trace_open_exec(name->name);
61856+ }
61857
61858 out:
61859 return file;
61860@@ -815,7 +893,7 @@ int kernel_read(struct file *file, loff_t offset,
61861 old_fs = get_fs();
61862 set_fs(get_ds());
61863 /* The cast to a user pointer is valid due to the set_fs() */
61864- result = vfs_read(file, (void __user *)addr, count, &pos);
61865+ result = vfs_read(file, (void __force_user *)addr, count, &pos);
61866 set_fs(old_fs);
61867 return result;
61868 }
61869@@ -860,6 +938,7 @@ static int exec_mmap(struct mm_struct *mm)
61870 tsk->mm = mm;
61871 tsk->active_mm = mm;
61872 activate_mm(active_mm, mm);
61873+ populate_stack();
61874 tsk->mm->vmacache_seqnum = 0;
61875 vmacache_flush(tsk);
61876 task_unlock(tsk);
61877@@ -926,10 +1005,14 @@ static int de_thread(struct task_struct *tsk)
61878 if (!thread_group_leader(tsk)) {
61879 struct task_struct *leader = tsk->group_leader;
61880
61881- sig->notify_count = -1; /* for exit_notify() */
61882 for (;;) {
61883 threadgroup_change_begin(tsk);
61884 write_lock_irq(&tasklist_lock);
61885+ /*
61886+ * Do this under tasklist_lock to ensure that
61887+ * exit_notify() can't miss ->group_exit_task
61888+ */
61889+ sig->notify_count = -1;
61890 if (likely(leader->exit_state))
61891 break;
61892 __set_current_state(TASK_KILLABLE);
61893@@ -1258,7 +1341,7 @@ static void check_unsafe_exec(struct linux_binprm *bprm)
61894 }
61895 rcu_read_unlock();
61896
61897- if (p->fs->users > n_fs)
61898+ if (atomic_read(&p->fs->users) > n_fs)
61899 bprm->unsafe |= LSM_UNSAFE_SHARE;
61900 else
61901 p->fs->in_exec = 1;
61902@@ -1459,6 +1542,31 @@ static int exec_binprm(struct linux_binprm *bprm)
61903 return ret;
61904 }
61905
61906+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61907+static DEFINE_PER_CPU(u64, exec_counter);
61908+static int __init init_exec_counters(void)
61909+{
61910+ unsigned int cpu;
61911+
61912+ for_each_possible_cpu(cpu) {
61913+ per_cpu(exec_counter, cpu) = (u64)cpu;
61914+ }
61915+
61916+ return 0;
61917+}
61918+early_initcall(init_exec_counters);
61919+static inline void increment_exec_counter(void)
61920+{
61921+ BUILD_BUG_ON(NR_CPUS > (1 << 16));
61922+ current->exec_id = this_cpu_add_return(exec_counter, 1 << 16);
61923+}
61924+#else
61925+static inline void increment_exec_counter(void) {}
61926+#endif
61927+
61928+extern void gr_handle_exec_args(struct linux_binprm *bprm,
61929+ struct user_arg_ptr argv);
61930+
61931 /*
61932 * sys_execve() executes a new program.
61933 */
61934@@ -1467,6 +1575,11 @@ static int do_execveat_common(int fd, struct filename *filename,
61935 struct user_arg_ptr envp,
61936 int flags)
61937 {
61938+#ifdef CONFIG_GRKERNSEC
61939+ struct file *old_exec_file;
61940+ struct acl_subject_label *old_acl;
61941+ struct rlimit old_rlim[RLIM_NLIMITS];
61942+#endif
61943 char *pathbuf = NULL;
61944 struct linux_binprm *bprm;
61945 struct file *file;
61946@@ -1476,6 +1589,8 @@ static int do_execveat_common(int fd, struct filename *filename,
61947 if (IS_ERR(filename))
61948 return PTR_ERR(filename);
61949
61950+ gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current_user()->processes), 1);
61951+
61952 /*
61953 * We move the actual failure in case of RLIMIT_NPROC excess from
61954 * set*uid() to execve() because too many poorly written programs
61955@@ -1513,6 +1628,11 @@ static int do_execveat_common(int fd, struct filename *filename,
61956 if (IS_ERR(file))
61957 goto out_unmark;
61958
61959+ if (gr_ptrace_readexec(file, bprm->unsafe)) {
61960+ retval = -EPERM;
61961+ goto out_unmark;
61962+ }
61963+
61964 sched_exec();
61965
61966 bprm->file = file;
61967@@ -1539,6 +1659,11 @@ static int do_execveat_common(int fd, struct filename *filename,
61968 }
61969 bprm->interp = bprm->filename;
61970
61971+ if (!gr_acl_handle_execve(file->f_path.dentry, file->f_path.mnt)) {
61972+ retval = -EACCES;
61973+ goto out_unmark;
61974+ }
61975+
61976 retval = bprm_mm_init(bprm);
61977 if (retval)
61978 goto out_unmark;
61979@@ -1555,24 +1680,70 @@ static int do_execveat_common(int fd, struct filename *filename,
61980 if (retval < 0)
61981 goto out;
61982
61983+#ifdef CONFIG_GRKERNSEC
61984+ old_acl = current->acl;
61985+ memcpy(old_rlim, current->signal->rlim, sizeof(old_rlim));
61986+ old_exec_file = current->exec_file;
61987+ get_file(file);
61988+ current->exec_file = file;
61989+#endif
61990+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
61991+ /* limit suid stack to 8MB
61992+ * we saved the old limits above and will restore them if this exec fails
61993+ */
61994+ if (((!uid_eq(bprm->cred->euid, current_euid())) || (!gid_eq(bprm->cred->egid, current_egid()))) &&
61995+ (old_rlim[RLIMIT_STACK].rlim_cur > (8 * 1024 * 1024)))
61996+ current->signal->rlim[RLIMIT_STACK].rlim_cur = 8 * 1024 * 1024;
61997+#endif
61998+
61999+ if (gr_process_kernel_exec_ban() || gr_process_suid_exec_ban(bprm)) {
62000+ retval = -EPERM;
62001+ goto out_fail;
62002+ }
62003+
62004+ if (!gr_tpe_allow(file)) {
62005+ retval = -EACCES;
62006+ goto out_fail;
62007+ }
62008+
62009+ if (gr_check_crash_exec(file)) {
62010+ retval = -EACCES;
62011+ goto out_fail;
62012+ }
62013+
62014+ retval = gr_set_proc_label(file->f_path.dentry, file->f_path.mnt,
62015+ bprm->unsafe);
62016+ if (retval < 0)
62017+ goto out_fail;
62018+
62019 retval = copy_strings_kernel(1, &bprm->filename, bprm);
62020 if (retval < 0)
62021- goto out;
62022+ goto out_fail;
62023
62024 bprm->exec = bprm->p;
62025 retval = copy_strings(bprm->envc, envp, bprm);
62026 if (retval < 0)
62027- goto out;
62028+ goto out_fail;
62029
62030 retval = copy_strings(bprm->argc, argv, bprm);
62031 if (retval < 0)
62032- goto out;
62033+ goto out_fail;
62034+
62035+ gr_log_chroot_exec(file->f_path.dentry, file->f_path.mnt);
62036+
62037+ gr_handle_exec_args(bprm, argv);
62038
62039 retval = exec_binprm(bprm);
62040 if (retval < 0)
62041- goto out;
62042+ goto out_fail;
62043+#ifdef CONFIG_GRKERNSEC
62044+ if (old_exec_file)
62045+ fput(old_exec_file);
62046+#endif
62047
62048 /* execve succeeded */
62049+
62050+ increment_exec_counter();
62051 current->fs->in_exec = 0;
62052 current->in_execve = 0;
62053 acct_update_integrals(current);
62054@@ -1584,6 +1755,14 @@ static int do_execveat_common(int fd, struct filename *filename,
62055 put_files_struct(displaced);
62056 return retval;
62057
62058+out_fail:
62059+#ifdef CONFIG_GRKERNSEC
62060+ current->acl = old_acl;
62061+ memcpy(current->signal->rlim, old_rlim, sizeof(old_rlim));
62062+ fput(current->exec_file);
62063+ current->exec_file = old_exec_file;
62064+#endif
62065+
62066 out:
62067 if (bprm->mm) {
62068 acct_arg_size(bprm, 0);
62069@@ -1730,3 +1909,312 @@ COMPAT_SYSCALL_DEFINE5(execveat, int, fd,
62070 argv, envp, flags);
62071 }
62072 #endif
62073+
62074+int pax_check_flags(unsigned long *flags)
62075+{
62076+ int retval = 0;
62077+
62078+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_SEGMEXEC)
62079+ if (*flags & MF_PAX_SEGMEXEC)
62080+ {
62081+ *flags &= ~MF_PAX_SEGMEXEC;
62082+ retval = -EINVAL;
62083+ }
62084+#endif
62085+
62086+ if ((*flags & MF_PAX_PAGEEXEC)
62087+
62088+#ifdef CONFIG_PAX_PAGEEXEC
62089+ && (*flags & MF_PAX_SEGMEXEC)
62090+#endif
62091+
62092+ )
62093+ {
62094+ *flags &= ~MF_PAX_PAGEEXEC;
62095+ retval = -EINVAL;
62096+ }
62097+
62098+ if ((*flags & MF_PAX_MPROTECT)
62099+
62100+#ifdef CONFIG_PAX_MPROTECT
62101+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
62102+#endif
62103+
62104+ )
62105+ {
62106+ *flags &= ~MF_PAX_MPROTECT;
62107+ retval = -EINVAL;
62108+ }
62109+
62110+ if ((*flags & MF_PAX_EMUTRAMP)
62111+
62112+#ifdef CONFIG_PAX_EMUTRAMP
62113+ && !(*flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC))
62114+#endif
62115+
62116+ )
62117+ {
62118+ *flags &= ~MF_PAX_EMUTRAMP;
62119+ retval = -EINVAL;
62120+ }
62121+
62122+ return retval;
62123+}
62124+
62125+EXPORT_SYMBOL(pax_check_flags);
62126+
62127+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
62128+char *pax_get_path(const struct path *path, char *buf, int buflen)
62129+{
62130+ char *pathname = d_path(path, buf, buflen);
62131+
62132+ if (IS_ERR(pathname))
62133+ goto toolong;
62134+
62135+ pathname = mangle_path(buf, pathname, "\t\n\\");
62136+ if (!pathname)
62137+ goto toolong;
62138+
62139+ *pathname = 0;
62140+ return buf;
62141+
62142+toolong:
62143+ return "<path too long>";
62144+}
62145+EXPORT_SYMBOL(pax_get_path);
62146+
62147+void pax_report_fault(struct pt_regs *regs, void *pc, void *sp)
62148+{
62149+ struct task_struct *tsk = current;
62150+ struct mm_struct *mm = current->mm;
62151+ char *buffer_exec = (char *)__get_free_page(GFP_KERNEL);
62152+ char *buffer_fault = (char *)__get_free_page(GFP_KERNEL);
62153+ char *path_exec = NULL;
62154+ char *path_fault = NULL;
62155+ unsigned long start = 0UL, end = 0UL, offset = 0UL;
62156+ siginfo_t info = { };
62157+
62158+ if (buffer_exec && buffer_fault) {
62159+ struct vm_area_struct *vma, *vma_exec = NULL, *vma_fault = NULL;
62160+
62161+ down_read(&mm->mmap_sem);
62162+ vma = mm->mmap;
62163+ while (vma && (!vma_exec || !vma_fault)) {
62164+ if (vma->vm_file && mm->exe_file == vma->vm_file && (vma->vm_flags & VM_EXEC))
62165+ vma_exec = vma;
62166+ if (vma->vm_start <= (unsigned long)pc && (unsigned long)pc < vma->vm_end)
62167+ vma_fault = vma;
62168+ vma = vma->vm_next;
62169+ }
62170+ if (vma_exec)
62171+ path_exec = pax_get_path(&vma_exec->vm_file->f_path, buffer_exec, PAGE_SIZE);
62172+ if (vma_fault) {
62173+ start = vma_fault->vm_start;
62174+ end = vma_fault->vm_end;
62175+ offset = vma_fault->vm_pgoff << PAGE_SHIFT;
62176+ if (vma_fault->vm_file)
62177+ path_fault = pax_get_path(&vma_fault->vm_file->f_path, buffer_fault, PAGE_SIZE);
62178+ else if ((unsigned long)pc >= mm->start_brk && (unsigned long)pc < mm->brk)
62179+ path_fault = "<heap>";
62180+ else if (vma_fault->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
62181+ path_fault = "<stack>";
62182+ else
62183+ path_fault = "<anonymous mapping>";
62184+ }
62185+ up_read(&mm->mmap_sem);
62186+ }
62187+ if (tsk->signal->curr_ip)
62188+ printk(KERN_ERR "PAX: From %pI4: execution attempt in: %s, %08lx-%08lx %08lx\n", &tsk->signal->curr_ip, path_fault, start, end, offset);
62189+ else
62190+ printk(KERN_ERR "PAX: execution attempt in: %s, %08lx-%08lx %08lx\n", path_fault, start, end, offset);
62191+ 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),
62192+ from_kuid_munged(&init_user_ns, task_uid(tsk)), from_kuid_munged(&init_user_ns, task_euid(tsk)), pc, sp);
62193+ free_page((unsigned long)buffer_exec);
62194+ free_page((unsigned long)buffer_fault);
62195+ pax_report_insns(regs, pc, sp);
62196+ info.si_signo = SIGKILL;
62197+ info.si_errno = 0;
62198+ info.si_code = SI_KERNEL;
62199+ info.si_pid = 0;
62200+ info.si_uid = 0;
62201+ do_coredump(&info);
62202+}
62203+#endif
62204+
62205+#ifdef CONFIG_PAX_REFCOUNT
62206+void pax_report_refcount_overflow(struct pt_regs *regs)
62207+{
62208+ if (current->signal->curr_ip)
62209+ printk(KERN_ERR "PAX: From %pI4: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n",
62210+ &current->signal->curr_ip, current->comm, task_pid_nr(current),
62211+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
62212+ else
62213+ printk(KERN_ERR "PAX: refcount overflow detected in: %s:%d, uid/euid: %u/%u\n", current->comm, task_pid_nr(current),
62214+ from_kuid_munged(&init_user_ns, current_uid()), from_kuid_munged(&init_user_ns, current_euid()));
62215+ print_symbol(KERN_ERR "PAX: refcount overflow occured at: %s\n", instruction_pointer(regs));
62216+ preempt_disable();
62217+ show_regs(regs);
62218+ preempt_enable();
62219+ force_sig_info(SIGKILL, SEND_SIG_FORCED, current);
62220+}
62221+#endif
62222+
62223+#ifdef CONFIG_PAX_USERCOPY
62224+/* 0: not at all, 1: fully, 2: fully inside frame, -1: partially (implies an error) */
62225+static noinline int check_stack_object(const void *obj, unsigned long len)
62226+{
62227+ const void * const stack = task_stack_page(current);
62228+ const void * const stackend = stack + THREAD_SIZE;
62229+
62230+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
62231+ const void *frame = NULL;
62232+ const void *oldframe;
62233+#endif
62234+
62235+ if (obj + len < obj)
62236+ return -1;
62237+
62238+ if (obj + len <= stack || stackend <= obj)
62239+ return 0;
62240+
62241+ if (obj < stack || stackend < obj + len)
62242+ return -1;
62243+
62244+#if defined(CONFIG_FRAME_POINTER) && defined(CONFIG_X86)
62245+ oldframe = __builtin_frame_address(1);
62246+ if (oldframe)
62247+ frame = __builtin_frame_address(2);
62248+ /*
62249+ low ----------------------------------------------> high
62250+ [saved bp][saved ip][args][local vars][saved bp][saved ip]
62251+ ^----------------^
62252+ allow copies only within here
62253+ */
62254+ while (stack <= frame && frame < stackend) {
62255+ /* if obj + len extends past the last frame, this
62256+ check won't pass and the next frame will be 0,
62257+ causing us to bail out and correctly report
62258+ the copy as invalid
62259+ */
62260+ if (obj + len <= frame)
62261+ return obj >= oldframe + 2 * sizeof(void *) ? 2 : -1;
62262+ oldframe = frame;
62263+ frame = *(const void * const *)frame;
62264+ }
62265+ return -1;
62266+#else
62267+ return 1;
62268+#endif
62269+}
62270+
62271+static __noreturn void pax_report_usercopy(const void *ptr, unsigned long len, bool to_user, const char *type)
62272+{
62273+ if (current->signal->curr_ip)
62274+ printk(KERN_ERR "PAX: From %pI4: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
62275+ &current->signal->curr_ip, to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
62276+ else
62277+ printk(KERN_ERR "PAX: kernel memory %s attempt detected %s %p (%s) (%lu bytes)\n",
62278+ to_user ? "leak" : "overwrite", to_user ? "from" : "to", ptr, type ? : "unknown", len);
62279+ dump_stack();
62280+ gr_handle_kernel_exploit();
62281+ do_group_exit(SIGKILL);
62282+}
62283+#endif
62284+
62285+#ifdef CONFIG_PAX_USERCOPY
62286+
62287+static inline bool check_kernel_text_object(unsigned long low, unsigned long high)
62288+{
62289+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
62290+ unsigned long textlow = ktla_ktva((unsigned long)_stext);
62291+#ifdef CONFIG_MODULES
62292+ unsigned long texthigh = (unsigned long)MODULES_EXEC_VADDR;
62293+#else
62294+ unsigned long texthigh = ktla_ktva((unsigned long)_etext);
62295+#endif
62296+
62297+#else
62298+ unsigned long textlow = (unsigned long)_stext;
62299+ unsigned long texthigh = (unsigned long)_etext;
62300+
62301+#ifdef CONFIG_X86_64
62302+ /* check against linear mapping as well */
62303+ if (high > (unsigned long)__va(__pa(textlow)) &&
62304+ low < (unsigned long)__va(__pa(texthigh)))
62305+ return true;
62306+#endif
62307+
62308+#endif
62309+
62310+ if (high <= textlow || low >= texthigh)
62311+ return false;
62312+ else
62313+ return true;
62314+}
62315+#endif
62316+
62317+void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size)
62318+{
62319+#ifdef CONFIG_PAX_USERCOPY
62320+ const char *type;
62321+#endif
62322+
62323+#if !defined(CONFIG_STACK_GROWSUP) && !defined(CONFIG_X86_64)
62324+ unsigned long stackstart = (unsigned long)task_stack_page(current);
62325+ unsigned long currentsp = (unsigned long)&stackstart;
62326+ if (unlikely((currentsp < stackstart + 512 ||
62327+ currentsp >= stackstart + THREAD_SIZE) && !in_interrupt()))
62328+ BUG();
62329+#endif
62330+
62331+#ifndef CONFIG_PAX_USERCOPY_DEBUG
62332+ if (const_size)
62333+ return;
62334+#endif
62335+
62336+#ifdef CONFIG_PAX_USERCOPY
62337+ if (!n)
62338+ return;
62339+
62340+ type = check_heap_object(ptr, n);
62341+ if (!type) {
62342+ int ret = check_stack_object(ptr, n);
62343+ if (ret == 1 || ret == 2)
62344+ return;
62345+ if (ret == 0) {
62346+ if (check_kernel_text_object((unsigned long)ptr, (unsigned long)ptr + n))
62347+ type = "<kernel text>";
62348+ else
62349+ return;
62350+ } else
62351+ type = "<process stack>";
62352+ }
62353+
62354+ pax_report_usercopy(ptr, n, to_user, type);
62355+#endif
62356+
62357+}
62358+EXPORT_SYMBOL(__check_object_size);
62359+
62360+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
62361+void pax_track_stack(void)
62362+{
62363+ unsigned long sp = (unsigned long)&sp;
62364+ if (sp < current_thread_info()->lowest_stack &&
62365+ sp >= (unsigned long)task_stack_page(current) + 2 * sizeof(unsigned long))
62366+ current_thread_info()->lowest_stack = sp;
62367+ if (unlikely((sp & ~(THREAD_SIZE - 1)) < (THREAD_SIZE/16)))
62368+ BUG();
62369+}
62370+EXPORT_SYMBOL(pax_track_stack);
62371+#endif
62372+
62373+#ifdef CONFIG_PAX_SIZE_OVERFLOW
62374+void report_size_overflow(const char *file, unsigned int line, const char *func, const char *ssa_name)
62375+{
62376+ printk(KERN_ERR "PAX: size overflow detected in function %s %s:%u %s", func, file, line, ssa_name);
62377+ dump_stack();
62378+ do_group_exit(SIGKILL);
62379+}
62380+EXPORT_SYMBOL(report_size_overflow);
62381+#endif
62382diff --git a/fs/ext2/balloc.c b/fs/ext2/balloc.c
62383index 9f9992b..8b59411 100644
62384--- a/fs/ext2/balloc.c
62385+++ b/fs/ext2/balloc.c
62386@@ -1184,10 +1184,10 @@ static int ext2_has_free_blocks(struct ext2_sb_info *sbi)
62387
62388 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
62389 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
62390- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
62391+ if (free_blocks < root_blocks + 1 &&
62392 !uid_eq(sbi->s_resuid, current_fsuid()) &&
62393 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
62394- !in_group_p (sbi->s_resgid))) {
62395+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
62396 return 0;
62397 }
62398 return 1;
62399diff --git a/fs/ext2/super.c b/fs/ext2/super.c
62400index d0e746e..82e06f0 100644
62401--- a/fs/ext2/super.c
62402+++ b/fs/ext2/super.c
62403@@ -267,10 +267,8 @@ static int ext2_show_options(struct seq_file *seq, struct dentry *root)
62404 #ifdef CONFIG_EXT2_FS_XATTR
62405 if (test_opt(sb, XATTR_USER))
62406 seq_puts(seq, ",user_xattr");
62407- if (!test_opt(sb, XATTR_USER) &&
62408- (def_mount_opts & EXT2_DEFM_XATTR_USER)) {
62409+ if (!test_opt(sb, XATTR_USER))
62410 seq_puts(seq, ",nouser_xattr");
62411- }
62412 #endif
62413
62414 #ifdef CONFIG_EXT2_FS_POSIX_ACL
62415@@ -856,8 +854,8 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent)
62416 if (def_mount_opts & EXT2_DEFM_UID16)
62417 set_opt(sbi->s_mount_opt, NO_UID32);
62418 #ifdef CONFIG_EXT2_FS_XATTR
62419- if (def_mount_opts & EXT2_DEFM_XATTR_USER)
62420- set_opt(sbi->s_mount_opt, XATTR_USER);
62421+ /* always enable user xattrs */
62422+ set_opt(sbi->s_mount_opt, XATTR_USER);
62423 #endif
62424 #ifdef CONFIG_EXT2_FS_POSIX_ACL
62425 if (def_mount_opts & EXT2_DEFM_ACL)
62426diff --git a/fs/ext2/xattr.c b/fs/ext2/xattr.c
62427index 9142614..97484fa 100644
62428--- a/fs/ext2/xattr.c
62429+++ b/fs/ext2/xattr.c
62430@@ -247,7 +247,7 @@ ext2_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size)
62431 struct buffer_head *bh = NULL;
62432 struct ext2_xattr_entry *entry;
62433 char *end;
62434- size_t rest = buffer_size;
62435+ size_t rest = buffer_size, total_size = 0;
62436 int error;
62437
62438 ea_idebug(inode, "buffer=%p, buffer_size=%ld",
62439@@ -305,9 +305,10 @@ bad_block: ext2_error(inode->i_sb, "ext2_xattr_list",
62440 buffer += size;
62441 }
62442 rest -= size;
62443+ total_size += size;
62444 }
62445 }
62446- error = buffer_size - rest; /* total size */
62447+ error = total_size;
62448
62449 cleanup:
62450 brelse(bh);
62451diff --git a/fs/ext3/balloc.c b/fs/ext3/balloc.c
62452index 158b5d4..2432610 100644
62453--- a/fs/ext3/balloc.c
62454+++ b/fs/ext3/balloc.c
62455@@ -1438,10 +1438,10 @@ static int ext3_has_free_blocks(struct ext3_sb_info *sbi, int use_reservation)
62456
62457 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
62458 root_blocks = le32_to_cpu(sbi->s_es->s_r_blocks_count);
62459- if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&
62460+ if (free_blocks < root_blocks + 1 &&
62461 !use_reservation && !uid_eq(sbi->s_resuid, current_fsuid()) &&
62462 (gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) ||
62463- !in_group_p (sbi->s_resgid))) {
62464+ !in_group_p (sbi->s_resgid)) && !capable_nolog(CAP_SYS_RESOURCE)) {
62465 return 0;
62466 }
62467 return 1;
62468diff --git a/fs/ext3/super.c b/fs/ext3/super.c
62469index d4dbf3c..906a6fb 100644
62470--- a/fs/ext3/super.c
62471+++ b/fs/ext3/super.c
62472@@ -655,10 +655,8 @@ static int ext3_show_options(struct seq_file *seq, struct dentry *root)
62473 #ifdef CONFIG_EXT3_FS_XATTR
62474 if (test_opt(sb, XATTR_USER))
62475 seq_puts(seq, ",user_xattr");
62476- if (!test_opt(sb, XATTR_USER) &&
62477- (def_mount_opts & EXT3_DEFM_XATTR_USER)) {
62478+ if (!test_opt(sb, XATTR_USER))
62479 seq_puts(seq, ",nouser_xattr");
62480- }
62481 #endif
62482 #ifdef CONFIG_EXT3_FS_POSIX_ACL
62483 if (test_opt(sb, POSIX_ACL))
62484@@ -1760,8 +1758,8 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent)
62485 if (def_mount_opts & EXT3_DEFM_UID16)
62486 set_opt(sbi->s_mount_opt, NO_UID32);
62487 #ifdef CONFIG_EXT3_FS_XATTR
62488- if (def_mount_opts & EXT3_DEFM_XATTR_USER)
62489- set_opt(sbi->s_mount_opt, XATTR_USER);
62490+ /* always enable user xattrs */
62491+ set_opt(sbi->s_mount_opt, XATTR_USER);
62492 #endif
62493 #ifdef CONFIG_EXT3_FS_POSIX_ACL
62494 if (def_mount_opts & EXT3_DEFM_ACL)
62495diff --git a/fs/ext3/xattr.c b/fs/ext3/xattr.c
62496index c6874be..f8a6ae8 100644
62497--- a/fs/ext3/xattr.c
62498+++ b/fs/ext3/xattr.c
62499@@ -330,7 +330,7 @@ static int
62500 ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
62501 char *buffer, size_t buffer_size)
62502 {
62503- size_t rest = buffer_size;
62504+ size_t rest = buffer_size, total_size = 0;
62505
62506 for (; !IS_LAST_ENTRY(entry); entry = EXT3_XATTR_NEXT(entry)) {
62507 const struct xattr_handler *handler =
62508@@ -347,9 +347,10 @@ ext3_xattr_list_entries(struct dentry *dentry, struct ext3_xattr_entry *entry,
62509 buffer += size;
62510 }
62511 rest -= size;
62512+ total_size += size;
62513 }
62514 }
62515- return buffer_size - rest;
62516+ return total_size;
62517 }
62518
62519 static int
62520diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
62521index 83a6f49..d4e4d03 100644
62522--- a/fs/ext4/balloc.c
62523+++ b/fs/ext4/balloc.c
62524@@ -557,8 +557,8 @@ static int ext4_has_free_clusters(struct ext4_sb_info *sbi,
62525 /* Hm, nope. Are (enough) root reserved clusters available? */
62526 if (uid_eq(sbi->s_resuid, current_fsuid()) ||
62527 (!gid_eq(sbi->s_resgid, GLOBAL_ROOT_GID) && in_group_p(sbi->s_resgid)) ||
62528- capable(CAP_SYS_RESOURCE) ||
62529- (flags & EXT4_MB_USE_ROOT_BLOCKS)) {
62530+ (flags & EXT4_MB_USE_ROOT_BLOCKS) ||
62531+ capable_nolog(CAP_SYS_RESOURCE)) {
62532
62533 if (free_clusters >= (nclusters + dirty_clusters +
62534 resv_clusters))
62535diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
62536index f63c3d5..3c1a033 100644
62537--- a/fs/ext4/ext4.h
62538+++ b/fs/ext4/ext4.h
62539@@ -1287,19 +1287,19 @@ struct ext4_sb_info {
62540 unsigned long s_mb_last_start;
62541
62542 /* stats for buddy allocator */
62543- atomic_t s_bal_reqs; /* number of reqs with len > 1 */
62544- atomic_t s_bal_success; /* we found long enough chunks */
62545- atomic_t s_bal_allocated; /* in blocks */
62546- atomic_t s_bal_ex_scanned; /* total extents scanned */
62547- atomic_t s_bal_goals; /* goal hits */
62548- atomic_t s_bal_breaks; /* too long searches */
62549- atomic_t s_bal_2orders; /* 2^order hits */
62550+ atomic_unchecked_t s_bal_reqs; /* number of reqs with len > 1 */
62551+ atomic_unchecked_t s_bal_success; /* we found long enough chunks */
62552+ atomic_unchecked_t s_bal_allocated; /* in blocks */
62553+ atomic_unchecked_t s_bal_ex_scanned; /* total extents scanned */
62554+ atomic_unchecked_t s_bal_goals; /* goal hits */
62555+ atomic_unchecked_t s_bal_breaks; /* too long searches */
62556+ atomic_unchecked_t s_bal_2orders; /* 2^order hits */
62557 spinlock_t s_bal_lock;
62558 unsigned long s_mb_buddies_generated;
62559 unsigned long long s_mb_generation_time;
62560- atomic_t s_mb_lost_chunks;
62561- atomic_t s_mb_preallocated;
62562- atomic_t s_mb_discarded;
62563+ atomic_unchecked_t s_mb_lost_chunks;
62564+ atomic_unchecked_t s_mb_preallocated;
62565+ atomic_unchecked_t s_mb_discarded;
62566 atomic_t s_lock_busy;
62567
62568 /* locality groups */
62569diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
62570index 8d1e602..abf497b 100644
62571--- a/fs/ext4/mballoc.c
62572+++ b/fs/ext4/mballoc.c
62573@@ -1901,7 +1901,7 @@ void ext4_mb_simple_scan_group(struct ext4_allocation_context *ac,
62574 BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
62575
62576 if (EXT4_SB(sb)->s_mb_stats)
62577- atomic_inc(&EXT4_SB(sb)->s_bal_2orders);
62578+ atomic_inc_unchecked(&EXT4_SB(sb)->s_bal_2orders);
62579
62580 break;
62581 }
62582@@ -2211,7 +2211,7 @@ repeat:
62583 ac->ac_status = AC_STATUS_CONTINUE;
62584 ac->ac_flags |= EXT4_MB_HINT_FIRST;
62585 cr = 3;
62586- atomic_inc(&sbi->s_mb_lost_chunks);
62587+ atomic_inc_unchecked(&sbi->s_mb_lost_chunks);
62588 goto repeat;
62589 }
62590 }
62591@@ -2716,25 +2716,25 @@ int ext4_mb_release(struct super_block *sb)
62592 if (sbi->s_mb_stats) {
62593 ext4_msg(sb, KERN_INFO,
62594 "mballoc: %u blocks %u reqs (%u success)",
62595- atomic_read(&sbi->s_bal_allocated),
62596- atomic_read(&sbi->s_bal_reqs),
62597- atomic_read(&sbi->s_bal_success));
62598+ atomic_read_unchecked(&sbi->s_bal_allocated),
62599+ atomic_read_unchecked(&sbi->s_bal_reqs),
62600+ atomic_read_unchecked(&sbi->s_bal_success));
62601 ext4_msg(sb, KERN_INFO,
62602 "mballoc: %u extents scanned, %u goal hits, "
62603 "%u 2^N hits, %u breaks, %u lost",
62604- atomic_read(&sbi->s_bal_ex_scanned),
62605- atomic_read(&sbi->s_bal_goals),
62606- atomic_read(&sbi->s_bal_2orders),
62607- atomic_read(&sbi->s_bal_breaks),
62608- atomic_read(&sbi->s_mb_lost_chunks));
62609+ atomic_read_unchecked(&sbi->s_bal_ex_scanned),
62610+ atomic_read_unchecked(&sbi->s_bal_goals),
62611+ atomic_read_unchecked(&sbi->s_bal_2orders),
62612+ atomic_read_unchecked(&sbi->s_bal_breaks),
62613+ atomic_read_unchecked(&sbi->s_mb_lost_chunks));
62614 ext4_msg(sb, KERN_INFO,
62615 "mballoc: %lu generated and it took %Lu",
62616 sbi->s_mb_buddies_generated,
62617 sbi->s_mb_generation_time);
62618 ext4_msg(sb, KERN_INFO,
62619 "mballoc: %u preallocated, %u discarded",
62620- atomic_read(&sbi->s_mb_preallocated),
62621- atomic_read(&sbi->s_mb_discarded));
62622+ atomic_read_unchecked(&sbi->s_mb_preallocated),
62623+ atomic_read_unchecked(&sbi->s_mb_discarded));
62624 }
62625
62626 free_percpu(sbi->s_locality_groups);
62627@@ -3190,16 +3190,16 @@ static void ext4_mb_collect_stats(struct ext4_allocation_context *ac)
62628 struct ext4_sb_info *sbi = EXT4_SB(ac->ac_sb);
62629
62630 if (sbi->s_mb_stats && ac->ac_g_ex.fe_len > 1) {
62631- atomic_inc(&sbi->s_bal_reqs);
62632- atomic_add(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
62633+ atomic_inc_unchecked(&sbi->s_bal_reqs);
62634+ atomic_add_unchecked(ac->ac_b_ex.fe_len, &sbi->s_bal_allocated);
62635 if (ac->ac_b_ex.fe_len >= ac->ac_o_ex.fe_len)
62636- atomic_inc(&sbi->s_bal_success);
62637- atomic_add(ac->ac_found, &sbi->s_bal_ex_scanned);
62638+ atomic_inc_unchecked(&sbi->s_bal_success);
62639+ atomic_add_unchecked(ac->ac_found, &sbi->s_bal_ex_scanned);
62640 if (ac->ac_g_ex.fe_start == ac->ac_b_ex.fe_start &&
62641 ac->ac_g_ex.fe_group == ac->ac_b_ex.fe_group)
62642- atomic_inc(&sbi->s_bal_goals);
62643+ atomic_inc_unchecked(&sbi->s_bal_goals);
62644 if (ac->ac_found > sbi->s_mb_max_to_scan)
62645- atomic_inc(&sbi->s_bal_breaks);
62646+ atomic_inc_unchecked(&sbi->s_bal_breaks);
62647 }
62648
62649 if (ac->ac_op == EXT4_MB_HISTORY_ALLOC)
62650@@ -3626,7 +3626,7 @@ ext4_mb_new_inode_pa(struct ext4_allocation_context *ac)
62651 trace_ext4_mb_new_inode_pa(ac, pa);
62652
62653 ext4_mb_use_inode_pa(ac, pa);
62654- atomic_add(pa->pa_free, &sbi->s_mb_preallocated);
62655+ atomic_add_unchecked(pa->pa_free, &sbi->s_mb_preallocated);
62656
62657 ei = EXT4_I(ac->ac_inode);
62658 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
62659@@ -3686,7 +3686,7 @@ ext4_mb_new_group_pa(struct ext4_allocation_context *ac)
62660 trace_ext4_mb_new_group_pa(ac, pa);
62661
62662 ext4_mb_use_group_pa(ac, pa);
62663- atomic_add(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
62664+ atomic_add_unchecked(pa->pa_free, &EXT4_SB(sb)->s_mb_preallocated);
62665
62666 grp = ext4_get_group_info(sb, ac->ac_b_ex.fe_group);
62667 lg = ac->ac_lg;
62668@@ -3775,7 +3775,7 @@ ext4_mb_release_inode_pa(struct ext4_buddy *e4b, struct buffer_head *bitmap_bh,
62669 * from the bitmap and continue.
62670 */
62671 }
62672- atomic_add(free, &sbi->s_mb_discarded);
62673+ atomic_add_unchecked(free, &sbi->s_mb_discarded);
62674
62675 return err;
62676 }
62677@@ -3793,7 +3793,7 @@ ext4_mb_release_group_pa(struct ext4_buddy *e4b,
62678 ext4_get_group_no_and_offset(sb, pa->pa_pstart, &group, &bit);
62679 BUG_ON(group != e4b->bd_group && pa->pa_len != 0);
62680 mb_free_blocks(pa->pa_inode, e4b, bit, pa->pa_len);
62681- atomic_add(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
62682+ atomic_add_unchecked(pa->pa_len, &EXT4_SB(sb)->s_mb_discarded);
62683 trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
62684
62685 return 0;
62686diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c
62687index 8313ca3..8a37d08 100644
62688--- a/fs/ext4/mmp.c
62689+++ b/fs/ext4/mmp.c
62690@@ -111,7 +111,7 @@ static int read_mmp_block(struct super_block *sb, struct buffer_head **bh,
62691 void __dump_mmp_msg(struct super_block *sb, struct mmp_struct *mmp,
62692 const char *function, unsigned int line, const char *msg)
62693 {
62694- __ext4_warning(sb, function, line, msg);
62695+ __ext4_warning(sb, function, line, "%s", msg);
62696 __ext4_warning(sb, function, line,
62697 "MMP failure info: last update time: %llu, last update "
62698 "node: %s, last update device: %s\n",
62699diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
62700index 8a8ec62..1b02de5 100644
62701--- a/fs/ext4/resize.c
62702+++ b/fs/ext4/resize.c
62703@@ -413,7 +413,7 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
62704
62705 ext4_debug("mark blocks [%llu/%u] used\n", block, count);
62706 for (count2 = count; count > 0; count -= count2, block += count2) {
62707- ext4_fsblk_t start;
62708+ ext4_fsblk_t start, diff;
62709 struct buffer_head *bh;
62710 ext4_group_t group;
62711 int err;
62712@@ -422,10 +422,6 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
62713 start = ext4_group_first_block_no(sb, group);
62714 group -= flex_gd->groups[0].group;
62715
62716- count2 = EXT4_BLOCKS_PER_GROUP(sb) - (block - start);
62717- if (count2 > count)
62718- count2 = count;
62719-
62720 if (flex_gd->bg_flags[group] & EXT4_BG_BLOCK_UNINIT) {
62721 BUG_ON(flex_gd->count > 1);
62722 continue;
62723@@ -443,9 +439,15 @@ static int set_flexbg_block_bitmap(struct super_block *sb, handle_t *handle,
62724 err = ext4_journal_get_write_access(handle, bh);
62725 if (err)
62726 return err;
62727+
62728+ diff = block - start;
62729+ count2 = EXT4_BLOCKS_PER_GROUP(sb) - diff;
62730+ if (count2 > count)
62731+ count2 = count;
62732+
62733 ext4_debug("mark block bitmap %#04llx (+%llu/%u)\n", block,
62734- block - start, count2);
62735- ext4_set_bits(bh->b_data, block - start, count2);
62736+ diff, count2);
62737+ ext4_set_bits(bh->b_data, diff, count2);
62738
62739 err = ext4_handle_dirty_metadata(handle, NULL, bh);
62740 if (unlikely(err))
62741diff --git a/fs/ext4/super.c b/fs/ext4/super.c
62742index e061e66..87bc092 100644
62743--- a/fs/ext4/super.c
62744+++ b/fs/ext4/super.c
62745@@ -1243,7 +1243,7 @@ static ext4_fsblk_t get_sb_block(void **data)
62746 }
62747
62748 #define DEFAULT_JOURNAL_IOPRIO (IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, 3))
62749-static char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
62750+static const char deprecated_msg[] = "Mount option \"%s\" will be removed by %s\n"
62751 "Contact linux-ext4@vger.kernel.org if you think we should keep it.\n";
62752
62753 #ifdef CONFIG_QUOTA
62754@@ -2443,7 +2443,7 @@ struct ext4_attr {
62755 int offset;
62756 int deprecated_val;
62757 } u;
62758-};
62759+} __do_const;
62760
62761 static int parse_strtoull(const char *buf,
62762 unsigned long long max, unsigned long long *value)
62763diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c
62764index 1e09fc7..0400dd4 100644
62765--- a/fs/ext4/xattr.c
62766+++ b/fs/ext4/xattr.c
62767@@ -399,7 +399,7 @@ static int
62768 ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
62769 char *buffer, size_t buffer_size)
62770 {
62771- size_t rest = buffer_size;
62772+ size_t rest = buffer_size, total_size = 0;
62773
62774 for (; !IS_LAST_ENTRY(entry); entry = EXT4_XATTR_NEXT(entry)) {
62775 const struct xattr_handler *handler =
62776@@ -416,9 +416,10 @@ ext4_xattr_list_entries(struct dentry *dentry, struct ext4_xattr_entry *entry,
62777 buffer += size;
62778 }
62779 rest -= size;
62780+ total_size += size;
62781 }
62782 }
62783- return buffer_size - rest;
62784+ return total_size;
62785 }
62786
62787 static int
62788diff --git a/fs/fcntl.c b/fs/fcntl.c
62789index ee85cd4..9dd0d20 100644
62790--- a/fs/fcntl.c
62791+++ b/fs/fcntl.c
62792@@ -102,6 +102,10 @@ void __f_setown(struct file *filp, struct pid *pid, enum pid_type type,
62793 int force)
62794 {
62795 security_file_set_fowner(filp);
62796+ if (gr_handle_chroot_fowner(pid, type))
62797+ return;
62798+ if (gr_check_protected_task_fowner(pid, type))
62799+ return;
62800 f_modown(filp, pid, type, force);
62801 }
62802 EXPORT_SYMBOL(__f_setown);
62803diff --git a/fs/fhandle.c b/fs/fhandle.c
62804index 999ff5c..2281df9 100644
62805--- a/fs/fhandle.c
62806+++ b/fs/fhandle.c
62807@@ -8,6 +8,7 @@
62808 #include <linux/fs_struct.h>
62809 #include <linux/fsnotify.h>
62810 #include <linux/personality.h>
62811+#include <linux/grsecurity.h>
62812 #include <asm/uaccess.h>
62813 #include "internal.h"
62814 #include "mount.h"
62815@@ -67,8 +68,7 @@ static long do_sys_name_to_handle(struct path *path,
62816 } else
62817 retval = 0;
62818 /* copy the mount id */
62819- if (copy_to_user(mnt_id, &real_mount(path->mnt)->mnt_id,
62820- sizeof(*mnt_id)) ||
62821+ if (put_user(real_mount(path->mnt)->mnt_id, mnt_id) ||
62822 copy_to_user(ufh, handle,
62823 sizeof(struct file_handle) + handle_bytes))
62824 retval = -EFAULT;
62825@@ -175,7 +175,7 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
62826 * the directory. Ideally we would like CAP_DAC_SEARCH.
62827 * But we don't have that
62828 */
62829- if (!capable(CAP_DAC_READ_SEARCH)) {
62830+ if (!capable(CAP_DAC_READ_SEARCH) || !gr_chroot_fhandle()) {
62831 retval = -EPERM;
62832 goto out_err;
62833 }
62834@@ -195,8 +195,9 @@ static int handle_to_path(int mountdirfd, struct file_handle __user *ufh,
62835 goto out_err;
62836 }
62837 /* copy the full handle */
62838- if (copy_from_user(handle, ufh,
62839- sizeof(struct file_handle) +
62840+ *handle = f_handle;
62841+ if (copy_from_user(&handle->f_handle,
62842+ &ufh->f_handle,
62843 f_handle.handle_bytes)) {
62844 retval = -EFAULT;
62845 goto out_handle;
62846diff --git a/fs/file.c b/fs/file.c
62847index ee738ea..f6c15629 100644
62848--- a/fs/file.c
62849+++ b/fs/file.c
62850@@ -16,6 +16,7 @@
62851 #include <linux/slab.h>
62852 #include <linux/vmalloc.h>
62853 #include <linux/file.h>
62854+#include <linux/security.h>
62855 #include <linux/fdtable.h>
62856 #include <linux/bitops.h>
62857 #include <linux/interrupt.h>
62858@@ -139,7 +140,7 @@ out:
62859 * Return <0 error code on error; 1 on successful completion.
62860 * The files->file_lock should be held on entry, and will be held on exit.
62861 */
62862-static int expand_fdtable(struct files_struct *files, int nr)
62863+static int expand_fdtable(struct files_struct *files, unsigned int nr)
62864 __releases(files->file_lock)
62865 __acquires(files->file_lock)
62866 {
62867@@ -184,7 +185,7 @@ static int expand_fdtable(struct files_struct *files, int nr)
62868 * expanded and execution may have blocked.
62869 * The files->file_lock should be held on entry, and will be held on exit.
62870 */
62871-static int expand_files(struct files_struct *files, int nr)
62872+static int expand_files(struct files_struct *files, unsigned int nr)
62873 {
62874 struct fdtable *fdt;
62875
62876@@ -800,6 +801,7 @@ int replace_fd(unsigned fd, struct file *file, unsigned flags)
62877 if (!file)
62878 return __close_fd(files, fd);
62879
62880+ gr_learn_resource(current, RLIMIT_NOFILE, fd, 0);
62881 if (fd >= rlimit(RLIMIT_NOFILE))
62882 return -EBADF;
62883
62884@@ -826,6 +828,7 @@ SYSCALL_DEFINE3(dup3, unsigned int, oldfd, unsigned int, newfd, int, flags)
62885 if (unlikely(oldfd == newfd))
62886 return -EINVAL;
62887
62888+ gr_learn_resource(current, RLIMIT_NOFILE, newfd, 0);
62889 if (newfd >= rlimit(RLIMIT_NOFILE))
62890 return -EBADF;
62891
62892@@ -881,6 +884,7 @@ SYSCALL_DEFINE1(dup, unsigned int, fildes)
62893 int f_dupfd(unsigned int from, struct file *file, unsigned flags)
62894 {
62895 int err;
62896+ gr_learn_resource(current, RLIMIT_NOFILE, from, 0);
62897 if (from >= rlimit(RLIMIT_NOFILE))
62898 return -EINVAL;
62899 err = alloc_fd(from, flags);
62900diff --git a/fs/filesystems.c b/fs/filesystems.c
62901index 5797d45..7d7d79a 100644
62902--- a/fs/filesystems.c
62903+++ b/fs/filesystems.c
62904@@ -275,7 +275,11 @@ struct file_system_type *get_fs_type(const char *name)
62905 int len = dot ? dot - name : strlen(name);
62906
62907 fs = __get_fs_type(name, len);
62908+#ifdef CONFIG_GRKERNSEC_MODHARDEN
62909+ if (!fs && (___request_module(true, "grsec_modharden_fs", "fs-%.*s", len, name) == 0))
62910+#else
62911 if (!fs && (request_module("fs-%.*s", len, name) == 0))
62912+#endif
62913 fs = __get_fs_type(name, len);
62914
62915 if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
62916diff --git a/fs/fs_struct.c b/fs/fs_struct.c
62917index 7dca743..1ff87ae 100644
62918--- a/fs/fs_struct.c
62919+++ b/fs/fs_struct.c
62920@@ -4,6 +4,7 @@
62921 #include <linux/path.h>
62922 #include <linux/slab.h>
62923 #include <linux/fs_struct.h>
62924+#include <linux/grsecurity.h>
62925 #include "internal.h"
62926
62927 /*
62928@@ -15,14 +16,18 @@ void set_fs_root(struct fs_struct *fs, const struct path *path)
62929 struct path old_root;
62930
62931 path_get(path);
62932+ gr_inc_chroot_refcnts(path->dentry, path->mnt);
62933 spin_lock(&fs->lock);
62934 write_seqcount_begin(&fs->seq);
62935 old_root = fs->root;
62936 fs->root = *path;
62937+ gr_set_chroot_entries(current, path);
62938 write_seqcount_end(&fs->seq);
62939 spin_unlock(&fs->lock);
62940- if (old_root.dentry)
62941+ if (old_root.dentry) {
62942+ gr_dec_chroot_refcnts(old_root.dentry, old_root.mnt);
62943 path_put(&old_root);
62944+ }
62945 }
62946
62947 /*
62948@@ -67,6 +72,10 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
62949 int hits = 0;
62950 spin_lock(&fs->lock);
62951 write_seqcount_begin(&fs->seq);
62952+ /* this root replacement is only done by pivot_root,
62953+ leave grsec's chroot tagging alone for this task
62954+ so that a pivoted root isn't treated as a chroot
62955+ */
62956 hits += replace_path(&fs->root, old_root, new_root);
62957 hits += replace_path(&fs->pwd, old_root, new_root);
62958 write_seqcount_end(&fs->seq);
62959@@ -85,6 +94,7 @@ void chroot_fs_refs(const struct path *old_root, const struct path *new_root)
62960
62961 void free_fs_struct(struct fs_struct *fs)
62962 {
62963+ gr_dec_chroot_refcnts(fs->root.dentry, fs->root.mnt);
62964 path_put(&fs->root);
62965 path_put(&fs->pwd);
62966 kmem_cache_free(fs_cachep, fs);
62967@@ -99,7 +109,8 @@ void exit_fs(struct task_struct *tsk)
62968 task_lock(tsk);
62969 spin_lock(&fs->lock);
62970 tsk->fs = NULL;
62971- kill = !--fs->users;
62972+ gr_clear_chroot_entries(tsk);
62973+ kill = !atomic_dec_return(&fs->users);
62974 spin_unlock(&fs->lock);
62975 task_unlock(tsk);
62976 if (kill)
62977@@ -112,7 +123,7 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
62978 struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL);
62979 /* We don't need to lock fs - think why ;-) */
62980 if (fs) {
62981- fs->users = 1;
62982+ atomic_set(&fs->users, 1);
62983 fs->in_exec = 0;
62984 spin_lock_init(&fs->lock);
62985 seqcount_init(&fs->seq);
62986@@ -121,9 +132,13 @@ struct fs_struct *copy_fs_struct(struct fs_struct *old)
62987 spin_lock(&old->lock);
62988 fs->root = old->root;
62989 path_get(&fs->root);
62990+ /* instead of calling gr_set_chroot_entries here,
62991+ we call it from every caller of this function
62992+ */
62993 fs->pwd = old->pwd;
62994 path_get(&fs->pwd);
62995 spin_unlock(&old->lock);
62996+ gr_inc_chroot_refcnts(fs->root.dentry, fs->root.mnt);
62997 }
62998 return fs;
62999 }
63000@@ -139,8 +154,9 @@ int unshare_fs_struct(void)
63001
63002 task_lock(current);
63003 spin_lock(&fs->lock);
63004- kill = !--fs->users;
63005+ kill = !atomic_dec_return(&fs->users);
63006 current->fs = new_fs;
63007+ gr_set_chroot_entries(current, &new_fs->root);
63008 spin_unlock(&fs->lock);
63009 task_unlock(current);
63010
63011@@ -153,13 +169,13 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct);
63012
63013 int current_umask(void)
63014 {
63015- return current->fs->umask;
63016+ return current->fs->umask | gr_acl_umask();
63017 }
63018 EXPORT_SYMBOL(current_umask);
63019
63020 /* to be mentioned only in INIT_TASK */
63021 struct fs_struct init_fs = {
63022- .users = 1,
63023+ .users = ATOMIC_INIT(1),
63024 .lock = __SPIN_LOCK_UNLOCKED(init_fs.lock),
63025 .seq = SEQCNT_ZERO(init_fs.seq),
63026 .umask = 0022,
63027diff --git a/fs/fscache/cookie.c b/fs/fscache/cookie.c
63028index 89acec7..a575262 100644
63029--- a/fs/fscache/cookie.c
63030+++ b/fs/fscache/cookie.c
63031@@ -19,7 +19,7 @@
63032
63033 struct kmem_cache *fscache_cookie_jar;
63034
63035-static atomic_t fscache_object_debug_id = ATOMIC_INIT(0);
63036+static atomic_unchecked_t fscache_object_debug_id = ATOMIC_INIT(0);
63037
63038 static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie);
63039 static int fscache_alloc_object(struct fscache_cache *cache,
63040@@ -69,11 +69,11 @@ struct fscache_cookie *__fscache_acquire_cookie(
63041 parent ? (char *) parent->def->name : "<no-parent>",
63042 def->name, netfs_data, enable);
63043
63044- fscache_stat(&fscache_n_acquires);
63045+ fscache_stat_unchecked(&fscache_n_acquires);
63046
63047 /* if there's no parent cookie, then we don't create one here either */
63048 if (!parent) {
63049- fscache_stat(&fscache_n_acquires_null);
63050+ fscache_stat_unchecked(&fscache_n_acquires_null);
63051 _leave(" [no parent]");
63052 return NULL;
63053 }
63054@@ -88,7 +88,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
63055 /* allocate and initialise a cookie */
63056 cookie = kmem_cache_alloc(fscache_cookie_jar, GFP_KERNEL);
63057 if (!cookie) {
63058- fscache_stat(&fscache_n_acquires_oom);
63059+ fscache_stat_unchecked(&fscache_n_acquires_oom);
63060 _leave(" [ENOMEM]");
63061 return NULL;
63062 }
63063@@ -115,13 +115,13 @@ struct fscache_cookie *__fscache_acquire_cookie(
63064
63065 switch (cookie->def->type) {
63066 case FSCACHE_COOKIE_TYPE_INDEX:
63067- fscache_stat(&fscache_n_cookie_index);
63068+ fscache_stat_unchecked(&fscache_n_cookie_index);
63069 break;
63070 case FSCACHE_COOKIE_TYPE_DATAFILE:
63071- fscache_stat(&fscache_n_cookie_data);
63072+ fscache_stat_unchecked(&fscache_n_cookie_data);
63073 break;
63074 default:
63075- fscache_stat(&fscache_n_cookie_special);
63076+ fscache_stat_unchecked(&fscache_n_cookie_special);
63077 break;
63078 }
63079
63080@@ -135,7 +135,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
63081 } else {
63082 atomic_dec(&parent->n_children);
63083 __fscache_cookie_put(cookie);
63084- fscache_stat(&fscache_n_acquires_nobufs);
63085+ fscache_stat_unchecked(&fscache_n_acquires_nobufs);
63086 _leave(" = NULL");
63087 return NULL;
63088 }
63089@@ -144,7 +144,7 @@ struct fscache_cookie *__fscache_acquire_cookie(
63090 }
63091 }
63092
63093- fscache_stat(&fscache_n_acquires_ok);
63094+ fscache_stat_unchecked(&fscache_n_acquires_ok);
63095 _leave(" = %p", cookie);
63096 return cookie;
63097 }
63098@@ -213,7 +213,7 @@ static int fscache_acquire_non_index_cookie(struct fscache_cookie *cookie)
63099 cache = fscache_select_cache_for_object(cookie->parent);
63100 if (!cache) {
63101 up_read(&fscache_addremove_sem);
63102- fscache_stat(&fscache_n_acquires_no_cache);
63103+ fscache_stat_unchecked(&fscache_n_acquires_no_cache);
63104 _leave(" = -ENOMEDIUM [no cache]");
63105 return -ENOMEDIUM;
63106 }
63107@@ -297,14 +297,14 @@ static int fscache_alloc_object(struct fscache_cache *cache,
63108 object = cache->ops->alloc_object(cache, cookie);
63109 fscache_stat_d(&fscache_n_cop_alloc_object);
63110 if (IS_ERR(object)) {
63111- fscache_stat(&fscache_n_object_no_alloc);
63112+ fscache_stat_unchecked(&fscache_n_object_no_alloc);
63113 ret = PTR_ERR(object);
63114 goto error;
63115 }
63116
63117- fscache_stat(&fscache_n_object_alloc);
63118+ fscache_stat_unchecked(&fscache_n_object_alloc);
63119
63120- object->debug_id = atomic_inc_return(&fscache_object_debug_id);
63121+ object->debug_id = atomic_inc_return_unchecked(&fscache_object_debug_id);
63122
63123 _debug("ALLOC OBJ%x: %s {%lx}",
63124 object->debug_id, cookie->def->name, object->events);
63125@@ -418,7 +418,7 @@ void __fscache_invalidate(struct fscache_cookie *cookie)
63126
63127 _enter("{%s}", cookie->def->name);
63128
63129- fscache_stat(&fscache_n_invalidates);
63130+ fscache_stat_unchecked(&fscache_n_invalidates);
63131
63132 /* Only permit invalidation of data files. Invalidating an index will
63133 * require the caller to release all its attachments to the tree rooted
63134@@ -476,10 +476,10 @@ void __fscache_update_cookie(struct fscache_cookie *cookie)
63135 {
63136 struct fscache_object *object;
63137
63138- fscache_stat(&fscache_n_updates);
63139+ fscache_stat_unchecked(&fscache_n_updates);
63140
63141 if (!cookie) {
63142- fscache_stat(&fscache_n_updates_null);
63143+ fscache_stat_unchecked(&fscache_n_updates_null);
63144 _leave(" [no cookie]");
63145 return;
63146 }
63147@@ -580,12 +580,12 @@ EXPORT_SYMBOL(__fscache_disable_cookie);
63148 */
63149 void __fscache_relinquish_cookie(struct fscache_cookie *cookie, bool retire)
63150 {
63151- fscache_stat(&fscache_n_relinquishes);
63152+ fscache_stat_unchecked(&fscache_n_relinquishes);
63153 if (retire)
63154- fscache_stat(&fscache_n_relinquishes_retire);
63155+ fscache_stat_unchecked(&fscache_n_relinquishes_retire);
63156
63157 if (!cookie) {
63158- fscache_stat(&fscache_n_relinquishes_null);
63159+ fscache_stat_unchecked(&fscache_n_relinquishes_null);
63160 _leave(" [no cookie]");
63161 return;
63162 }
63163@@ -686,7 +686,7 @@ int __fscache_check_consistency(struct fscache_cookie *cookie)
63164 if (test_bit(FSCACHE_IOERROR, &object->cache->flags))
63165 goto inconsistent;
63166
63167- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
63168+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
63169
63170 __fscache_use_cookie(cookie);
63171 if (fscache_submit_op(object, op) < 0)
63172diff --git a/fs/fscache/internal.h b/fs/fscache/internal.h
63173index 7872a62..d91b19f 100644
63174--- a/fs/fscache/internal.h
63175+++ b/fs/fscache/internal.h
63176@@ -137,8 +137,8 @@ extern void fscache_operation_gc(struct work_struct *);
63177 extern int fscache_wait_for_deferred_lookup(struct fscache_cookie *);
63178 extern int fscache_wait_for_operation_activation(struct fscache_object *,
63179 struct fscache_operation *,
63180- atomic_t *,
63181- atomic_t *,
63182+ atomic_unchecked_t *,
63183+ atomic_unchecked_t *,
63184 void (*)(struct fscache_operation *));
63185 extern void fscache_invalidate_writes(struct fscache_cookie *);
63186
63187@@ -157,101 +157,101 @@ extern void fscache_proc_cleanup(void);
63188 * stats.c
63189 */
63190 #ifdef CONFIG_FSCACHE_STATS
63191-extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
63192-extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
63193+extern atomic_unchecked_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
63194+extern atomic_unchecked_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
63195
63196-extern atomic_t fscache_n_op_pend;
63197-extern atomic_t fscache_n_op_run;
63198-extern atomic_t fscache_n_op_enqueue;
63199-extern atomic_t fscache_n_op_deferred_release;
63200-extern atomic_t fscache_n_op_release;
63201-extern atomic_t fscache_n_op_gc;
63202-extern atomic_t fscache_n_op_cancelled;
63203-extern atomic_t fscache_n_op_rejected;
63204+extern atomic_unchecked_t fscache_n_op_pend;
63205+extern atomic_unchecked_t fscache_n_op_run;
63206+extern atomic_unchecked_t fscache_n_op_enqueue;
63207+extern atomic_unchecked_t fscache_n_op_deferred_release;
63208+extern atomic_unchecked_t fscache_n_op_release;
63209+extern atomic_unchecked_t fscache_n_op_gc;
63210+extern atomic_unchecked_t fscache_n_op_cancelled;
63211+extern atomic_unchecked_t fscache_n_op_rejected;
63212
63213-extern atomic_t fscache_n_attr_changed;
63214-extern atomic_t fscache_n_attr_changed_ok;
63215-extern atomic_t fscache_n_attr_changed_nobufs;
63216-extern atomic_t fscache_n_attr_changed_nomem;
63217-extern atomic_t fscache_n_attr_changed_calls;
63218+extern atomic_unchecked_t fscache_n_attr_changed;
63219+extern atomic_unchecked_t fscache_n_attr_changed_ok;
63220+extern atomic_unchecked_t fscache_n_attr_changed_nobufs;
63221+extern atomic_unchecked_t fscache_n_attr_changed_nomem;
63222+extern atomic_unchecked_t fscache_n_attr_changed_calls;
63223
63224-extern atomic_t fscache_n_allocs;
63225-extern atomic_t fscache_n_allocs_ok;
63226-extern atomic_t fscache_n_allocs_wait;
63227-extern atomic_t fscache_n_allocs_nobufs;
63228-extern atomic_t fscache_n_allocs_intr;
63229-extern atomic_t fscache_n_allocs_object_dead;
63230-extern atomic_t fscache_n_alloc_ops;
63231-extern atomic_t fscache_n_alloc_op_waits;
63232+extern atomic_unchecked_t fscache_n_allocs;
63233+extern atomic_unchecked_t fscache_n_allocs_ok;
63234+extern atomic_unchecked_t fscache_n_allocs_wait;
63235+extern atomic_unchecked_t fscache_n_allocs_nobufs;
63236+extern atomic_unchecked_t fscache_n_allocs_intr;
63237+extern atomic_unchecked_t fscache_n_allocs_object_dead;
63238+extern atomic_unchecked_t fscache_n_alloc_ops;
63239+extern atomic_unchecked_t fscache_n_alloc_op_waits;
63240
63241-extern atomic_t fscache_n_retrievals;
63242-extern atomic_t fscache_n_retrievals_ok;
63243-extern atomic_t fscache_n_retrievals_wait;
63244-extern atomic_t fscache_n_retrievals_nodata;
63245-extern atomic_t fscache_n_retrievals_nobufs;
63246-extern atomic_t fscache_n_retrievals_intr;
63247-extern atomic_t fscache_n_retrievals_nomem;
63248-extern atomic_t fscache_n_retrievals_object_dead;
63249-extern atomic_t fscache_n_retrieval_ops;
63250-extern atomic_t fscache_n_retrieval_op_waits;
63251+extern atomic_unchecked_t fscache_n_retrievals;
63252+extern atomic_unchecked_t fscache_n_retrievals_ok;
63253+extern atomic_unchecked_t fscache_n_retrievals_wait;
63254+extern atomic_unchecked_t fscache_n_retrievals_nodata;
63255+extern atomic_unchecked_t fscache_n_retrievals_nobufs;
63256+extern atomic_unchecked_t fscache_n_retrievals_intr;
63257+extern atomic_unchecked_t fscache_n_retrievals_nomem;
63258+extern atomic_unchecked_t fscache_n_retrievals_object_dead;
63259+extern atomic_unchecked_t fscache_n_retrieval_ops;
63260+extern atomic_unchecked_t fscache_n_retrieval_op_waits;
63261
63262-extern atomic_t fscache_n_stores;
63263-extern atomic_t fscache_n_stores_ok;
63264-extern atomic_t fscache_n_stores_again;
63265-extern atomic_t fscache_n_stores_nobufs;
63266-extern atomic_t fscache_n_stores_oom;
63267-extern atomic_t fscache_n_store_ops;
63268-extern atomic_t fscache_n_store_calls;
63269-extern atomic_t fscache_n_store_pages;
63270-extern atomic_t fscache_n_store_radix_deletes;
63271-extern atomic_t fscache_n_store_pages_over_limit;
63272+extern atomic_unchecked_t fscache_n_stores;
63273+extern atomic_unchecked_t fscache_n_stores_ok;
63274+extern atomic_unchecked_t fscache_n_stores_again;
63275+extern atomic_unchecked_t fscache_n_stores_nobufs;
63276+extern atomic_unchecked_t fscache_n_stores_oom;
63277+extern atomic_unchecked_t fscache_n_store_ops;
63278+extern atomic_unchecked_t fscache_n_store_calls;
63279+extern atomic_unchecked_t fscache_n_store_pages;
63280+extern atomic_unchecked_t fscache_n_store_radix_deletes;
63281+extern atomic_unchecked_t fscache_n_store_pages_over_limit;
63282
63283-extern atomic_t fscache_n_store_vmscan_not_storing;
63284-extern atomic_t fscache_n_store_vmscan_gone;
63285-extern atomic_t fscache_n_store_vmscan_busy;
63286-extern atomic_t fscache_n_store_vmscan_cancelled;
63287-extern atomic_t fscache_n_store_vmscan_wait;
63288+extern atomic_unchecked_t fscache_n_store_vmscan_not_storing;
63289+extern atomic_unchecked_t fscache_n_store_vmscan_gone;
63290+extern atomic_unchecked_t fscache_n_store_vmscan_busy;
63291+extern atomic_unchecked_t fscache_n_store_vmscan_cancelled;
63292+extern atomic_unchecked_t fscache_n_store_vmscan_wait;
63293
63294-extern atomic_t fscache_n_marks;
63295-extern atomic_t fscache_n_uncaches;
63296+extern atomic_unchecked_t fscache_n_marks;
63297+extern atomic_unchecked_t fscache_n_uncaches;
63298
63299-extern atomic_t fscache_n_acquires;
63300-extern atomic_t fscache_n_acquires_null;
63301-extern atomic_t fscache_n_acquires_no_cache;
63302-extern atomic_t fscache_n_acquires_ok;
63303-extern atomic_t fscache_n_acquires_nobufs;
63304-extern atomic_t fscache_n_acquires_oom;
63305+extern atomic_unchecked_t fscache_n_acquires;
63306+extern atomic_unchecked_t fscache_n_acquires_null;
63307+extern atomic_unchecked_t fscache_n_acquires_no_cache;
63308+extern atomic_unchecked_t fscache_n_acquires_ok;
63309+extern atomic_unchecked_t fscache_n_acquires_nobufs;
63310+extern atomic_unchecked_t fscache_n_acquires_oom;
63311
63312-extern atomic_t fscache_n_invalidates;
63313-extern atomic_t fscache_n_invalidates_run;
63314+extern atomic_unchecked_t fscache_n_invalidates;
63315+extern atomic_unchecked_t fscache_n_invalidates_run;
63316
63317-extern atomic_t fscache_n_updates;
63318-extern atomic_t fscache_n_updates_null;
63319-extern atomic_t fscache_n_updates_run;
63320+extern atomic_unchecked_t fscache_n_updates;
63321+extern atomic_unchecked_t fscache_n_updates_null;
63322+extern atomic_unchecked_t fscache_n_updates_run;
63323
63324-extern atomic_t fscache_n_relinquishes;
63325-extern atomic_t fscache_n_relinquishes_null;
63326-extern atomic_t fscache_n_relinquishes_waitcrt;
63327-extern atomic_t fscache_n_relinquishes_retire;
63328+extern atomic_unchecked_t fscache_n_relinquishes;
63329+extern atomic_unchecked_t fscache_n_relinquishes_null;
63330+extern atomic_unchecked_t fscache_n_relinquishes_waitcrt;
63331+extern atomic_unchecked_t fscache_n_relinquishes_retire;
63332
63333-extern atomic_t fscache_n_cookie_index;
63334-extern atomic_t fscache_n_cookie_data;
63335-extern atomic_t fscache_n_cookie_special;
63336+extern atomic_unchecked_t fscache_n_cookie_index;
63337+extern atomic_unchecked_t fscache_n_cookie_data;
63338+extern atomic_unchecked_t fscache_n_cookie_special;
63339
63340-extern atomic_t fscache_n_object_alloc;
63341-extern atomic_t fscache_n_object_no_alloc;
63342-extern atomic_t fscache_n_object_lookups;
63343-extern atomic_t fscache_n_object_lookups_negative;
63344-extern atomic_t fscache_n_object_lookups_positive;
63345-extern atomic_t fscache_n_object_lookups_timed_out;
63346-extern atomic_t fscache_n_object_created;
63347-extern atomic_t fscache_n_object_avail;
63348-extern atomic_t fscache_n_object_dead;
63349+extern atomic_unchecked_t fscache_n_object_alloc;
63350+extern atomic_unchecked_t fscache_n_object_no_alloc;
63351+extern atomic_unchecked_t fscache_n_object_lookups;
63352+extern atomic_unchecked_t fscache_n_object_lookups_negative;
63353+extern atomic_unchecked_t fscache_n_object_lookups_positive;
63354+extern atomic_unchecked_t fscache_n_object_lookups_timed_out;
63355+extern atomic_unchecked_t fscache_n_object_created;
63356+extern atomic_unchecked_t fscache_n_object_avail;
63357+extern atomic_unchecked_t fscache_n_object_dead;
63358
63359-extern atomic_t fscache_n_checkaux_none;
63360-extern atomic_t fscache_n_checkaux_okay;
63361-extern atomic_t fscache_n_checkaux_update;
63362-extern atomic_t fscache_n_checkaux_obsolete;
63363+extern atomic_unchecked_t fscache_n_checkaux_none;
63364+extern atomic_unchecked_t fscache_n_checkaux_okay;
63365+extern atomic_unchecked_t fscache_n_checkaux_update;
63366+extern atomic_unchecked_t fscache_n_checkaux_obsolete;
63367
63368 extern atomic_t fscache_n_cop_alloc_object;
63369 extern atomic_t fscache_n_cop_lookup_object;
63370@@ -276,6 +276,11 @@ static inline void fscache_stat(atomic_t *stat)
63371 atomic_inc(stat);
63372 }
63373
63374+static inline void fscache_stat_unchecked(atomic_unchecked_t *stat)
63375+{
63376+ atomic_inc_unchecked(stat);
63377+}
63378+
63379 static inline void fscache_stat_d(atomic_t *stat)
63380 {
63381 atomic_dec(stat);
63382@@ -288,6 +293,7 @@ extern const struct file_operations fscache_stats_fops;
63383
63384 #define __fscache_stat(stat) (NULL)
63385 #define fscache_stat(stat) do {} while (0)
63386+#define fscache_stat_unchecked(stat) do {} while (0)
63387 #define fscache_stat_d(stat) do {} while (0)
63388 #endif
63389
63390diff --git a/fs/fscache/object.c b/fs/fscache/object.c
63391index da032da..0076ce7 100644
63392--- a/fs/fscache/object.c
63393+++ b/fs/fscache/object.c
63394@@ -454,7 +454,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
63395 _debug("LOOKUP \"%s\" in \"%s\"",
63396 cookie->def->name, object->cache->tag->name);
63397
63398- fscache_stat(&fscache_n_object_lookups);
63399+ fscache_stat_unchecked(&fscache_n_object_lookups);
63400 fscache_stat(&fscache_n_cop_lookup_object);
63401 ret = object->cache->ops->lookup_object(object);
63402 fscache_stat_d(&fscache_n_cop_lookup_object);
63403@@ -464,7 +464,7 @@ static const struct fscache_state *fscache_look_up_object(struct fscache_object
63404 if (ret == -ETIMEDOUT) {
63405 /* probably stuck behind another object, so move this one to
63406 * the back of the queue */
63407- fscache_stat(&fscache_n_object_lookups_timed_out);
63408+ fscache_stat_unchecked(&fscache_n_object_lookups_timed_out);
63409 _leave(" [timeout]");
63410 return NO_TRANSIT;
63411 }
63412@@ -492,7 +492,7 @@ void fscache_object_lookup_negative(struct fscache_object *object)
63413 _enter("{OBJ%x,%s}", object->debug_id, object->state->name);
63414
63415 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
63416- fscache_stat(&fscache_n_object_lookups_negative);
63417+ fscache_stat_unchecked(&fscache_n_object_lookups_negative);
63418
63419 /* Allow write requests to begin stacking up and read requests to begin
63420 * returning ENODATA.
63421@@ -527,7 +527,7 @@ void fscache_obtained_object(struct fscache_object *object)
63422 /* if we were still looking up, then we must have a positive lookup
63423 * result, in which case there may be data available */
63424 if (!test_and_set_bit(FSCACHE_OBJECT_IS_LOOKED_UP, &object->flags)) {
63425- fscache_stat(&fscache_n_object_lookups_positive);
63426+ fscache_stat_unchecked(&fscache_n_object_lookups_positive);
63427
63428 /* We do (presumably) have data */
63429 clear_bit_unlock(FSCACHE_COOKIE_NO_DATA_YET, &cookie->flags);
63430@@ -539,7 +539,7 @@ void fscache_obtained_object(struct fscache_object *object)
63431 clear_bit_unlock(FSCACHE_COOKIE_LOOKING_UP, &cookie->flags);
63432 wake_up_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP);
63433 } else {
63434- fscache_stat(&fscache_n_object_created);
63435+ fscache_stat_unchecked(&fscache_n_object_created);
63436 }
63437
63438 set_bit(FSCACHE_OBJECT_IS_AVAILABLE, &object->flags);
63439@@ -575,7 +575,7 @@ static const struct fscache_state *fscache_object_available(struct fscache_objec
63440 fscache_stat_d(&fscache_n_cop_lookup_complete);
63441
63442 fscache_hist(fscache_obj_instantiate_histogram, object->lookup_jif);
63443- fscache_stat(&fscache_n_object_avail);
63444+ fscache_stat_unchecked(&fscache_n_object_avail);
63445
63446 _leave("");
63447 return transit_to(JUMPSTART_DEPS);
63448@@ -722,7 +722,7 @@ static const struct fscache_state *fscache_drop_object(struct fscache_object *ob
63449
63450 /* this just shifts the object release to the work processor */
63451 fscache_put_object(object);
63452- fscache_stat(&fscache_n_object_dead);
63453+ fscache_stat_unchecked(&fscache_n_object_dead);
63454
63455 _leave("");
63456 return transit_to(OBJECT_DEAD);
63457@@ -887,7 +887,7 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
63458 enum fscache_checkaux result;
63459
63460 if (!object->cookie->def->check_aux) {
63461- fscache_stat(&fscache_n_checkaux_none);
63462+ fscache_stat_unchecked(&fscache_n_checkaux_none);
63463 return FSCACHE_CHECKAUX_OKAY;
63464 }
63465
63466@@ -896,17 +896,17 @@ enum fscache_checkaux fscache_check_aux(struct fscache_object *object,
63467 switch (result) {
63468 /* entry okay as is */
63469 case FSCACHE_CHECKAUX_OKAY:
63470- fscache_stat(&fscache_n_checkaux_okay);
63471+ fscache_stat_unchecked(&fscache_n_checkaux_okay);
63472 break;
63473
63474 /* entry requires update */
63475 case FSCACHE_CHECKAUX_NEEDS_UPDATE:
63476- fscache_stat(&fscache_n_checkaux_update);
63477+ fscache_stat_unchecked(&fscache_n_checkaux_update);
63478 break;
63479
63480 /* entry requires deletion */
63481 case FSCACHE_CHECKAUX_OBSOLETE:
63482- fscache_stat(&fscache_n_checkaux_obsolete);
63483+ fscache_stat_unchecked(&fscache_n_checkaux_obsolete);
63484 break;
63485
63486 default:
63487@@ -993,7 +993,7 @@ static const struct fscache_state *fscache_invalidate_object(struct fscache_obje
63488 {
63489 const struct fscache_state *s;
63490
63491- fscache_stat(&fscache_n_invalidates_run);
63492+ fscache_stat_unchecked(&fscache_n_invalidates_run);
63493 fscache_stat(&fscache_n_cop_invalidate_object);
63494 s = _fscache_invalidate_object(object, event);
63495 fscache_stat_d(&fscache_n_cop_invalidate_object);
63496@@ -1008,7 +1008,7 @@ static const struct fscache_state *fscache_update_object(struct fscache_object *
63497 {
63498 _enter("{OBJ%x},%d", object->debug_id, event);
63499
63500- fscache_stat(&fscache_n_updates_run);
63501+ fscache_stat_unchecked(&fscache_n_updates_run);
63502 fscache_stat(&fscache_n_cop_update_object);
63503 object->cache->ops->update_object(object);
63504 fscache_stat_d(&fscache_n_cop_update_object);
63505diff --git a/fs/fscache/operation.c b/fs/fscache/operation.c
63506index e7b87a0..a85d47a 100644
63507--- a/fs/fscache/operation.c
63508+++ b/fs/fscache/operation.c
63509@@ -17,7 +17,7 @@
63510 #include <linux/slab.h>
63511 #include "internal.h"
63512
63513-atomic_t fscache_op_debug_id;
63514+atomic_unchecked_t fscache_op_debug_id;
63515 EXPORT_SYMBOL(fscache_op_debug_id);
63516
63517 /**
63518@@ -39,7 +39,7 @@ void fscache_enqueue_operation(struct fscache_operation *op)
63519 ASSERTCMP(atomic_read(&op->usage), >, 0);
63520 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_IN_PROGRESS);
63521
63522- fscache_stat(&fscache_n_op_enqueue);
63523+ fscache_stat_unchecked(&fscache_n_op_enqueue);
63524 switch (op->flags & FSCACHE_OP_TYPE) {
63525 case FSCACHE_OP_ASYNC:
63526 _debug("queue async");
63527@@ -72,7 +72,7 @@ static void fscache_run_op(struct fscache_object *object,
63528 wake_up_bit(&op->flags, FSCACHE_OP_WAITING);
63529 if (op->processor)
63530 fscache_enqueue_operation(op);
63531- fscache_stat(&fscache_n_op_run);
63532+ fscache_stat_unchecked(&fscache_n_op_run);
63533 }
63534
63535 /*
63536@@ -104,11 +104,11 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
63537 if (object->n_in_progress > 0) {
63538 atomic_inc(&op->usage);
63539 list_add_tail(&op->pend_link, &object->pending_ops);
63540- fscache_stat(&fscache_n_op_pend);
63541+ fscache_stat_unchecked(&fscache_n_op_pend);
63542 } else if (!list_empty(&object->pending_ops)) {
63543 atomic_inc(&op->usage);
63544 list_add_tail(&op->pend_link, &object->pending_ops);
63545- fscache_stat(&fscache_n_op_pend);
63546+ fscache_stat_unchecked(&fscache_n_op_pend);
63547 fscache_start_operations(object);
63548 } else {
63549 ASSERTCMP(object->n_in_progress, ==, 0);
63550@@ -124,7 +124,7 @@ int fscache_submit_exclusive_op(struct fscache_object *object,
63551 object->n_exclusive++; /* reads and writes must wait */
63552 atomic_inc(&op->usage);
63553 list_add_tail(&op->pend_link, &object->pending_ops);
63554- fscache_stat(&fscache_n_op_pend);
63555+ fscache_stat_unchecked(&fscache_n_op_pend);
63556 ret = 0;
63557 } else {
63558 /* If we're in any other state, there must have been an I/O
63559@@ -211,11 +211,11 @@ int fscache_submit_op(struct fscache_object *object,
63560 if (object->n_exclusive > 0) {
63561 atomic_inc(&op->usage);
63562 list_add_tail(&op->pend_link, &object->pending_ops);
63563- fscache_stat(&fscache_n_op_pend);
63564+ fscache_stat_unchecked(&fscache_n_op_pend);
63565 } else if (!list_empty(&object->pending_ops)) {
63566 atomic_inc(&op->usage);
63567 list_add_tail(&op->pend_link, &object->pending_ops);
63568- fscache_stat(&fscache_n_op_pend);
63569+ fscache_stat_unchecked(&fscache_n_op_pend);
63570 fscache_start_operations(object);
63571 } else {
63572 ASSERTCMP(object->n_exclusive, ==, 0);
63573@@ -227,10 +227,10 @@ int fscache_submit_op(struct fscache_object *object,
63574 object->n_ops++;
63575 atomic_inc(&op->usage);
63576 list_add_tail(&op->pend_link, &object->pending_ops);
63577- fscache_stat(&fscache_n_op_pend);
63578+ fscache_stat_unchecked(&fscache_n_op_pend);
63579 ret = 0;
63580 } else if (fscache_object_is_dying(object)) {
63581- fscache_stat(&fscache_n_op_rejected);
63582+ fscache_stat_unchecked(&fscache_n_op_rejected);
63583 op->state = FSCACHE_OP_ST_CANCELLED;
63584 ret = -ENOBUFS;
63585 } else if (!test_bit(FSCACHE_IOERROR, &object->cache->flags)) {
63586@@ -309,7 +309,7 @@ int fscache_cancel_op(struct fscache_operation *op,
63587 ret = -EBUSY;
63588 if (op->state == FSCACHE_OP_ST_PENDING) {
63589 ASSERT(!list_empty(&op->pend_link));
63590- fscache_stat(&fscache_n_op_cancelled);
63591+ fscache_stat_unchecked(&fscache_n_op_cancelled);
63592 list_del_init(&op->pend_link);
63593 if (do_cancel)
63594 do_cancel(op);
63595@@ -341,7 +341,7 @@ void fscache_cancel_all_ops(struct fscache_object *object)
63596 while (!list_empty(&object->pending_ops)) {
63597 op = list_entry(object->pending_ops.next,
63598 struct fscache_operation, pend_link);
63599- fscache_stat(&fscache_n_op_cancelled);
63600+ fscache_stat_unchecked(&fscache_n_op_cancelled);
63601 list_del_init(&op->pend_link);
63602
63603 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_PENDING);
63604@@ -413,7 +413,7 @@ void fscache_put_operation(struct fscache_operation *op)
63605 op->state, ==, FSCACHE_OP_ST_CANCELLED);
63606 op->state = FSCACHE_OP_ST_DEAD;
63607
63608- fscache_stat(&fscache_n_op_release);
63609+ fscache_stat_unchecked(&fscache_n_op_release);
63610
63611 if (op->release) {
63612 op->release(op);
63613@@ -432,7 +432,7 @@ void fscache_put_operation(struct fscache_operation *op)
63614 * lock, and defer it otherwise */
63615 if (!spin_trylock(&object->lock)) {
63616 _debug("defer put");
63617- fscache_stat(&fscache_n_op_deferred_release);
63618+ fscache_stat_unchecked(&fscache_n_op_deferred_release);
63619
63620 cache = object->cache;
63621 spin_lock(&cache->op_gc_list_lock);
63622@@ -485,7 +485,7 @@ void fscache_operation_gc(struct work_struct *work)
63623
63624 _debug("GC DEFERRED REL OBJ%x OP%x",
63625 object->debug_id, op->debug_id);
63626- fscache_stat(&fscache_n_op_gc);
63627+ fscache_stat_unchecked(&fscache_n_op_gc);
63628
63629 ASSERTCMP(atomic_read(&op->usage), ==, 0);
63630 ASSERTCMP(op->state, ==, FSCACHE_OP_ST_DEAD);
63631diff --git a/fs/fscache/page.c b/fs/fscache/page.c
63632index de33b3f..8be4d29 100644
63633--- a/fs/fscache/page.c
63634+++ b/fs/fscache/page.c
63635@@ -74,7 +74,7 @@ try_again:
63636 val = radix_tree_lookup(&cookie->stores, page->index);
63637 if (!val) {
63638 rcu_read_unlock();
63639- fscache_stat(&fscache_n_store_vmscan_not_storing);
63640+ fscache_stat_unchecked(&fscache_n_store_vmscan_not_storing);
63641 __fscache_uncache_page(cookie, page);
63642 return true;
63643 }
63644@@ -104,11 +104,11 @@ try_again:
63645 spin_unlock(&cookie->stores_lock);
63646
63647 if (xpage) {
63648- fscache_stat(&fscache_n_store_vmscan_cancelled);
63649- fscache_stat(&fscache_n_store_radix_deletes);
63650+ fscache_stat_unchecked(&fscache_n_store_vmscan_cancelled);
63651+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
63652 ASSERTCMP(xpage, ==, page);
63653 } else {
63654- fscache_stat(&fscache_n_store_vmscan_gone);
63655+ fscache_stat_unchecked(&fscache_n_store_vmscan_gone);
63656 }
63657
63658 wake_up_bit(&cookie->flags, 0);
63659@@ -123,11 +123,11 @@ page_busy:
63660 * sleeping on memory allocation, so we may need to impose a timeout
63661 * too. */
63662 if (!(gfp & __GFP_WAIT) || !(gfp & __GFP_FS)) {
63663- fscache_stat(&fscache_n_store_vmscan_busy);
63664+ fscache_stat_unchecked(&fscache_n_store_vmscan_busy);
63665 return false;
63666 }
63667
63668- fscache_stat(&fscache_n_store_vmscan_wait);
63669+ fscache_stat_unchecked(&fscache_n_store_vmscan_wait);
63670 if (!release_page_wait_timeout(cookie, page))
63671 _debug("fscache writeout timeout page: %p{%lx}",
63672 page, page->index);
63673@@ -156,7 +156,7 @@ static void fscache_end_page_write(struct fscache_object *object,
63674 FSCACHE_COOKIE_STORING_TAG);
63675 if (!radix_tree_tag_get(&cookie->stores, page->index,
63676 FSCACHE_COOKIE_PENDING_TAG)) {
63677- fscache_stat(&fscache_n_store_radix_deletes);
63678+ fscache_stat_unchecked(&fscache_n_store_radix_deletes);
63679 xpage = radix_tree_delete(&cookie->stores, page->index);
63680 }
63681 spin_unlock(&cookie->stores_lock);
63682@@ -177,7 +177,7 @@ static void fscache_attr_changed_op(struct fscache_operation *op)
63683
63684 _enter("{OBJ%x OP%x}", object->debug_id, op->debug_id);
63685
63686- fscache_stat(&fscache_n_attr_changed_calls);
63687+ fscache_stat_unchecked(&fscache_n_attr_changed_calls);
63688
63689 if (fscache_object_is_active(object)) {
63690 fscache_stat(&fscache_n_cop_attr_changed);
63691@@ -204,11 +204,11 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
63692
63693 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
63694
63695- fscache_stat(&fscache_n_attr_changed);
63696+ fscache_stat_unchecked(&fscache_n_attr_changed);
63697
63698 op = kzalloc(sizeof(*op), GFP_KERNEL);
63699 if (!op) {
63700- fscache_stat(&fscache_n_attr_changed_nomem);
63701+ fscache_stat_unchecked(&fscache_n_attr_changed_nomem);
63702 _leave(" = -ENOMEM");
63703 return -ENOMEM;
63704 }
63705@@ -230,7 +230,7 @@ int __fscache_attr_changed(struct fscache_cookie *cookie)
63706 if (fscache_submit_exclusive_op(object, op) < 0)
63707 goto nobufs_dec;
63708 spin_unlock(&cookie->lock);
63709- fscache_stat(&fscache_n_attr_changed_ok);
63710+ fscache_stat_unchecked(&fscache_n_attr_changed_ok);
63711 fscache_put_operation(op);
63712 _leave(" = 0");
63713 return 0;
63714@@ -242,7 +242,7 @@ nobufs:
63715 kfree(op);
63716 if (wake_cookie)
63717 __fscache_wake_unused_cookie(cookie);
63718- fscache_stat(&fscache_n_attr_changed_nobufs);
63719+ fscache_stat_unchecked(&fscache_n_attr_changed_nobufs);
63720 _leave(" = %d", -ENOBUFS);
63721 return -ENOBUFS;
63722 }
63723@@ -281,7 +281,7 @@ static struct fscache_retrieval *fscache_alloc_retrieval(
63724 /* allocate a retrieval operation and attempt to submit it */
63725 op = kzalloc(sizeof(*op), GFP_NOIO);
63726 if (!op) {
63727- fscache_stat(&fscache_n_retrievals_nomem);
63728+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
63729 return NULL;
63730 }
63731
63732@@ -311,12 +311,12 @@ int fscache_wait_for_deferred_lookup(struct fscache_cookie *cookie)
63733 return 0;
63734 }
63735
63736- fscache_stat(&fscache_n_retrievals_wait);
63737+ fscache_stat_unchecked(&fscache_n_retrievals_wait);
63738
63739 jif = jiffies;
63740 if (wait_on_bit(&cookie->flags, FSCACHE_COOKIE_LOOKING_UP,
63741 TASK_INTERRUPTIBLE) != 0) {
63742- fscache_stat(&fscache_n_retrievals_intr);
63743+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
63744 _leave(" = -ERESTARTSYS");
63745 return -ERESTARTSYS;
63746 }
63747@@ -345,8 +345,8 @@ static void fscache_do_cancel_retrieval(struct fscache_operation *_op)
63748 */
63749 int fscache_wait_for_operation_activation(struct fscache_object *object,
63750 struct fscache_operation *op,
63751- atomic_t *stat_op_waits,
63752- atomic_t *stat_object_dead,
63753+ atomic_unchecked_t *stat_op_waits,
63754+ atomic_unchecked_t *stat_object_dead,
63755 void (*do_cancel)(struct fscache_operation *))
63756 {
63757 int ret;
63758@@ -356,7 +356,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
63759
63760 _debug(">>> WT");
63761 if (stat_op_waits)
63762- fscache_stat(stat_op_waits);
63763+ fscache_stat_unchecked(stat_op_waits);
63764 if (wait_on_bit(&op->flags, FSCACHE_OP_WAITING,
63765 TASK_INTERRUPTIBLE) != 0) {
63766 ret = fscache_cancel_op(op, do_cancel);
63767@@ -373,7 +373,7 @@ int fscache_wait_for_operation_activation(struct fscache_object *object,
63768 check_if_dead:
63769 if (op->state == FSCACHE_OP_ST_CANCELLED) {
63770 if (stat_object_dead)
63771- fscache_stat(stat_object_dead);
63772+ fscache_stat_unchecked(stat_object_dead);
63773 _leave(" = -ENOBUFS [cancelled]");
63774 return -ENOBUFS;
63775 }
63776@@ -381,7 +381,7 @@ check_if_dead:
63777 pr_err("%s() = -ENOBUFS [obj dead %d]\n", __func__, op->state);
63778 fscache_cancel_op(op, do_cancel);
63779 if (stat_object_dead)
63780- fscache_stat(stat_object_dead);
63781+ fscache_stat_unchecked(stat_object_dead);
63782 return -ENOBUFS;
63783 }
63784 return 0;
63785@@ -409,7 +409,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
63786
63787 _enter("%p,%p,,,", cookie, page);
63788
63789- fscache_stat(&fscache_n_retrievals);
63790+ fscache_stat_unchecked(&fscache_n_retrievals);
63791
63792 if (hlist_empty(&cookie->backing_objects))
63793 goto nobufs;
63794@@ -451,7 +451,7 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
63795 goto nobufs_unlock_dec;
63796 spin_unlock(&cookie->lock);
63797
63798- fscache_stat(&fscache_n_retrieval_ops);
63799+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
63800
63801 /* pin the netfs read context in case we need to do the actual netfs
63802 * read because we've encountered a cache read failure */
63803@@ -482,15 +482,15 @@ int __fscache_read_or_alloc_page(struct fscache_cookie *cookie,
63804
63805 error:
63806 if (ret == -ENOMEM)
63807- fscache_stat(&fscache_n_retrievals_nomem);
63808+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
63809 else if (ret == -ERESTARTSYS)
63810- fscache_stat(&fscache_n_retrievals_intr);
63811+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
63812 else if (ret == -ENODATA)
63813- fscache_stat(&fscache_n_retrievals_nodata);
63814+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
63815 else if (ret < 0)
63816- fscache_stat(&fscache_n_retrievals_nobufs);
63817+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
63818 else
63819- fscache_stat(&fscache_n_retrievals_ok);
63820+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
63821
63822 fscache_put_retrieval(op);
63823 _leave(" = %d", ret);
63824@@ -505,7 +505,7 @@ nobufs_unlock:
63825 __fscache_wake_unused_cookie(cookie);
63826 kfree(op);
63827 nobufs:
63828- fscache_stat(&fscache_n_retrievals_nobufs);
63829+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
63830 _leave(" = -ENOBUFS");
63831 return -ENOBUFS;
63832 }
63833@@ -544,7 +544,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
63834
63835 _enter("%p,,%d,,,", cookie, *nr_pages);
63836
63837- fscache_stat(&fscache_n_retrievals);
63838+ fscache_stat_unchecked(&fscache_n_retrievals);
63839
63840 if (hlist_empty(&cookie->backing_objects))
63841 goto nobufs;
63842@@ -582,7 +582,7 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
63843 goto nobufs_unlock_dec;
63844 spin_unlock(&cookie->lock);
63845
63846- fscache_stat(&fscache_n_retrieval_ops);
63847+ fscache_stat_unchecked(&fscache_n_retrieval_ops);
63848
63849 /* pin the netfs read context in case we need to do the actual netfs
63850 * read because we've encountered a cache read failure */
63851@@ -613,15 +613,15 @@ int __fscache_read_or_alloc_pages(struct fscache_cookie *cookie,
63852
63853 error:
63854 if (ret == -ENOMEM)
63855- fscache_stat(&fscache_n_retrievals_nomem);
63856+ fscache_stat_unchecked(&fscache_n_retrievals_nomem);
63857 else if (ret == -ERESTARTSYS)
63858- fscache_stat(&fscache_n_retrievals_intr);
63859+ fscache_stat_unchecked(&fscache_n_retrievals_intr);
63860 else if (ret == -ENODATA)
63861- fscache_stat(&fscache_n_retrievals_nodata);
63862+ fscache_stat_unchecked(&fscache_n_retrievals_nodata);
63863 else if (ret < 0)
63864- fscache_stat(&fscache_n_retrievals_nobufs);
63865+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
63866 else
63867- fscache_stat(&fscache_n_retrievals_ok);
63868+ fscache_stat_unchecked(&fscache_n_retrievals_ok);
63869
63870 fscache_put_retrieval(op);
63871 _leave(" = %d", ret);
63872@@ -636,7 +636,7 @@ nobufs_unlock:
63873 if (wake_cookie)
63874 __fscache_wake_unused_cookie(cookie);
63875 nobufs:
63876- fscache_stat(&fscache_n_retrievals_nobufs);
63877+ fscache_stat_unchecked(&fscache_n_retrievals_nobufs);
63878 _leave(" = -ENOBUFS");
63879 return -ENOBUFS;
63880 }
63881@@ -661,7 +661,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
63882
63883 _enter("%p,%p,,,", cookie, page);
63884
63885- fscache_stat(&fscache_n_allocs);
63886+ fscache_stat_unchecked(&fscache_n_allocs);
63887
63888 if (hlist_empty(&cookie->backing_objects))
63889 goto nobufs;
63890@@ -695,7 +695,7 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
63891 goto nobufs_unlock_dec;
63892 spin_unlock(&cookie->lock);
63893
63894- fscache_stat(&fscache_n_alloc_ops);
63895+ fscache_stat_unchecked(&fscache_n_alloc_ops);
63896
63897 ret = fscache_wait_for_operation_activation(
63898 object, &op->op,
63899@@ -712,11 +712,11 @@ int __fscache_alloc_page(struct fscache_cookie *cookie,
63900
63901 error:
63902 if (ret == -ERESTARTSYS)
63903- fscache_stat(&fscache_n_allocs_intr);
63904+ fscache_stat_unchecked(&fscache_n_allocs_intr);
63905 else if (ret < 0)
63906- fscache_stat(&fscache_n_allocs_nobufs);
63907+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
63908 else
63909- fscache_stat(&fscache_n_allocs_ok);
63910+ fscache_stat_unchecked(&fscache_n_allocs_ok);
63911
63912 fscache_put_retrieval(op);
63913 _leave(" = %d", ret);
63914@@ -730,7 +730,7 @@ nobufs_unlock:
63915 if (wake_cookie)
63916 __fscache_wake_unused_cookie(cookie);
63917 nobufs:
63918- fscache_stat(&fscache_n_allocs_nobufs);
63919+ fscache_stat_unchecked(&fscache_n_allocs_nobufs);
63920 _leave(" = -ENOBUFS");
63921 return -ENOBUFS;
63922 }
63923@@ -806,7 +806,7 @@ static void fscache_write_op(struct fscache_operation *_op)
63924
63925 spin_lock(&cookie->stores_lock);
63926
63927- fscache_stat(&fscache_n_store_calls);
63928+ fscache_stat_unchecked(&fscache_n_store_calls);
63929
63930 /* find a page to store */
63931 page = NULL;
63932@@ -817,7 +817,7 @@ static void fscache_write_op(struct fscache_operation *_op)
63933 page = results[0];
63934 _debug("gang %d [%lx]", n, page->index);
63935 if (page->index > op->store_limit) {
63936- fscache_stat(&fscache_n_store_pages_over_limit);
63937+ fscache_stat_unchecked(&fscache_n_store_pages_over_limit);
63938 goto superseded;
63939 }
63940
63941@@ -829,7 +829,7 @@ static void fscache_write_op(struct fscache_operation *_op)
63942 spin_unlock(&cookie->stores_lock);
63943 spin_unlock(&object->lock);
63944
63945- fscache_stat(&fscache_n_store_pages);
63946+ fscache_stat_unchecked(&fscache_n_store_pages);
63947 fscache_stat(&fscache_n_cop_write_page);
63948 ret = object->cache->ops->write_page(op, page);
63949 fscache_stat_d(&fscache_n_cop_write_page);
63950@@ -933,7 +933,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63951 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
63952 ASSERT(PageFsCache(page));
63953
63954- fscache_stat(&fscache_n_stores);
63955+ fscache_stat_unchecked(&fscache_n_stores);
63956
63957 if (test_bit(FSCACHE_COOKIE_INVALIDATING, &cookie->flags)) {
63958 _leave(" = -ENOBUFS [invalidating]");
63959@@ -992,7 +992,7 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63960 spin_unlock(&cookie->stores_lock);
63961 spin_unlock(&object->lock);
63962
63963- op->op.debug_id = atomic_inc_return(&fscache_op_debug_id);
63964+ op->op.debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
63965 op->store_limit = object->store_limit;
63966
63967 __fscache_use_cookie(cookie);
63968@@ -1001,8 +1001,8 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63969
63970 spin_unlock(&cookie->lock);
63971 radix_tree_preload_end();
63972- fscache_stat(&fscache_n_store_ops);
63973- fscache_stat(&fscache_n_stores_ok);
63974+ fscache_stat_unchecked(&fscache_n_store_ops);
63975+ fscache_stat_unchecked(&fscache_n_stores_ok);
63976
63977 /* the work queue now carries its own ref on the object */
63978 fscache_put_operation(&op->op);
63979@@ -1010,14 +1010,14 @@ int __fscache_write_page(struct fscache_cookie *cookie,
63980 return 0;
63981
63982 already_queued:
63983- fscache_stat(&fscache_n_stores_again);
63984+ fscache_stat_unchecked(&fscache_n_stores_again);
63985 already_pending:
63986 spin_unlock(&cookie->stores_lock);
63987 spin_unlock(&object->lock);
63988 spin_unlock(&cookie->lock);
63989 radix_tree_preload_end();
63990 kfree(op);
63991- fscache_stat(&fscache_n_stores_ok);
63992+ fscache_stat_unchecked(&fscache_n_stores_ok);
63993 _leave(" = 0");
63994 return 0;
63995
63996@@ -1039,14 +1039,14 @@ nobufs:
63997 kfree(op);
63998 if (wake_cookie)
63999 __fscache_wake_unused_cookie(cookie);
64000- fscache_stat(&fscache_n_stores_nobufs);
64001+ fscache_stat_unchecked(&fscache_n_stores_nobufs);
64002 _leave(" = -ENOBUFS");
64003 return -ENOBUFS;
64004
64005 nomem_free:
64006 kfree(op);
64007 nomem:
64008- fscache_stat(&fscache_n_stores_oom);
64009+ fscache_stat_unchecked(&fscache_n_stores_oom);
64010 _leave(" = -ENOMEM");
64011 return -ENOMEM;
64012 }
64013@@ -1064,7 +1064,7 @@ void __fscache_uncache_page(struct fscache_cookie *cookie, struct page *page)
64014 ASSERTCMP(cookie->def->type, !=, FSCACHE_COOKIE_TYPE_INDEX);
64015 ASSERTCMP(page, !=, NULL);
64016
64017- fscache_stat(&fscache_n_uncaches);
64018+ fscache_stat_unchecked(&fscache_n_uncaches);
64019
64020 /* cache withdrawal may beat us to it */
64021 if (!PageFsCache(page))
64022@@ -1115,7 +1115,7 @@ void fscache_mark_page_cached(struct fscache_retrieval *op, struct page *page)
64023 struct fscache_cookie *cookie = op->op.object->cookie;
64024
64025 #ifdef CONFIG_FSCACHE_STATS
64026- atomic_inc(&fscache_n_marks);
64027+ atomic_inc_unchecked(&fscache_n_marks);
64028 #endif
64029
64030 _debug("- mark %p{%lx}", page, page->index);
64031diff --git a/fs/fscache/stats.c b/fs/fscache/stats.c
64032index 40d13c7..ddf52b9 100644
64033--- a/fs/fscache/stats.c
64034+++ b/fs/fscache/stats.c
64035@@ -18,99 +18,99 @@
64036 /*
64037 * operation counters
64038 */
64039-atomic_t fscache_n_op_pend;
64040-atomic_t fscache_n_op_run;
64041-atomic_t fscache_n_op_enqueue;
64042-atomic_t fscache_n_op_requeue;
64043-atomic_t fscache_n_op_deferred_release;
64044-atomic_t fscache_n_op_release;
64045-atomic_t fscache_n_op_gc;
64046-atomic_t fscache_n_op_cancelled;
64047-atomic_t fscache_n_op_rejected;
64048+atomic_unchecked_t fscache_n_op_pend;
64049+atomic_unchecked_t fscache_n_op_run;
64050+atomic_unchecked_t fscache_n_op_enqueue;
64051+atomic_unchecked_t fscache_n_op_requeue;
64052+atomic_unchecked_t fscache_n_op_deferred_release;
64053+atomic_unchecked_t fscache_n_op_release;
64054+atomic_unchecked_t fscache_n_op_gc;
64055+atomic_unchecked_t fscache_n_op_cancelled;
64056+atomic_unchecked_t fscache_n_op_rejected;
64057
64058-atomic_t fscache_n_attr_changed;
64059-atomic_t fscache_n_attr_changed_ok;
64060-atomic_t fscache_n_attr_changed_nobufs;
64061-atomic_t fscache_n_attr_changed_nomem;
64062-atomic_t fscache_n_attr_changed_calls;
64063+atomic_unchecked_t fscache_n_attr_changed;
64064+atomic_unchecked_t fscache_n_attr_changed_ok;
64065+atomic_unchecked_t fscache_n_attr_changed_nobufs;
64066+atomic_unchecked_t fscache_n_attr_changed_nomem;
64067+atomic_unchecked_t fscache_n_attr_changed_calls;
64068
64069-atomic_t fscache_n_allocs;
64070-atomic_t fscache_n_allocs_ok;
64071-atomic_t fscache_n_allocs_wait;
64072-atomic_t fscache_n_allocs_nobufs;
64073-atomic_t fscache_n_allocs_intr;
64074-atomic_t fscache_n_allocs_object_dead;
64075-atomic_t fscache_n_alloc_ops;
64076-atomic_t fscache_n_alloc_op_waits;
64077+atomic_unchecked_t fscache_n_allocs;
64078+atomic_unchecked_t fscache_n_allocs_ok;
64079+atomic_unchecked_t fscache_n_allocs_wait;
64080+atomic_unchecked_t fscache_n_allocs_nobufs;
64081+atomic_unchecked_t fscache_n_allocs_intr;
64082+atomic_unchecked_t fscache_n_allocs_object_dead;
64083+atomic_unchecked_t fscache_n_alloc_ops;
64084+atomic_unchecked_t fscache_n_alloc_op_waits;
64085
64086-atomic_t fscache_n_retrievals;
64087-atomic_t fscache_n_retrievals_ok;
64088-atomic_t fscache_n_retrievals_wait;
64089-atomic_t fscache_n_retrievals_nodata;
64090-atomic_t fscache_n_retrievals_nobufs;
64091-atomic_t fscache_n_retrievals_intr;
64092-atomic_t fscache_n_retrievals_nomem;
64093-atomic_t fscache_n_retrievals_object_dead;
64094-atomic_t fscache_n_retrieval_ops;
64095-atomic_t fscache_n_retrieval_op_waits;
64096+atomic_unchecked_t fscache_n_retrievals;
64097+atomic_unchecked_t fscache_n_retrievals_ok;
64098+atomic_unchecked_t fscache_n_retrievals_wait;
64099+atomic_unchecked_t fscache_n_retrievals_nodata;
64100+atomic_unchecked_t fscache_n_retrievals_nobufs;
64101+atomic_unchecked_t fscache_n_retrievals_intr;
64102+atomic_unchecked_t fscache_n_retrievals_nomem;
64103+atomic_unchecked_t fscache_n_retrievals_object_dead;
64104+atomic_unchecked_t fscache_n_retrieval_ops;
64105+atomic_unchecked_t fscache_n_retrieval_op_waits;
64106
64107-atomic_t fscache_n_stores;
64108-atomic_t fscache_n_stores_ok;
64109-atomic_t fscache_n_stores_again;
64110-atomic_t fscache_n_stores_nobufs;
64111-atomic_t fscache_n_stores_oom;
64112-atomic_t fscache_n_store_ops;
64113-atomic_t fscache_n_store_calls;
64114-atomic_t fscache_n_store_pages;
64115-atomic_t fscache_n_store_radix_deletes;
64116-atomic_t fscache_n_store_pages_over_limit;
64117+atomic_unchecked_t fscache_n_stores;
64118+atomic_unchecked_t fscache_n_stores_ok;
64119+atomic_unchecked_t fscache_n_stores_again;
64120+atomic_unchecked_t fscache_n_stores_nobufs;
64121+atomic_unchecked_t fscache_n_stores_oom;
64122+atomic_unchecked_t fscache_n_store_ops;
64123+atomic_unchecked_t fscache_n_store_calls;
64124+atomic_unchecked_t fscache_n_store_pages;
64125+atomic_unchecked_t fscache_n_store_radix_deletes;
64126+atomic_unchecked_t fscache_n_store_pages_over_limit;
64127
64128-atomic_t fscache_n_store_vmscan_not_storing;
64129-atomic_t fscache_n_store_vmscan_gone;
64130-atomic_t fscache_n_store_vmscan_busy;
64131-atomic_t fscache_n_store_vmscan_cancelled;
64132-atomic_t fscache_n_store_vmscan_wait;
64133+atomic_unchecked_t fscache_n_store_vmscan_not_storing;
64134+atomic_unchecked_t fscache_n_store_vmscan_gone;
64135+atomic_unchecked_t fscache_n_store_vmscan_busy;
64136+atomic_unchecked_t fscache_n_store_vmscan_cancelled;
64137+atomic_unchecked_t fscache_n_store_vmscan_wait;
64138
64139-atomic_t fscache_n_marks;
64140-atomic_t fscache_n_uncaches;
64141+atomic_unchecked_t fscache_n_marks;
64142+atomic_unchecked_t fscache_n_uncaches;
64143
64144-atomic_t fscache_n_acquires;
64145-atomic_t fscache_n_acquires_null;
64146-atomic_t fscache_n_acquires_no_cache;
64147-atomic_t fscache_n_acquires_ok;
64148-atomic_t fscache_n_acquires_nobufs;
64149-atomic_t fscache_n_acquires_oom;
64150+atomic_unchecked_t fscache_n_acquires;
64151+atomic_unchecked_t fscache_n_acquires_null;
64152+atomic_unchecked_t fscache_n_acquires_no_cache;
64153+atomic_unchecked_t fscache_n_acquires_ok;
64154+atomic_unchecked_t fscache_n_acquires_nobufs;
64155+atomic_unchecked_t fscache_n_acquires_oom;
64156
64157-atomic_t fscache_n_invalidates;
64158-atomic_t fscache_n_invalidates_run;
64159+atomic_unchecked_t fscache_n_invalidates;
64160+atomic_unchecked_t fscache_n_invalidates_run;
64161
64162-atomic_t fscache_n_updates;
64163-atomic_t fscache_n_updates_null;
64164-atomic_t fscache_n_updates_run;
64165+atomic_unchecked_t fscache_n_updates;
64166+atomic_unchecked_t fscache_n_updates_null;
64167+atomic_unchecked_t fscache_n_updates_run;
64168
64169-atomic_t fscache_n_relinquishes;
64170-atomic_t fscache_n_relinquishes_null;
64171-atomic_t fscache_n_relinquishes_waitcrt;
64172-atomic_t fscache_n_relinquishes_retire;
64173+atomic_unchecked_t fscache_n_relinquishes;
64174+atomic_unchecked_t fscache_n_relinquishes_null;
64175+atomic_unchecked_t fscache_n_relinquishes_waitcrt;
64176+atomic_unchecked_t fscache_n_relinquishes_retire;
64177
64178-atomic_t fscache_n_cookie_index;
64179-atomic_t fscache_n_cookie_data;
64180-atomic_t fscache_n_cookie_special;
64181+atomic_unchecked_t fscache_n_cookie_index;
64182+atomic_unchecked_t fscache_n_cookie_data;
64183+atomic_unchecked_t fscache_n_cookie_special;
64184
64185-atomic_t fscache_n_object_alloc;
64186-atomic_t fscache_n_object_no_alloc;
64187-atomic_t fscache_n_object_lookups;
64188-atomic_t fscache_n_object_lookups_negative;
64189-atomic_t fscache_n_object_lookups_positive;
64190-atomic_t fscache_n_object_lookups_timed_out;
64191-atomic_t fscache_n_object_created;
64192-atomic_t fscache_n_object_avail;
64193-atomic_t fscache_n_object_dead;
64194+atomic_unchecked_t fscache_n_object_alloc;
64195+atomic_unchecked_t fscache_n_object_no_alloc;
64196+atomic_unchecked_t fscache_n_object_lookups;
64197+atomic_unchecked_t fscache_n_object_lookups_negative;
64198+atomic_unchecked_t fscache_n_object_lookups_positive;
64199+atomic_unchecked_t fscache_n_object_lookups_timed_out;
64200+atomic_unchecked_t fscache_n_object_created;
64201+atomic_unchecked_t fscache_n_object_avail;
64202+atomic_unchecked_t fscache_n_object_dead;
64203
64204-atomic_t fscache_n_checkaux_none;
64205-atomic_t fscache_n_checkaux_okay;
64206-atomic_t fscache_n_checkaux_update;
64207-atomic_t fscache_n_checkaux_obsolete;
64208+atomic_unchecked_t fscache_n_checkaux_none;
64209+atomic_unchecked_t fscache_n_checkaux_okay;
64210+atomic_unchecked_t fscache_n_checkaux_update;
64211+atomic_unchecked_t fscache_n_checkaux_obsolete;
64212
64213 atomic_t fscache_n_cop_alloc_object;
64214 atomic_t fscache_n_cop_lookup_object;
64215@@ -138,118 +138,118 @@ static int fscache_stats_show(struct seq_file *m, void *v)
64216 seq_puts(m, "FS-Cache statistics\n");
64217
64218 seq_printf(m, "Cookies: idx=%u dat=%u spc=%u\n",
64219- atomic_read(&fscache_n_cookie_index),
64220- atomic_read(&fscache_n_cookie_data),
64221- atomic_read(&fscache_n_cookie_special));
64222+ atomic_read_unchecked(&fscache_n_cookie_index),
64223+ atomic_read_unchecked(&fscache_n_cookie_data),
64224+ atomic_read_unchecked(&fscache_n_cookie_special));
64225
64226 seq_printf(m, "Objects: alc=%u nal=%u avl=%u ded=%u\n",
64227- atomic_read(&fscache_n_object_alloc),
64228- atomic_read(&fscache_n_object_no_alloc),
64229- atomic_read(&fscache_n_object_avail),
64230- atomic_read(&fscache_n_object_dead));
64231+ atomic_read_unchecked(&fscache_n_object_alloc),
64232+ atomic_read_unchecked(&fscache_n_object_no_alloc),
64233+ atomic_read_unchecked(&fscache_n_object_avail),
64234+ atomic_read_unchecked(&fscache_n_object_dead));
64235 seq_printf(m, "ChkAux : non=%u ok=%u upd=%u obs=%u\n",
64236- atomic_read(&fscache_n_checkaux_none),
64237- atomic_read(&fscache_n_checkaux_okay),
64238- atomic_read(&fscache_n_checkaux_update),
64239- atomic_read(&fscache_n_checkaux_obsolete));
64240+ atomic_read_unchecked(&fscache_n_checkaux_none),
64241+ atomic_read_unchecked(&fscache_n_checkaux_okay),
64242+ atomic_read_unchecked(&fscache_n_checkaux_update),
64243+ atomic_read_unchecked(&fscache_n_checkaux_obsolete));
64244
64245 seq_printf(m, "Pages : mrk=%u unc=%u\n",
64246- atomic_read(&fscache_n_marks),
64247- atomic_read(&fscache_n_uncaches));
64248+ atomic_read_unchecked(&fscache_n_marks),
64249+ atomic_read_unchecked(&fscache_n_uncaches));
64250
64251 seq_printf(m, "Acquire: n=%u nul=%u noc=%u ok=%u nbf=%u"
64252 " oom=%u\n",
64253- atomic_read(&fscache_n_acquires),
64254- atomic_read(&fscache_n_acquires_null),
64255- atomic_read(&fscache_n_acquires_no_cache),
64256- atomic_read(&fscache_n_acquires_ok),
64257- atomic_read(&fscache_n_acquires_nobufs),
64258- atomic_read(&fscache_n_acquires_oom));
64259+ atomic_read_unchecked(&fscache_n_acquires),
64260+ atomic_read_unchecked(&fscache_n_acquires_null),
64261+ atomic_read_unchecked(&fscache_n_acquires_no_cache),
64262+ atomic_read_unchecked(&fscache_n_acquires_ok),
64263+ atomic_read_unchecked(&fscache_n_acquires_nobufs),
64264+ atomic_read_unchecked(&fscache_n_acquires_oom));
64265
64266 seq_printf(m, "Lookups: n=%u neg=%u pos=%u crt=%u tmo=%u\n",
64267- atomic_read(&fscache_n_object_lookups),
64268- atomic_read(&fscache_n_object_lookups_negative),
64269- atomic_read(&fscache_n_object_lookups_positive),
64270- atomic_read(&fscache_n_object_created),
64271- atomic_read(&fscache_n_object_lookups_timed_out));
64272+ atomic_read_unchecked(&fscache_n_object_lookups),
64273+ atomic_read_unchecked(&fscache_n_object_lookups_negative),
64274+ atomic_read_unchecked(&fscache_n_object_lookups_positive),
64275+ atomic_read_unchecked(&fscache_n_object_created),
64276+ atomic_read_unchecked(&fscache_n_object_lookups_timed_out));
64277
64278 seq_printf(m, "Invals : n=%u run=%u\n",
64279- atomic_read(&fscache_n_invalidates),
64280- atomic_read(&fscache_n_invalidates_run));
64281+ atomic_read_unchecked(&fscache_n_invalidates),
64282+ atomic_read_unchecked(&fscache_n_invalidates_run));
64283
64284 seq_printf(m, "Updates: n=%u nul=%u run=%u\n",
64285- atomic_read(&fscache_n_updates),
64286- atomic_read(&fscache_n_updates_null),
64287- atomic_read(&fscache_n_updates_run));
64288+ atomic_read_unchecked(&fscache_n_updates),
64289+ atomic_read_unchecked(&fscache_n_updates_null),
64290+ atomic_read_unchecked(&fscache_n_updates_run));
64291
64292 seq_printf(m, "Relinqs: n=%u nul=%u wcr=%u rtr=%u\n",
64293- atomic_read(&fscache_n_relinquishes),
64294- atomic_read(&fscache_n_relinquishes_null),
64295- atomic_read(&fscache_n_relinquishes_waitcrt),
64296- atomic_read(&fscache_n_relinquishes_retire));
64297+ atomic_read_unchecked(&fscache_n_relinquishes),
64298+ atomic_read_unchecked(&fscache_n_relinquishes_null),
64299+ atomic_read_unchecked(&fscache_n_relinquishes_waitcrt),
64300+ atomic_read_unchecked(&fscache_n_relinquishes_retire));
64301
64302 seq_printf(m, "AttrChg: n=%u ok=%u nbf=%u oom=%u run=%u\n",
64303- atomic_read(&fscache_n_attr_changed),
64304- atomic_read(&fscache_n_attr_changed_ok),
64305- atomic_read(&fscache_n_attr_changed_nobufs),
64306- atomic_read(&fscache_n_attr_changed_nomem),
64307- atomic_read(&fscache_n_attr_changed_calls));
64308+ atomic_read_unchecked(&fscache_n_attr_changed),
64309+ atomic_read_unchecked(&fscache_n_attr_changed_ok),
64310+ atomic_read_unchecked(&fscache_n_attr_changed_nobufs),
64311+ atomic_read_unchecked(&fscache_n_attr_changed_nomem),
64312+ atomic_read_unchecked(&fscache_n_attr_changed_calls));
64313
64314 seq_printf(m, "Allocs : n=%u ok=%u wt=%u nbf=%u int=%u\n",
64315- atomic_read(&fscache_n_allocs),
64316- atomic_read(&fscache_n_allocs_ok),
64317- atomic_read(&fscache_n_allocs_wait),
64318- atomic_read(&fscache_n_allocs_nobufs),
64319- atomic_read(&fscache_n_allocs_intr));
64320+ atomic_read_unchecked(&fscache_n_allocs),
64321+ atomic_read_unchecked(&fscache_n_allocs_ok),
64322+ atomic_read_unchecked(&fscache_n_allocs_wait),
64323+ atomic_read_unchecked(&fscache_n_allocs_nobufs),
64324+ atomic_read_unchecked(&fscache_n_allocs_intr));
64325 seq_printf(m, "Allocs : ops=%u owt=%u abt=%u\n",
64326- atomic_read(&fscache_n_alloc_ops),
64327- atomic_read(&fscache_n_alloc_op_waits),
64328- atomic_read(&fscache_n_allocs_object_dead));
64329+ atomic_read_unchecked(&fscache_n_alloc_ops),
64330+ atomic_read_unchecked(&fscache_n_alloc_op_waits),
64331+ atomic_read_unchecked(&fscache_n_allocs_object_dead));
64332
64333 seq_printf(m, "Retrvls: n=%u ok=%u wt=%u nod=%u nbf=%u"
64334 " int=%u oom=%u\n",
64335- atomic_read(&fscache_n_retrievals),
64336- atomic_read(&fscache_n_retrievals_ok),
64337- atomic_read(&fscache_n_retrievals_wait),
64338- atomic_read(&fscache_n_retrievals_nodata),
64339- atomic_read(&fscache_n_retrievals_nobufs),
64340- atomic_read(&fscache_n_retrievals_intr),
64341- atomic_read(&fscache_n_retrievals_nomem));
64342+ atomic_read_unchecked(&fscache_n_retrievals),
64343+ atomic_read_unchecked(&fscache_n_retrievals_ok),
64344+ atomic_read_unchecked(&fscache_n_retrievals_wait),
64345+ atomic_read_unchecked(&fscache_n_retrievals_nodata),
64346+ atomic_read_unchecked(&fscache_n_retrievals_nobufs),
64347+ atomic_read_unchecked(&fscache_n_retrievals_intr),
64348+ atomic_read_unchecked(&fscache_n_retrievals_nomem));
64349 seq_printf(m, "Retrvls: ops=%u owt=%u abt=%u\n",
64350- atomic_read(&fscache_n_retrieval_ops),
64351- atomic_read(&fscache_n_retrieval_op_waits),
64352- atomic_read(&fscache_n_retrievals_object_dead));
64353+ atomic_read_unchecked(&fscache_n_retrieval_ops),
64354+ atomic_read_unchecked(&fscache_n_retrieval_op_waits),
64355+ atomic_read_unchecked(&fscache_n_retrievals_object_dead));
64356
64357 seq_printf(m, "Stores : n=%u ok=%u agn=%u nbf=%u oom=%u\n",
64358- atomic_read(&fscache_n_stores),
64359- atomic_read(&fscache_n_stores_ok),
64360- atomic_read(&fscache_n_stores_again),
64361- atomic_read(&fscache_n_stores_nobufs),
64362- atomic_read(&fscache_n_stores_oom));
64363+ atomic_read_unchecked(&fscache_n_stores),
64364+ atomic_read_unchecked(&fscache_n_stores_ok),
64365+ atomic_read_unchecked(&fscache_n_stores_again),
64366+ atomic_read_unchecked(&fscache_n_stores_nobufs),
64367+ atomic_read_unchecked(&fscache_n_stores_oom));
64368 seq_printf(m, "Stores : ops=%u run=%u pgs=%u rxd=%u olm=%u\n",
64369- atomic_read(&fscache_n_store_ops),
64370- atomic_read(&fscache_n_store_calls),
64371- atomic_read(&fscache_n_store_pages),
64372- atomic_read(&fscache_n_store_radix_deletes),
64373- atomic_read(&fscache_n_store_pages_over_limit));
64374+ atomic_read_unchecked(&fscache_n_store_ops),
64375+ atomic_read_unchecked(&fscache_n_store_calls),
64376+ atomic_read_unchecked(&fscache_n_store_pages),
64377+ atomic_read_unchecked(&fscache_n_store_radix_deletes),
64378+ atomic_read_unchecked(&fscache_n_store_pages_over_limit));
64379
64380 seq_printf(m, "VmScan : nos=%u gon=%u bsy=%u can=%u wt=%u\n",
64381- atomic_read(&fscache_n_store_vmscan_not_storing),
64382- atomic_read(&fscache_n_store_vmscan_gone),
64383- atomic_read(&fscache_n_store_vmscan_busy),
64384- atomic_read(&fscache_n_store_vmscan_cancelled),
64385- atomic_read(&fscache_n_store_vmscan_wait));
64386+ atomic_read_unchecked(&fscache_n_store_vmscan_not_storing),
64387+ atomic_read_unchecked(&fscache_n_store_vmscan_gone),
64388+ atomic_read_unchecked(&fscache_n_store_vmscan_busy),
64389+ atomic_read_unchecked(&fscache_n_store_vmscan_cancelled),
64390+ atomic_read_unchecked(&fscache_n_store_vmscan_wait));
64391
64392 seq_printf(m, "Ops : pend=%u run=%u enq=%u can=%u rej=%u\n",
64393- atomic_read(&fscache_n_op_pend),
64394- atomic_read(&fscache_n_op_run),
64395- atomic_read(&fscache_n_op_enqueue),
64396- atomic_read(&fscache_n_op_cancelled),
64397- atomic_read(&fscache_n_op_rejected));
64398+ atomic_read_unchecked(&fscache_n_op_pend),
64399+ atomic_read_unchecked(&fscache_n_op_run),
64400+ atomic_read_unchecked(&fscache_n_op_enqueue),
64401+ atomic_read_unchecked(&fscache_n_op_cancelled),
64402+ atomic_read_unchecked(&fscache_n_op_rejected));
64403 seq_printf(m, "Ops : dfr=%u rel=%u gc=%u\n",
64404- atomic_read(&fscache_n_op_deferred_release),
64405- atomic_read(&fscache_n_op_release),
64406- atomic_read(&fscache_n_op_gc));
64407+ atomic_read_unchecked(&fscache_n_op_deferred_release),
64408+ atomic_read_unchecked(&fscache_n_op_release),
64409+ atomic_read_unchecked(&fscache_n_op_gc));
64410
64411 seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
64412 atomic_read(&fscache_n_cop_alloc_object),
64413diff --git a/fs/fuse/cuse.c b/fs/fuse/cuse.c
64414index 28d0c7a..04816b7 100644
64415--- a/fs/fuse/cuse.c
64416+++ b/fs/fuse/cuse.c
64417@@ -611,10 +611,12 @@ static int __init cuse_init(void)
64418 INIT_LIST_HEAD(&cuse_conntbl[i]);
64419
64420 /* inherit and extend fuse_dev_operations */
64421- cuse_channel_fops = fuse_dev_operations;
64422- cuse_channel_fops.owner = THIS_MODULE;
64423- cuse_channel_fops.open = cuse_channel_open;
64424- cuse_channel_fops.release = cuse_channel_release;
64425+ pax_open_kernel();
64426+ memcpy((void *)&cuse_channel_fops, &fuse_dev_operations, sizeof(fuse_dev_operations));
64427+ *(void **)&cuse_channel_fops.owner = THIS_MODULE;
64428+ *(void **)&cuse_channel_fops.open = cuse_channel_open;
64429+ *(void **)&cuse_channel_fops.release = cuse_channel_release;
64430+ pax_close_kernel();
64431
64432 cuse_class = class_create(THIS_MODULE, "cuse");
64433 if (IS_ERR(cuse_class))
64434diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
64435index 39706c5..a803c71 100644
64436--- a/fs/fuse/dev.c
64437+++ b/fs/fuse/dev.c
64438@@ -1405,7 +1405,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
64439 ret = 0;
64440 pipe_lock(pipe);
64441
64442- if (!pipe->readers) {
64443+ if (!atomic_read(&pipe->readers)) {
64444 send_sig(SIGPIPE, current, 0);
64445 if (!ret)
64446 ret = -EPIPE;
64447@@ -1434,7 +1434,7 @@ static ssize_t fuse_dev_splice_read(struct file *in, loff_t *ppos,
64448 page_nr++;
64449 ret += buf->len;
64450
64451- if (pipe->files)
64452+ if (atomic_read(&pipe->files))
64453 do_wakeup = 1;
64454 }
64455
64456diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
64457index 1545b71..7fabe47 100644
64458--- a/fs/fuse/dir.c
64459+++ b/fs/fuse/dir.c
64460@@ -1394,7 +1394,7 @@ static char *read_link(struct dentry *dentry)
64461 return link;
64462 }
64463
64464-static void free_link(char *link)
64465+static void free_link(const char *link)
64466 {
64467 if (!IS_ERR(link))
64468 free_page((unsigned long) link);
64469diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c
64470index f42dffb..4a4c435 100644
64471--- a/fs/gfs2/glock.c
64472+++ b/fs/gfs2/glock.c
64473@@ -385,9 +385,9 @@ static void state_change(struct gfs2_glock *gl, unsigned int new_state)
64474 if (held1 != held2) {
64475 GLOCK_BUG_ON(gl, __lockref_is_dead(&gl->gl_lockref));
64476 if (held2)
64477- gl->gl_lockref.count++;
64478+ __lockref_inc(&gl->gl_lockref);
64479 else
64480- gl->gl_lockref.count--;
64481+ __lockref_dec(&gl->gl_lockref);
64482 }
64483 if (held1 && held2 && list_empty(&gl->gl_holders))
64484 clear_bit(GLF_QUEUED, &gl->gl_flags);
64485@@ -614,9 +614,9 @@ out:
64486 out_sched:
64487 clear_bit(GLF_LOCK, &gl->gl_flags);
64488 smp_mb__after_atomic();
64489- gl->gl_lockref.count++;
64490+ __lockref_inc(&gl->gl_lockref);
64491 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
64492- gl->gl_lockref.count--;
64493+ __lockref_dec(&gl->gl_lockref);
64494 return;
64495
64496 out_unlock:
64497@@ -742,7 +742,7 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number,
64498 gl->gl_sbd = sdp;
64499 gl->gl_flags = 0;
64500 gl->gl_name = name;
64501- gl->gl_lockref.count = 1;
64502+ __lockref_set(&gl->gl_lockref, 1);
64503 gl->gl_state = LM_ST_UNLOCKED;
64504 gl->gl_target = LM_ST_UNLOCKED;
64505 gl->gl_demote_state = LM_ST_EXCLUSIVE;
64506@@ -1020,9 +1020,9 @@ int gfs2_glock_nq(struct gfs2_holder *gh)
64507 if (unlikely((LM_FLAG_NOEXP & gh->gh_flags) &&
64508 test_and_clear_bit(GLF_FROZEN, &gl->gl_flags))) {
64509 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
64510- gl->gl_lockref.count++;
64511+ __lockref_inc(&gl->gl_lockref);
64512 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
64513- gl->gl_lockref.count--;
64514+ __lockref_dec(&gl->gl_lockref);
64515 }
64516 run_queue(gl, 1);
64517 spin_unlock(&gl->gl_spin);
64518@@ -1325,7 +1325,7 @@ void gfs2_glock_complete(struct gfs2_glock *gl, int ret)
64519 }
64520 }
64521
64522- gl->gl_lockref.count++;
64523+ __lockref_inc(&gl->gl_lockref);
64524 set_bit(GLF_REPLY_PENDING, &gl->gl_flags);
64525 spin_unlock(&gl->gl_spin);
64526
64527@@ -1384,12 +1384,12 @@ add_back_to_lru:
64528 goto add_back_to_lru;
64529 }
64530 clear_bit(GLF_LRU, &gl->gl_flags);
64531- gl->gl_lockref.count++;
64532+ __lockref_inc(&gl->gl_lockref);
64533 if (demote_ok(gl))
64534 handle_callback(gl, LM_ST_UNLOCKED, 0, false);
64535 WARN_ON(!test_and_clear_bit(GLF_LOCK, &gl->gl_flags));
64536 if (queue_delayed_work(glock_workqueue, &gl->gl_work, 0) == 0)
64537- gl->gl_lockref.count--;
64538+ __lockref_dec(&gl->gl_lockref);
64539 spin_unlock(&gl->gl_spin);
64540 cond_resched_lock(&lru_lock);
64541 }
64542@@ -1719,7 +1719,7 @@ void gfs2_dump_glock(struct seq_file *seq, const struct gfs2_glock *gl)
64543 state2str(gl->gl_demote_state), dtime,
64544 atomic_read(&gl->gl_ail_count),
64545 atomic_read(&gl->gl_revokes),
64546- (int)gl->gl_lockref.count, gl->gl_hold_time);
64547+ __lockref_read(&gl->gl_lockref), gl->gl_hold_time);
64548
64549 list_for_each_entry(gh, &gl->gl_holders, gh_list)
64550 dump_holder(seq, gh);
64551diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c
64552index fe91951..ce38a6e 100644
64553--- a/fs/gfs2/glops.c
64554+++ b/fs/gfs2/glops.c
64555@@ -544,9 +544,9 @@ static void iopen_go_callback(struct gfs2_glock *gl, bool remote)
64556
64557 if (gl->gl_demote_state == LM_ST_UNLOCKED &&
64558 gl->gl_state == LM_ST_SHARED && ip) {
64559- gl->gl_lockref.count++;
64560+ __lockref_inc(&gl->gl_lockref);
64561 if (queue_work(gfs2_delete_workqueue, &gl->gl_delete) == 0)
64562- gl->gl_lockref.count--;
64563+ __lockref_dec(&gl->gl_lockref);
64564 }
64565 }
64566
64567diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
64568index 3aa17d4..b338075 100644
64569--- a/fs/gfs2/quota.c
64570+++ b/fs/gfs2/quota.c
64571@@ -154,7 +154,7 @@ static enum lru_status gfs2_qd_isolate(struct list_head *item,
64572 if (!spin_trylock(&qd->qd_lockref.lock))
64573 return LRU_SKIP;
64574
64575- if (qd->qd_lockref.count == 0) {
64576+ if (__lockref_read(&qd->qd_lockref) == 0) {
64577 lockref_mark_dead(&qd->qd_lockref);
64578 list_lru_isolate_move(lru, &qd->qd_lru, dispose);
64579 }
64580@@ -221,7 +221,7 @@ static struct gfs2_quota_data *qd_alloc(unsigned hash, struct gfs2_sbd *sdp, str
64581 return NULL;
64582
64583 qd->qd_sbd = sdp;
64584- qd->qd_lockref.count = 1;
64585+ __lockref_set(&qd->qd_lockref, 1);
64586 spin_lock_init(&qd->qd_lockref.lock);
64587 qd->qd_id = qid;
64588 qd->qd_slot = -1;
64589@@ -312,7 +312,7 @@ static void qd_put(struct gfs2_quota_data *qd)
64590 if (lockref_put_or_lock(&qd->qd_lockref))
64591 return;
64592
64593- qd->qd_lockref.count = 0;
64594+ __lockref_set(&qd->qd_lockref, 0);
64595 list_lru_add(&gfs2_qd_lru, &qd->qd_lru);
64596 spin_unlock(&qd->qd_lockref.lock);
64597
64598diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
64599index fd62cae..3494dfa 100644
64600--- a/fs/hostfs/hostfs_kern.c
64601+++ b/fs/hostfs/hostfs_kern.c
64602@@ -908,7 +908,7 @@ static void *hostfs_follow_link(struct dentry *dentry, struct nameidata *nd)
64603
64604 static void hostfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
64605 {
64606- char *s = nd_get_link(nd);
64607+ const char *s = nd_get_link(nd);
64608 if (!IS_ERR(s))
64609 __putname(s);
64610 }
64611diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
64612index c274aca..772fa5e 100644
64613--- a/fs/hugetlbfs/inode.c
64614+++ b/fs/hugetlbfs/inode.c
64615@@ -148,6 +148,7 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
64616 struct mm_struct *mm = current->mm;
64617 struct vm_area_struct *vma;
64618 struct hstate *h = hstate_file(file);
64619+ unsigned long offset = gr_rand_threadstack_offset(mm, file, flags);
64620 struct vm_unmapped_area_info info;
64621
64622 if (len & ~huge_page_mask(h))
64623@@ -161,17 +162,26 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
64624 return addr;
64625 }
64626
64627+#ifdef CONFIG_PAX_RANDMMAP
64628+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
64629+#endif
64630+
64631 if (addr) {
64632 addr = ALIGN(addr, huge_page_size(h));
64633 vma = find_vma(mm, addr);
64634- if (TASK_SIZE - len >= addr &&
64635- (!vma || addr + len <= vma->vm_start))
64636+ if (TASK_SIZE - len >= addr && check_heap_stack_gap(vma, addr, len, offset))
64637 return addr;
64638 }
64639
64640 info.flags = 0;
64641 info.length = len;
64642 info.low_limit = TASK_UNMAPPED_BASE;
64643+
64644+#ifdef CONFIG_PAX_RANDMMAP
64645+ if (mm->pax_flags & MF_PAX_RANDMMAP)
64646+ info.low_limit += mm->delta_mmap;
64647+#endif
64648+
64649 info.high_limit = TASK_SIZE;
64650 info.align_mask = PAGE_MASK & ~huge_page_mask(h);
64651 info.align_offset = 0;
64652@@ -912,7 +922,7 @@ static struct file_system_type hugetlbfs_fs_type = {
64653 };
64654 MODULE_ALIAS_FS("hugetlbfs");
64655
64656-static struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
64657+struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
64658
64659 static int can_do_hugetlb_shm(void)
64660 {
64661diff --git a/fs/inode.c b/fs/inode.c
64662index f00b16f..b653fea 100644
64663--- a/fs/inode.c
64664+++ b/fs/inode.c
64665@@ -830,16 +830,20 @@ unsigned int get_next_ino(void)
64666 unsigned int *p = &get_cpu_var(last_ino);
64667 unsigned int res = *p;
64668
64669+start:
64670+
64671 #ifdef CONFIG_SMP
64672 if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
64673- static atomic_t shared_last_ino;
64674- int next = atomic_add_return(LAST_INO_BATCH, &shared_last_ino);
64675+ static atomic_unchecked_t shared_last_ino;
64676+ int next = atomic_add_return_unchecked(LAST_INO_BATCH, &shared_last_ino);
64677
64678 res = next - LAST_INO_BATCH;
64679 }
64680 #endif
64681
64682- *p = ++res;
64683+ if (unlikely(!++res))
64684+ goto start; /* never zero */
64685+ *p = res;
64686 put_cpu_var(last_ino);
64687 return res;
64688 }
64689diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c
64690index 4a6cf28..d3a29d3 100644
64691--- a/fs/jffs2/erase.c
64692+++ b/fs/jffs2/erase.c
64693@@ -452,7 +452,8 @@ static void jffs2_mark_erased_block(struct jffs2_sb_info *c, struct jffs2_eraseb
64694 struct jffs2_unknown_node marker = {
64695 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK),
64696 .nodetype = cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
64697- .totlen = cpu_to_je32(c->cleanmarker_size)
64698+ .totlen = cpu_to_je32(c->cleanmarker_size),
64699+ .hdr_crc = cpu_to_je32(0)
64700 };
64701
64702 jffs2_prealloc_raw_node_refs(c, jeb, 1);
64703diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
64704index 09ed551..45684f8 100644
64705--- a/fs/jffs2/wbuf.c
64706+++ b/fs/jffs2/wbuf.c
64707@@ -1023,7 +1023,8 @@ static const struct jffs2_unknown_node oob_cleanmarker =
64708 {
64709 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
64710 .nodetype = constant_cpu_to_je16(JFFS2_NODETYPE_CLEANMARKER),
64711- .totlen = constant_cpu_to_je32(8)
64712+ .totlen = constant_cpu_to_je32(8),
64713+ .hdr_crc = constant_cpu_to_je32(0)
64714 };
64715
64716 /*
64717diff --git a/fs/jfs/super.c b/fs/jfs/super.c
64718index 5d30c56..8c45372 100644
64719--- a/fs/jfs/super.c
64720+++ b/fs/jfs/super.c
64721@@ -901,7 +901,7 @@ static int __init init_jfs_fs(void)
64722
64723 jfs_inode_cachep =
64724 kmem_cache_create("jfs_ip", sizeof(struct jfs_inode_info), 0,
64725- SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD,
64726+ SLAB_RECLAIM_ACCOUNT|SLAB_MEM_SPREAD|SLAB_USERCOPY,
64727 init_once);
64728 if (jfs_inode_cachep == NULL)
64729 return -ENOMEM;
64730diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
64731index 6acc964..eca491f 100644
64732--- a/fs/kernfs/dir.c
64733+++ b/fs/kernfs/dir.c
64734@@ -182,7 +182,7 @@ struct kernfs_node *kernfs_get_parent(struct kernfs_node *kn)
64735 *
64736 * Returns 31 bit hash of ns + name (so it fits in an off_t )
64737 */
64738-static unsigned int kernfs_name_hash(const char *name, const void *ns)
64739+static unsigned int kernfs_name_hash(const unsigned char *name, const void *ns)
64740 {
64741 unsigned long hash = init_name_hash();
64742 unsigned int len = strlen(name);
64743@@ -831,6 +831,12 @@ static int kernfs_iop_mkdir(struct inode *dir, struct dentry *dentry,
64744 ret = scops->mkdir(parent, dentry->d_name.name, mode);
64745
64746 kernfs_put_active(parent);
64747+
64748+ if (!ret) {
64749+ struct dentry *dentry_ret = kernfs_iop_lookup(dir, dentry, 0);
64750+ ret = PTR_ERR_OR_ZERO(dentry_ret);
64751+ }
64752+
64753 return ret;
64754 }
64755
64756diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
64757index 2bacb99..f745182 100644
64758--- a/fs/kernfs/file.c
64759+++ b/fs/kernfs/file.c
64760@@ -34,7 +34,7 @@ static DEFINE_MUTEX(kernfs_open_file_mutex);
64761
64762 struct kernfs_open_node {
64763 atomic_t refcnt;
64764- atomic_t event;
64765+ atomic_unchecked_t event;
64766 wait_queue_head_t poll;
64767 struct list_head files; /* goes through kernfs_open_file.list */
64768 };
64769@@ -163,7 +163,7 @@ static int kernfs_seq_show(struct seq_file *sf, void *v)
64770 {
64771 struct kernfs_open_file *of = sf->private;
64772
64773- of->event = atomic_read(&of->kn->attr.open->event);
64774+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
64775
64776 return of->kn->attr.ops->seq_show(sf, v);
64777 }
64778@@ -207,7 +207,7 @@ static ssize_t kernfs_file_direct_read(struct kernfs_open_file *of,
64779 goto out_free;
64780 }
64781
64782- of->event = atomic_read(&of->kn->attr.open->event);
64783+ of->event = atomic_read_unchecked(&of->kn->attr.open->event);
64784 ops = kernfs_ops(of->kn);
64785 if (ops->read)
64786 len = ops->read(of, buf, len, *ppos);
64787@@ -272,7 +272,7 @@ static ssize_t kernfs_fop_write(struct file *file, const char __user *user_buf,
64788 {
64789 struct kernfs_open_file *of = kernfs_of(file);
64790 const struct kernfs_ops *ops;
64791- size_t len;
64792+ ssize_t len;
64793 char *buf;
64794
64795 if (of->atomic_write_len) {
64796@@ -385,12 +385,12 @@ static int kernfs_vma_page_mkwrite(struct vm_area_struct *vma,
64797 return ret;
64798 }
64799
64800-static int kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
64801- void *buf, int len, int write)
64802+static ssize_t kernfs_vma_access(struct vm_area_struct *vma, unsigned long addr,
64803+ void *buf, size_t len, int write)
64804 {
64805 struct file *file = vma->vm_file;
64806 struct kernfs_open_file *of = kernfs_of(file);
64807- int ret;
64808+ ssize_t ret;
64809
64810 if (!of->vm_ops)
64811 return -EINVAL;
64812@@ -569,7 +569,7 @@ static int kernfs_get_open_node(struct kernfs_node *kn,
64813 return -ENOMEM;
64814
64815 atomic_set(&new_on->refcnt, 0);
64816- atomic_set(&new_on->event, 1);
64817+ atomic_set_unchecked(&new_on->event, 1);
64818 init_waitqueue_head(&new_on->poll);
64819 INIT_LIST_HEAD(&new_on->files);
64820 goto retry;
64821@@ -793,7 +793,7 @@ static unsigned int kernfs_fop_poll(struct file *filp, poll_table *wait)
64822
64823 kernfs_put_active(kn);
64824
64825- if (of->event != atomic_read(&on->event))
64826+ if (of->event != atomic_read_unchecked(&on->event))
64827 goto trigger;
64828
64829 return DEFAULT_POLLMASK;
64830@@ -824,7 +824,7 @@ repeat:
64831
64832 on = kn->attr.open;
64833 if (on) {
64834- atomic_inc(&on->event);
64835+ atomic_inc_unchecked(&on->event);
64836 wake_up_interruptible(&on->poll);
64837 }
64838
64839diff --git a/fs/kernfs/symlink.c b/fs/kernfs/symlink.c
64840index 8a19889..4c3069a 100644
64841--- a/fs/kernfs/symlink.c
64842+++ b/fs/kernfs/symlink.c
64843@@ -128,7 +128,7 @@ static void *kernfs_iop_follow_link(struct dentry *dentry, struct nameidata *nd)
64844 static void kernfs_iop_put_link(struct dentry *dentry, struct nameidata *nd,
64845 void *cookie)
64846 {
64847- char *page = nd_get_link(nd);
64848+ const char *page = nd_get_link(nd);
64849 if (!IS_ERR(page))
64850 free_page((unsigned long)page);
64851 }
64852diff --git a/fs/libfs.c b/fs/libfs.c
64853index 0ab6512..cd9982d 100644
64854--- a/fs/libfs.c
64855+++ b/fs/libfs.c
64856@@ -160,6 +160,9 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
64857
64858 for (p = q->next; p != &dentry->d_subdirs; p = p->next) {
64859 struct dentry *next = list_entry(p, struct dentry, d_child);
64860+ char d_name[sizeof(next->d_iname)];
64861+ const unsigned char *name;
64862+
64863 spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED);
64864 if (!simple_positive(next)) {
64865 spin_unlock(&next->d_lock);
64866@@ -168,7 +171,12 @@ int dcache_readdir(struct file *file, struct dir_context *ctx)
64867
64868 spin_unlock(&next->d_lock);
64869 spin_unlock(&dentry->d_lock);
64870- if (!dir_emit(ctx, next->d_name.name, next->d_name.len,
64871+ name = next->d_name.name;
64872+ if (name == next->d_iname) {
64873+ memcpy(d_name, name, next->d_name.len);
64874+ name = d_name;
64875+ }
64876+ if (!dir_emit(ctx, name, next->d_name.len,
64877 next->d_inode->i_ino, dt_type(next->d_inode)))
64878 return 0;
64879 spin_lock(&dentry->d_lock);
64880@@ -1027,7 +1035,7 @@ EXPORT_SYMBOL(noop_fsync);
64881 void kfree_put_link(struct dentry *dentry, struct nameidata *nd,
64882 void *cookie)
64883 {
64884- char *s = nd_get_link(nd);
64885+ const char *s = nd_get_link(nd);
64886 if (!IS_ERR(s))
64887 kfree(s);
64888 }
64889diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
64890index acd3947..1f896e2 100644
64891--- a/fs/lockd/clntproc.c
64892+++ b/fs/lockd/clntproc.c
64893@@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt_cancel_ops;
64894 /*
64895 * Cookie counter for NLM requests
64896 */
64897-static atomic_t nlm_cookie = ATOMIC_INIT(0x1234);
64898+static atomic_unchecked_t nlm_cookie = ATOMIC_INIT(0x1234);
64899
64900 void nlmclnt_next_cookie(struct nlm_cookie *c)
64901 {
64902- u32 cookie = atomic_inc_return(&nlm_cookie);
64903+ u32 cookie = atomic_inc_return_unchecked(&nlm_cookie);
64904
64905 memcpy(c->data, &cookie, 4);
64906 c->len=4;
64907diff --git a/fs/mount.h b/fs/mount.h
64908index 6a61c2b..bd79179 100644
64909--- a/fs/mount.h
64910+++ b/fs/mount.h
64911@@ -13,7 +13,7 @@ struct mnt_namespace {
64912 u64 seq; /* Sequence number to prevent loops */
64913 wait_queue_head_t poll;
64914 u64 event;
64915-};
64916+} __randomize_layout;
64917
64918 struct mnt_pcp {
64919 int mnt_count;
64920@@ -65,7 +65,7 @@ struct mount {
64921 struct hlist_head mnt_pins;
64922 struct fs_pin mnt_umount;
64923 struct dentry *mnt_ex_mountpoint;
64924-};
64925+} __randomize_layout;
64926
64927 #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */
64928
64929diff --git a/fs/namei.c b/fs/namei.c
64930index caa38a2..3cbd0f1 100644
64931--- a/fs/namei.c
64932+++ b/fs/namei.c
64933@@ -337,17 +337,32 @@ int generic_permission(struct inode *inode, int mask)
64934 if (ret != -EACCES)
64935 return ret;
64936
64937+#ifdef CONFIG_GRKERNSEC
64938+ /* we'll block if we have to log due to a denied capability use */
64939+ if (mask & MAY_NOT_BLOCK)
64940+ return -ECHILD;
64941+#endif
64942+
64943 if (S_ISDIR(inode->i_mode)) {
64944 /* DACs are overridable for directories */
64945- if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
64946- return 0;
64947 if (!(mask & MAY_WRITE))
64948- if (capable_wrt_inode_uidgid(inode,
64949- CAP_DAC_READ_SEARCH))
64950+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
64951+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
64952 return 0;
64953+ if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
64954+ return 0;
64955 return -EACCES;
64956 }
64957 /*
64958+ * Searching includes executable on directories, else just read.
64959+ */
64960+ mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
64961+ if (mask == MAY_READ)
64962+ if (capable_wrt_inode_uidgid_nolog(inode, CAP_DAC_OVERRIDE) ||
64963+ capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
64964+ return 0;
64965+
64966+ /*
64967 * Read/write DACs are always overridable.
64968 * Executable DACs are overridable when there is
64969 * at least one exec bit set.
64970@@ -356,14 +371,6 @@ int generic_permission(struct inode *inode, int mask)
64971 if (capable_wrt_inode_uidgid(inode, CAP_DAC_OVERRIDE))
64972 return 0;
64973
64974- /*
64975- * Searching includes executable on directories, else just read.
64976- */
64977- mask &= MAY_READ | MAY_WRITE | MAY_EXEC;
64978- if (mask == MAY_READ)
64979- if (capable_wrt_inode_uidgid(inode, CAP_DAC_READ_SEARCH))
64980- return 0;
64981-
64982 return -EACCES;
64983 }
64984 EXPORT_SYMBOL(generic_permission);
64985@@ -503,7 +510,7 @@ struct nameidata {
64986 int last_type;
64987 unsigned depth;
64988 struct file *base;
64989- char *saved_names[MAX_NESTED_LINKS + 1];
64990+ const char *saved_names[MAX_NESTED_LINKS + 1];
64991 };
64992
64993 /*
64994@@ -714,13 +721,13 @@ void nd_jump_link(struct nameidata *nd, struct path *path)
64995 nd->flags |= LOOKUP_JUMPED;
64996 }
64997
64998-void nd_set_link(struct nameidata *nd, char *path)
64999+void nd_set_link(struct nameidata *nd, const char *path)
65000 {
65001 nd->saved_names[nd->depth] = path;
65002 }
65003 EXPORT_SYMBOL(nd_set_link);
65004
65005-char *nd_get_link(struct nameidata *nd)
65006+const char *nd_get_link(const struct nameidata *nd)
65007 {
65008 return nd->saved_names[nd->depth];
65009 }
65010@@ -855,7 +862,7 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
65011 {
65012 struct dentry *dentry = link->dentry;
65013 int error;
65014- char *s;
65015+ const char *s;
65016
65017 BUG_ON(nd->flags & LOOKUP_RCU);
65018
65019@@ -876,6 +883,12 @@ follow_link(struct path *link, struct nameidata *nd, void **p)
65020 if (error)
65021 goto out_put_nd_path;
65022
65023+ if (gr_handle_follow_link(dentry->d_parent->d_inode,
65024+ dentry->d_inode, dentry, nd->path.mnt)) {
65025+ error = -EACCES;
65026+ goto out_put_nd_path;
65027+ }
65028+
65029 nd->last_type = LAST_BIND;
65030 *p = dentry->d_inode->i_op->follow_link(dentry, nd);
65031 error = PTR_ERR(*p);
65032@@ -1640,6 +1653,8 @@ static inline int nested_symlink(struct path *path, struct nameidata *nd)
65033 if (res)
65034 break;
65035 res = walk_component(nd, path, LOOKUP_FOLLOW);
65036+ if (res >= 0 && gr_handle_symlink_owner(&link, nd->inode))
65037+ res = -EACCES;
65038 put_link(nd, &link, cookie);
65039 } while (res > 0);
65040
65041@@ -1712,7 +1727,7 @@ EXPORT_SYMBOL(full_name_hash);
65042 static inline u64 hash_name(const char *name)
65043 {
65044 unsigned long a, b, adata, bdata, mask, hash, len;
65045- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
65046+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
65047
65048 hash = a = 0;
65049 len = -sizeof(unsigned long);
65050@@ -2007,6 +2022,8 @@ static int path_lookupat(int dfd, const char *name,
65051 if (err)
65052 break;
65053 err = lookup_last(nd, &path);
65054+ if (!err && gr_handle_symlink_owner(&link, nd->inode))
65055+ err = -EACCES;
65056 put_link(nd, &link, cookie);
65057 }
65058 }
65059@@ -2014,6 +2031,13 @@ static int path_lookupat(int dfd, const char *name,
65060 if (!err)
65061 err = complete_walk(nd);
65062
65063+ if (!err && !(nd->flags & LOOKUP_PARENT)) {
65064+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
65065+ path_put(&nd->path);
65066+ err = -ENOENT;
65067+ }
65068+ }
65069+
65070 if (!err && nd->flags & LOOKUP_DIRECTORY) {
65071 if (!d_can_lookup(nd->path.dentry)) {
65072 path_put(&nd->path);
65073@@ -2035,8 +2059,15 @@ static int filename_lookup(int dfd, struct filename *name,
65074 retval = path_lookupat(dfd, name->name,
65075 flags | LOOKUP_REVAL, nd);
65076
65077- if (likely(!retval))
65078+ if (likely(!retval)) {
65079 audit_inode(name, nd->path.dentry, flags & LOOKUP_PARENT);
65080+ if (name->name[0] != '/' && nd->path.dentry && nd->inode) {
65081+ if (!gr_chroot_fchdir(nd->path.dentry, nd->path.mnt)) {
65082+ path_put(&nd->path);
65083+ return -ENOENT;
65084+ }
65085+ }
65086+ }
65087 return retval;
65088 }
65089
65090@@ -2615,6 +2646,13 @@ static int may_open(struct path *path, int acc_mode, int flag)
65091 if (flag & O_NOATIME && !inode_owner_or_capable(inode))
65092 return -EPERM;
65093
65094+ if (gr_handle_rofs_blockwrite(dentry, path->mnt, acc_mode))
65095+ return -EPERM;
65096+ if (gr_handle_rawio(inode))
65097+ return -EPERM;
65098+ if (!gr_acl_handle_open(dentry, path->mnt, acc_mode))
65099+ return -EACCES;
65100+
65101 return 0;
65102 }
65103
65104@@ -2846,7 +2884,7 @@ looked_up:
65105 * cleared otherwise prior to returning.
65106 */
65107 static int lookup_open(struct nameidata *nd, struct path *path,
65108- struct file *file,
65109+ struct path *link, struct file *file,
65110 const struct open_flags *op,
65111 bool got_write, int *opened)
65112 {
65113@@ -2881,6 +2919,17 @@ static int lookup_open(struct nameidata *nd, struct path *path,
65114 /* Negative dentry, just create the file */
65115 if (!dentry->d_inode && (op->open_flag & O_CREAT)) {
65116 umode_t mode = op->mode;
65117+
65118+ if (link && gr_handle_symlink_owner(link, dir->d_inode)) {
65119+ error = -EACCES;
65120+ goto out_dput;
65121+ }
65122+
65123+ if (!gr_acl_handle_creat(dentry, dir, nd->path.mnt, op->open_flag, op->acc_mode, mode)) {
65124+ error = -EACCES;
65125+ goto out_dput;
65126+ }
65127+
65128 if (!IS_POSIXACL(dir->d_inode))
65129 mode &= ~current_umask();
65130 /*
65131@@ -2902,6 +2951,8 @@ static int lookup_open(struct nameidata *nd, struct path *path,
65132 nd->flags & LOOKUP_EXCL);
65133 if (error)
65134 goto out_dput;
65135+ else
65136+ gr_handle_create(dentry, nd->path.mnt);
65137 }
65138 out_no_open:
65139 path->dentry = dentry;
65140@@ -2916,7 +2967,7 @@ out_dput:
65141 /*
65142 * Handle the last step of open()
65143 */
65144-static int do_last(struct nameidata *nd, struct path *path,
65145+static int do_last(struct nameidata *nd, struct path *path, struct path *link,
65146 struct file *file, const struct open_flags *op,
65147 int *opened, struct filename *name)
65148 {
65149@@ -2966,6 +3017,15 @@ static int do_last(struct nameidata *nd, struct path *path,
65150 if (error)
65151 return error;
65152
65153+ if (!gr_acl_handle_hidden_file(dir, nd->path.mnt)) {
65154+ error = -ENOENT;
65155+ goto out;
65156+ }
65157+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
65158+ error = -EACCES;
65159+ goto out;
65160+ }
65161+
65162 audit_inode(name, dir, LOOKUP_PARENT);
65163 error = -EISDIR;
65164 /* trailing slashes? */
65165@@ -2985,7 +3045,7 @@ retry_lookup:
65166 */
65167 }
65168 mutex_lock(&dir->d_inode->i_mutex);
65169- error = lookup_open(nd, path, file, op, got_write, opened);
65170+ error = lookup_open(nd, path, link, file, op, got_write, opened);
65171 mutex_unlock(&dir->d_inode->i_mutex);
65172
65173 if (error <= 0) {
65174@@ -3009,11 +3069,28 @@ retry_lookup:
65175 goto finish_open_created;
65176 }
65177
65178+ if (!gr_acl_handle_hidden_file(path->dentry, nd->path.mnt)) {
65179+ error = -ENOENT;
65180+ goto exit_dput;
65181+ }
65182+ if (link && gr_handle_symlink_owner(link, path->dentry->d_inode)) {
65183+ error = -EACCES;
65184+ goto exit_dput;
65185+ }
65186+
65187 /*
65188 * create/update audit record if it already exists.
65189 */
65190- if (d_is_positive(path->dentry))
65191+ if (d_is_positive(path->dentry)) {
65192+ /* only check if O_CREAT is specified, all other checks need to go
65193+ into may_open */
65194+ if (gr_handle_fifo(path->dentry, path->mnt, dir, open_flag, acc_mode)) {
65195+ error = -EACCES;
65196+ goto exit_dput;
65197+ }
65198+
65199 audit_inode(name, path->dentry, 0);
65200+ }
65201
65202 /*
65203 * If atomic_open() acquired write access it is dropped now due to
65204@@ -3055,6 +3132,11 @@ finish_lookup:
65205 }
65206 }
65207 BUG_ON(inode != path->dentry->d_inode);
65208+ /* if we're resolving a symlink to another symlink */
65209+ if (link && gr_handle_symlink_owner(link, inode)) {
65210+ error = -EACCES;
65211+ goto out;
65212+ }
65213 return 1;
65214 }
65215
65216@@ -3074,7 +3156,18 @@ finish_open:
65217 path_put(&save_parent);
65218 return error;
65219 }
65220+
65221+ if (!gr_acl_handle_hidden_file(nd->path.dentry, nd->path.mnt)) {
65222+ error = -ENOENT;
65223+ goto out;
65224+ }
65225+ if (link && gr_handle_symlink_owner(link, nd->inode)) {
65226+ error = -EACCES;
65227+ goto out;
65228+ }
65229+
65230 audit_inode(name, nd->path.dentry, 0);
65231+
65232 error = -EISDIR;
65233 if ((open_flag & O_CREAT) && d_is_dir(nd->path.dentry))
65234 goto out;
65235@@ -3235,7 +3328,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
65236 if (unlikely(error))
65237 goto out;
65238
65239- error = do_last(nd, &path, file, op, &opened, pathname);
65240+ error = do_last(nd, &path, NULL, file, op, &opened, pathname);
65241 while (unlikely(error > 0)) { /* trailing symlink */
65242 struct path link = path;
65243 void *cookie;
65244@@ -3253,7 +3346,7 @@ static struct file *path_openat(int dfd, struct filename *pathname,
65245 error = follow_link(&link, nd, &cookie);
65246 if (unlikely(error))
65247 break;
65248- error = do_last(nd, &path, file, op, &opened, pathname);
65249+ error = do_last(nd, &path, &link, file, op, &opened, pathname);
65250 put_link(nd, &link, cookie);
65251 }
65252 out:
65253@@ -3355,9 +3448,11 @@ static struct dentry *filename_create(int dfd, struct filename *name,
65254 goto unlock;
65255
65256 error = -EEXIST;
65257- if (d_is_positive(dentry))
65258+ if (d_is_positive(dentry)) {
65259+ if (!gr_acl_handle_hidden_file(dentry, nd.path.mnt))
65260+ error = -ENOENT;
65261 goto fail;
65262-
65263+ }
65264 /*
65265 * Special case - lookup gave negative, but... we had foo/bar/
65266 * From the vfs_mknod() POV we just have a negative dentry -
65267@@ -3422,6 +3517,20 @@ struct dentry *user_path_create(int dfd, const char __user *pathname,
65268 }
65269 EXPORT_SYMBOL(user_path_create);
65270
65271+static struct dentry *user_path_create_with_name(int dfd, const char __user *pathname, struct path *path, struct filename **to, unsigned int lookup_flags)
65272+{
65273+ struct filename *tmp = getname(pathname);
65274+ struct dentry *res;
65275+ if (IS_ERR(tmp))
65276+ return ERR_CAST(tmp);
65277+ res = kern_path_create(dfd, tmp->name, path, lookup_flags);
65278+ if (IS_ERR(res))
65279+ putname(tmp);
65280+ else
65281+ *to = tmp;
65282+ return res;
65283+}
65284+
65285 int vfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
65286 {
65287 int error = may_create(dir, dentry);
65288@@ -3485,6 +3594,17 @@ retry:
65289
65290 if (!IS_POSIXACL(path.dentry->d_inode))
65291 mode &= ~current_umask();
65292+
65293+ if (gr_handle_chroot_mknod(dentry, path.mnt, mode)) {
65294+ error = -EPERM;
65295+ goto out;
65296+ }
65297+
65298+ if (!gr_acl_handle_mknod(dentry, path.dentry, path.mnt, mode)) {
65299+ error = -EACCES;
65300+ goto out;
65301+ }
65302+
65303 error = security_path_mknod(&path, dentry, mode, dev);
65304 if (error)
65305 goto out;
65306@@ -3500,6 +3620,8 @@ retry:
65307 error = vfs_mknod(path.dentry->d_inode,dentry,mode,0);
65308 break;
65309 }
65310+ if (!error)
65311+ gr_handle_create(dentry, path.mnt);
65312 out:
65313 done_path_create(&path, dentry);
65314 if (retry_estale(error, lookup_flags)) {
65315@@ -3554,9 +3676,16 @@ retry:
65316
65317 if (!IS_POSIXACL(path.dentry->d_inode))
65318 mode &= ~current_umask();
65319+ if (!gr_acl_handle_mkdir(dentry, path.dentry, path.mnt)) {
65320+ error = -EACCES;
65321+ goto out;
65322+ }
65323 error = security_path_mkdir(&path, dentry, mode);
65324 if (!error)
65325 error = vfs_mkdir(path.dentry->d_inode, dentry, mode);
65326+ if (!error)
65327+ gr_handle_create(dentry, path.mnt);
65328+out:
65329 done_path_create(&path, dentry);
65330 if (retry_estale(error, lookup_flags)) {
65331 lookup_flags |= LOOKUP_REVAL;
65332@@ -3589,7 +3718,7 @@ void dentry_unhash(struct dentry *dentry)
65333 {
65334 shrink_dcache_parent(dentry);
65335 spin_lock(&dentry->d_lock);
65336- if (dentry->d_lockref.count == 1)
65337+ if (__lockref_read(&dentry->d_lockref) == 1)
65338 __d_drop(dentry);
65339 spin_unlock(&dentry->d_lock);
65340 }
65341@@ -3640,6 +3769,8 @@ static long do_rmdir(int dfd, const char __user *pathname)
65342 struct filename *name;
65343 struct dentry *dentry;
65344 struct nameidata nd;
65345+ u64 saved_ino = 0;
65346+ dev_t saved_dev = 0;
65347 unsigned int lookup_flags = 0;
65348 retry:
65349 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
65350@@ -3672,10 +3803,21 @@ retry:
65351 error = -ENOENT;
65352 goto exit3;
65353 }
65354+
65355+ saved_ino = gr_get_ino_from_dentry(dentry);
65356+ saved_dev = gr_get_dev_from_dentry(dentry);
65357+
65358+ if (!gr_acl_handle_rmdir(dentry, nd.path.mnt)) {
65359+ error = -EACCES;
65360+ goto exit3;
65361+ }
65362+
65363 error = security_path_rmdir(&nd.path, dentry);
65364 if (error)
65365 goto exit3;
65366 error = vfs_rmdir(nd.path.dentry->d_inode, dentry);
65367+ if (!error && (saved_dev || saved_ino))
65368+ gr_handle_delete(saved_ino, saved_dev);
65369 exit3:
65370 dput(dentry);
65371 exit2:
65372@@ -3768,6 +3910,8 @@ static long do_unlinkat(int dfd, const char __user *pathname)
65373 struct nameidata nd;
65374 struct inode *inode = NULL;
65375 struct inode *delegated_inode = NULL;
65376+ u64 saved_ino = 0;
65377+ dev_t saved_dev = 0;
65378 unsigned int lookup_flags = 0;
65379 retry:
65380 name = user_path_parent(dfd, pathname, &nd, lookup_flags);
65381@@ -3794,10 +3938,22 @@ retry_deleg:
65382 if (d_is_negative(dentry))
65383 goto slashes;
65384 ihold(inode);
65385+
65386+ if (inode->i_nlink <= 1) {
65387+ saved_ino = gr_get_ino_from_dentry(dentry);
65388+ saved_dev = gr_get_dev_from_dentry(dentry);
65389+ }
65390+ if (!gr_acl_handle_unlink(dentry, nd.path.mnt)) {
65391+ error = -EACCES;
65392+ goto exit2;
65393+ }
65394+
65395 error = security_path_unlink(&nd.path, dentry);
65396 if (error)
65397 goto exit2;
65398 error = vfs_unlink(nd.path.dentry->d_inode, dentry, &delegated_inode);
65399+ if (!error && (saved_ino || saved_dev))
65400+ gr_handle_delete(saved_ino, saved_dev);
65401 exit2:
65402 dput(dentry);
65403 }
65404@@ -3886,9 +4042,17 @@ retry:
65405 if (IS_ERR(dentry))
65406 goto out_putname;
65407
65408+ if (!gr_acl_handle_symlink(dentry, path.dentry, path.mnt, from)) {
65409+ error = -EACCES;
65410+ goto out;
65411+ }
65412+
65413 error = security_path_symlink(&path, dentry, from->name);
65414 if (!error)
65415 error = vfs_symlink(path.dentry->d_inode, dentry, from->name);
65416+ if (!error)
65417+ gr_handle_create(dentry, path.mnt);
65418+out:
65419 done_path_create(&path, dentry);
65420 if (retry_estale(error, lookup_flags)) {
65421 lookup_flags |= LOOKUP_REVAL;
65422@@ -3992,6 +4156,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,
65423 struct dentry *new_dentry;
65424 struct path old_path, new_path;
65425 struct inode *delegated_inode = NULL;
65426+ struct filename *to = NULL;
65427 int how = 0;
65428 int error;
65429
65430@@ -4015,7 +4180,7 @@ retry:
65431 if (error)
65432 return error;
65433
65434- new_dentry = user_path_create(newdfd, newname, &new_path,
65435+ new_dentry = user_path_create_with_name(newdfd, newname, &new_path, &to,
65436 (how & LOOKUP_REVAL));
65437 error = PTR_ERR(new_dentry);
65438 if (IS_ERR(new_dentry))
65439@@ -4027,11 +4192,28 @@ retry:
65440 error = may_linkat(&old_path);
65441 if (unlikely(error))
65442 goto out_dput;
65443+
65444+ if (gr_handle_hardlink(old_path.dentry, old_path.mnt,
65445+ old_path.dentry->d_inode,
65446+ old_path.dentry->d_inode->i_mode, to)) {
65447+ error = -EACCES;
65448+ goto out_dput;
65449+ }
65450+
65451+ if (!gr_acl_handle_link(new_dentry, new_path.dentry, new_path.mnt,
65452+ old_path.dentry, old_path.mnt, to)) {
65453+ error = -EACCES;
65454+ goto out_dput;
65455+ }
65456+
65457 error = security_path_link(old_path.dentry, &new_path, new_dentry);
65458 if (error)
65459 goto out_dput;
65460 error = vfs_link(old_path.dentry, new_path.dentry->d_inode, new_dentry, &delegated_inode);
65461+ if (!error)
65462+ gr_handle_create(new_dentry, new_path.mnt);
65463 out_dput:
65464+ putname(to);
65465 done_path_create(&new_path, new_dentry);
65466 if (delegated_inode) {
65467 error = break_deleg_wait(&delegated_inode);
65468@@ -4347,6 +4529,20 @@ retry_deleg:
65469 if (new_dentry == trap)
65470 goto exit5;
65471
65472+ if (gr_bad_chroot_rename(old_dentry, oldnd.path.mnt, new_dentry, newnd.path.mnt)) {
65473+ /* use EXDEV error to cause 'mv' to switch to an alternative
65474+ * method for usability
65475+ */
65476+ error = -EXDEV;
65477+ goto exit5;
65478+ }
65479+
65480+ error = gr_acl_handle_rename(new_dentry, new_dir, newnd.path.mnt,
65481+ old_dentry, old_dir->d_inode, oldnd.path.mnt,
65482+ to, flags);
65483+ if (error)
65484+ goto exit5;
65485+
65486 error = security_path_rename(&oldnd.path, old_dentry,
65487 &newnd.path, new_dentry, flags);
65488 if (error)
65489@@ -4354,6 +4550,9 @@ retry_deleg:
65490 error = vfs_rename(old_dir->d_inode, old_dentry,
65491 new_dir->d_inode, new_dentry,
65492 &delegated_inode, flags);
65493+ if (!error)
65494+ gr_handle_rename(old_dir->d_inode, new_dir->d_inode, old_dentry,
65495+ new_dentry, oldnd.path.mnt, new_dentry->d_inode ? 1 : 0, flags);
65496 exit5:
65497 dput(new_dentry);
65498 exit4:
65499@@ -4410,14 +4609,24 @@ EXPORT_SYMBOL(vfs_whiteout);
65500
65501 int readlink_copy(char __user *buffer, int buflen, const char *link)
65502 {
65503+ char tmpbuf[64];
65504+ const char *newlink;
65505 int len = PTR_ERR(link);
65506+
65507 if (IS_ERR(link))
65508 goto out;
65509
65510 len = strlen(link);
65511 if (len > (unsigned) buflen)
65512 len = buflen;
65513- if (copy_to_user(buffer, link, len))
65514+
65515+ if (len < sizeof(tmpbuf)) {
65516+ memcpy(tmpbuf, link, len);
65517+ newlink = tmpbuf;
65518+ } else
65519+ newlink = link;
65520+
65521+ if (copy_to_user(buffer, newlink, len))
65522 len = -EFAULT;
65523 out:
65524 return len;
65525diff --git a/fs/namespace.c b/fs/namespace.c
65526index 4622ee3..2db42e3 100644
65527--- a/fs/namespace.c
65528+++ b/fs/namespace.c
65529@@ -1480,6 +1480,9 @@ static int do_umount(struct mount *mnt, int flags)
65530 if (!(sb->s_flags & MS_RDONLY))
65531 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
65532 up_write(&sb->s_umount);
65533+
65534+ gr_log_remount(mnt->mnt_devname, retval);
65535+
65536 return retval;
65537 }
65538
65539@@ -1502,6 +1505,9 @@ static int do_umount(struct mount *mnt, int flags)
65540 }
65541 unlock_mount_hash();
65542 namespace_unlock();
65543+
65544+ gr_log_unmount(mnt->mnt_devname, retval);
65545+
65546 return retval;
65547 }
65548
65549@@ -1559,7 +1565,7 @@ static inline bool may_mount(void)
65550 * unixes. Our API is identical to OSF/1 to avoid making a mess of AMD
65551 */
65552
65553-SYSCALL_DEFINE2(umount, char __user *, name, int, flags)
65554+SYSCALL_DEFINE2(umount, const char __user *, name, int, flags)
65555 {
65556 struct path path;
65557 struct mount *mnt;
65558@@ -1604,7 +1610,7 @@ out:
65559 /*
65560 * The 2.0 compatible umount. No flags.
65561 */
65562-SYSCALL_DEFINE1(oldumount, char __user *, name)
65563+SYSCALL_DEFINE1(oldumount, const char __user *, name)
65564 {
65565 return sys_umount(name, 0);
65566 }
65567@@ -2670,6 +2676,16 @@ long do_mount(const char *dev_name, const char __user *dir_name,
65568 MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT |
65569 MS_STRICTATIME);
65570
65571+ if (gr_handle_rofs_mount(path.dentry, path.mnt, mnt_flags)) {
65572+ retval = -EPERM;
65573+ goto dput_out;
65574+ }
65575+
65576+ if (gr_handle_chroot_mount(path.dentry, path.mnt, dev_name)) {
65577+ retval = -EPERM;
65578+ goto dput_out;
65579+ }
65580+
65581 if (flags & MS_REMOUNT)
65582 retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags,
65583 data_page);
65584@@ -2683,7 +2699,10 @@ long do_mount(const char *dev_name, const char __user *dir_name,
65585 retval = do_new_mount(&path, type_page, flags, mnt_flags,
65586 dev_name, data_page);
65587 dput_out:
65588+ gr_log_mount(dev_name, &path, retval);
65589+
65590 path_put(&path);
65591+
65592 return retval;
65593 }
65594
65595@@ -2701,7 +2720,7 @@ static void free_mnt_ns(struct mnt_namespace *ns)
65596 * number incrementing at 10Ghz will take 12,427 years to wrap which
65597 * is effectively never, so we can ignore the possibility.
65598 */
65599-static atomic64_t mnt_ns_seq = ATOMIC64_INIT(1);
65600+static atomic64_unchecked_t mnt_ns_seq = ATOMIC64_INIT(1);
65601
65602 static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
65603 {
65604@@ -2717,7 +2736,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
65605 return ERR_PTR(ret);
65606 }
65607 new_ns->ns.ops = &mntns_operations;
65608- new_ns->seq = atomic64_add_return(1, &mnt_ns_seq);
65609+ new_ns->seq = atomic64_add_return_unchecked(1, &mnt_ns_seq);
65610 atomic_set(&new_ns->count, 1);
65611 new_ns->root = NULL;
65612 INIT_LIST_HEAD(&new_ns->list);
65613@@ -2727,7 +2746,7 @@ static struct mnt_namespace *alloc_mnt_ns(struct user_namespace *user_ns)
65614 return new_ns;
65615 }
65616
65617-struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
65618+__latent_entropy struct mnt_namespace *copy_mnt_ns(unsigned long flags, struct mnt_namespace *ns,
65619 struct user_namespace *user_ns, struct fs_struct *new_fs)
65620 {
65621 struct mnt_namespace *new_ns;
65622@@ -2848,8 +2867,8 @@ struct dentry *mount_subtree(struct vfsmount *mnt, const char *name)
65623 }
65624 EXPORT_SYMBOL(mount_subtree);
65625
65626-SYSCALL_DEFINE5(mount, char __user *, dev_name, char __user *, dir_name,
65627- char __user *, type, unsigned long, flags, void __user *, data)
65628+SYSCALL_DEFINE5(mount, const char __user *, dev_name, const char __user *, dir_name,
65629+ const char __user *, type, unsigned long, flags, void __user *, data)
65630 {
65631 int ret;
65632 char *kernel_type;
65633@@ -2955,6 +2974,11 @@ SYSCALL_DEFINE2(pivot_root, const char __user *, new_root,
65634 if (error)
65635 goto out2;
65636
65637+ if (gr_handle_chroot_pivot()) {
65638+ error = -EPERM;
65639+ goto out2;
65640+ }
65641+
65642 get_fs_root(current->fs, &root);
65643 old_mp = lock_mount(&old);
65644 error = PTR_ERR(old_mp);
65645@@ -3229,7 +3253,7 @@ static int mntns_install(struct nsproxy *nsproxy, struct ns_common *ns)
65646 !ns_capable(current_user_ns(), CAP_SYS_ADMIN))
65647 return -EPERM;
65648
65649- if (fs->users != 1)
65650+ if (atomic_read(&fs->users) != 1)
65651 return -EINVAL;
65652
65653 get_mnt_ns(mnt_ns);
65654diff --git a/fs/nfs/callback_xdr.c b/fs/nfs/callback_xdr.c
65655index 19ca95c..b28702c 100644
65656--- a/fs/nfs/callback_xdr.c
65657+++ b/fs/nfs/callback_xdr.c
65658@@ -51,7 +51,7 @@ struct callback_op {
65659 callback_decode_arg_t decode_args;
65660 callback_encode_res_t encode_res;
65661 long res_maxsize;
65662-};
65663+} __do_const;
65664
65665 static struct callback_op callback_ops[];
65666
65667diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
65668index d42dff6..ecbdf42 100644
65669--- a/fs/nfs/inode.c
65670+++ b/fs/nfs/inode.c
65671@@ -1270,16 +1270,16 @@ static int nfs_ctime_need_update(const struct inode *inode, const struct nfs_fat
65672 return timespec_compare(&fattr->ctime, &inode->i_ctime) > 0;
65673 }
65674
65675-static atomic_long_t nfs_attr_generation_counter;
65676+static atomic_long_unchecked_t nfs_attr_generation_counter;
65677
65678 static unsigned long nfs_read_attr_generation_counter(void)
65679 {
65680- return atomic_long_read(&nfs_attr_generation_counter);
65681+ return atomic_long_read_unchecked(&nfs_attr_generation_counter);
65682 }
65683
65684 unsigned long nfs_inc_attr_generation_counter(void)
65685 {
65686- return atomic_long_inc_return(&nfs_attr_generation_counter);
65687+ return atomic_long_inc_return_unchecked(&nfs_attr_generation_counter);
65688 }
65689 EXPORT_SYMBOL_GPL(nfs_inc_attr_generation_counter);
65690
65691diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
65692index 5416968..0942042 100644
65693--- a/fs/nfsd/nfs4proc.c
65694+++ b/fs/nfsd/nfs4proc.c
65695@@ -1496,7 +1496,7 @@ struct nfsd4_operation {
65696 nfsd4op_rsize op_rsize_bop;
65697 stateid_getter op_get_currentstateid;
65698 stateid_setter op_set_currentstateid;
65699-};
65700+} __do_const;
65701
65702 static struct nfsd4_operation nfsd4_ops[];
65703
65704diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
65705index 5b33ce1..c2a92aa 100644
65706--- a/fs/nfsd/nfs4xdr.c
65707+++ b/fs/nfsd/nfs4xdr.c
65708@@ -1703,7 +1703,7 @@ nfsd4_decode_notsupp(struct nfsd4_compoundargs *argp, void *p)
65709
65710 typedef __be32(*nfsd4_dec)(struct nfsd4_compoundargs *argp, void *);
65711
65712-static nfsd4_dec nfsd4_dec_ops[] = {
65713+static const nfsd4_dec nfsd4_dec_ops[] = {
65714 [OP_ACCESS] = (nfsd4_dec)nfsd4_decode_access,
65715 [OP_CLOSE] = (nfsd4_dec)nfsd4_decode_close,
65716 [OP_COMMIT] = (nfsd4_dec)nfsd4_decode_commit,
65717diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c
65718index 46ec934..f384e41 100644
65719--- a/fs/nfsd/nfscache.c
65720+++ b/fs/nfsd/nfscache.c
65721@@ -541,7 +541,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
65722 struct kvec *resv = &rqstp->rq_res.head[0], *cachv;
65723 u32 hash;
65724 struct nfsd_drc_bucket *b;
65725- int len;
65726+ long len;
65727 size_t bufsize = 0;
65728
65729 if (!rp)
65730@@ -550,11 +550,14 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
65731 hash = nfsd_cache_hash(rp->c_xid);
65732 b = &drc_hashtbl[hash];
65733
65734- len = resv->iov_len - ((char*)statp - (char*)resv->iov_base);
65735- len >>= 2;
65736+ if (statp) {
65737+ len = (char*)statp - (char*)resv->iov_base;
65738+ len = resv->iov_len - len;
65739+ len >>= 2;
65740+ }
65741
65742 /* Don't cache excessive amounts of data and XDR failures */
65743- if (!statp || len > (256 >> 2)) {
65744+ if (!statp || len > (256 >> 2) || len < 0) {
65745 nfsd_reply_cache_free(b, rp);
65746 return;
65747 }
65748@@ -562,7 +565,7 @@ nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp)
65749 switch (cachetype) {
65750 case RC_REPLSTAT:
65751 if (len != 1)
65752- printk("nfsd: RC_REPLSTAT/reply len %d!\n",len);
65753+ printk("nfsd: RC_REPLSTAT/reply len %ld!\n",len);
65754 rp->c_replstat = *statp;
65755 break;
65756 case RC_REPLBUFF:
65757diff --git a/fs/nfsd/vfs.c b/fs/nfsd/vfs.c
65758index 3685265..e77261e 100644
65759--- a/fs/nfsd/vfs.c
65760+++ b/fs/nfsd/vfs.c
65761@@ -893,7 +893,7 @@ __be32 nfsd_readv(struct file *file, loff_t offset, struct kvec *vec, int vlen,
65762
65763 oldfs = get_fs();
65764 set_fs(KERNEL_DS);
65765- host_err = vfs_readv(file, (struct iovec __user *)vec, vlen, &offset);
65766+ host_err = vfs_readv(file, (struct iovec __force_user *)vec, vlen, &offset);
65767 set_fs(oldfs);
65768 return nfsd_finish_read(file, count, host_err);
65769 }
65770@@ -980,7 +980,7 @@ nfsd_vfs_write(struct svc_rqst *rqstp, struct svc_fh *fhp, struct file *file,
65771
65772 /* Write the data. */
65773 oldfs = get_fs(); set_fs(KERNEL_DS);
65774- host_err = vfs_writev(file, (struct iovec __user *)vec, vlen, &pos);
65775+ host_err = vfs_writev(file, (struct iovec __force_user *)vec, vlen, &pos);
65776 set_fs(oldfs);
65777 if (host_err < 0)
65778 goto out_nfserr;
65779@@ -1525,7 +1525,7 @@ nfsd_readlink(struct svc_rqst *rqstp, struct svc_fh *fhp, char *buf, int *lenp)
65780 */
65781
65782 oldfs = get_fs(); set_fs(KERNEL_DS);
65783- host_err = inode->i_op->readlink(path.dentry, (char __user *)buf, *lenp);
65784+ host_err = inode->i_op->readlink(path.dentry, (char __force_user *)buf, *lenp);
65785 set_fs(oldfs);
65786
65787 if (host_err < 0)
65788diff --git a/fs/nls/nls_base.c b/fs/nls/nls_base.c
65789index 52ccd34..7a6b202 100644
65790--- a/fs/nls/nls_base.c
65791+++ b/fs/nls/nls_base.c
65792@@ -234,21 +234,25 @@ EXPORT_SYMBOL(utf16s_to_utf8s);
65793
65794 int __register_nls(struct nls_table *nls, struct module *owner)
65795 {
65796- struct nls_table ** tmp = &tables;
65797+ struct nls_table *tmp = tables;
65798
65799 if (nls->next)
65800 return -EBUSY;
65801
65802- nls->owner = owner;
65803+ pax_open_kernel();
65804+ *(void **)&nls->owner = owner;
65805+ pax_close_kernel();
65806 spin_lock(&nls_lock);
65807- while (*tmp) {
65808- if (nls == *tmp) {
65809+ while (tmp) {
65810+ if (nls == tmp) {
65811 spin_unlock(&nls_lock);
65812 return -EBUSY;
65813 }
65814- tmp = &(*tmp)->next;
65815+ tmp = tmp->next;
65816 }
65817- nls->next = tables;
65818+ pax_open_kernel();
65819+ *(struct nls_table **)&nls->next = tables;
65820+ pax_close_kernel();
65821 tables = nls;
65822 spin_unlock(&nls_lock);
65823 return 0;
65824@@ -257,12 +261,14 @@ EXPORT_SYMBOL(__register_nls);
65825
65826 int unregister_nls(struct nls_table * nls)
65827 {
65828- struct nls_table ** tmp = &tables;
65829+ struct nls_table * const * tmp = &tables;
65830
65831 spin_lock(&nls_lock);
65832 while (*tmp) {
65833 if (nls == *tmp) {
65834- *tmp = nls->next;
65835+ pax_open_kernel();
65836+ *(struct nls_table **)tmp = nls->next;
65837+ pax_close_kernel();
65838 spin_unlock(&nls_lock);
65839 return 0;
65840 }
65841@@ -272,7 +278,7 @@ int unregister_nls(struct nls_table * nls)
65842 return -EINVAL;
65843 }
65844
65845-static struct nls_table *find_nls(char *charset)
65846+static struct nls_table *find_nls(const char *charset)
65847 {
65848 struct nls_table *nls;
65849 spin_lock(&nls_lock);
65850@@ -288,7 +294,7 @@ static struct nls_table *find_nls(char *charset)
65851 return nls;
65852 }
65853
65854-struct nls_table *load_nls(char *charset)
65855+struct nls_table *load_nls(const char *charset)
65856 {
65857 return try_then_request_module(find_nls(charset), "nls_%s", charset);
65858 }
65859diff --git a/fs/nls/nls_euc-jp.c b/fs/nls/nls_euc-jp.c
65860index 162b3f1..6076a7c 100644
65861--- a/fs/nls/nls_euc-jp.c
65862+++ b/fs/nls/nls_euc-jp.c
65863@@ -560,8 +560,10 @@ static int __init init_nls_euc_jp(void)
65864 p_nls = load_nls("cp932");
65865
65866 if (p_nls) {
65867- table.charset2upper = p_nls->charset2upper;
65868- table.charset2lower = p_nls->charset2lower;
65869+ pax_open_kernel();
65870+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
65871+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
65872+ pax_close_kernel();
65873 return register_nls(&table);
65874 }
65875
65876diff --git a/fs/nls/nls_koi8-ru.c b/fs/nls/nls_koi8-ru.c
65877index a80a741..7b96e1b 100644
65878--- a/fs/nls/nls_koi8-ru.c
65879+++ b/fs/nls/nls_koi8-ru.c
65880@@ -62,8 +62,10 @@ static int __init init_nls_koi8_ru(void)
65881 p_nls = load_nls("koi8-u");
65882
65883 if (p_nls) {
65884- table.charset2upper = p_nls->charset2upper;
65885- table.charset2lower = p_nls->charset2lower;
65886+ pax_open_kernel();
65887+ *(const unsigned char **)&table.charset2upper = p_nls->charset2upper;
65888+ *(const unsigned char **)&table.charset2lower = p_nls->charset2lower;
65889+ pax_close_kernel();
65890 return register_nls(&table);
65891 }
65892
65893diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
65894index cf27550..6c70f29d 100644
65895--- a/fs/notify/fanotify/fanotify_user.c
65896+++ b/fs/notify/fanotify/fanotify_user.c
65897@@ -216,8 +216,8 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group,
65898
65899 fd = fanotify_event_metadata.fd;
65900 ret = -EFAULT;
65901- if (copy_to_user(buf, &fanotify_event_metadata,
65902- fanotify_event_metadata.event_len))
65903+ if (fanotify_event_metadata.event_len > sizeof fanotify_event_metadata ||
65904+ copy_to_user(buf, &fanotify_event_metadata, fanotify_event_metadata.event_len))
65905 goto out_close_fd;
65906
65907 #ifdef CONFIG_FANOTIFY_ACCESS_PERMISSIONS
65908diff --git a/fs/notify/notification.c b/fs/notify/notification.c
65909index a95d8e0..a91a5fd 100644
65910--- a/fs/notify/notification.c
65911+++ b/fs/notify/notification.c
65912@@ -48,7 +48,7 @@
65913 #include <linux/fsnotify_backend.h>
65914 #include "fsnotify.h"
65915
65916-static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
65917+static atomic_unchecked_t fsnotify_sync_cookie = ATOMIC_INIT(0);
65918
65919 /**
65920 * fsnotify_get_cookie - return a unique cookie for use in synchronizing events.
65921@@ -56,7 +56,7 @@ static atomic_t fsnotify_sync_cookie = ATOMIC_INIT(0);
65922 */
65923 u32 fsnotify_get_cookie(void)
65924 {
65925- return atomic_inc_return(&fsnotify_sync_cookie);
65926+ return atomic_inc_return_unchecked(&fsnotify_sync_cookie);
65927 }
65928 EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
65929
65930diff --git a/fs/ntfs/dir.c b/fs/ntfs/dir.c
65931index 9e38daf..5727cae 100644
65932--- a/fs/ntfs/dir.c
65933+++ b/fs/ntfs/dir.c
65934@@ -1310,7 +1310,7 @@ find_next_index_buffer:
65935 ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
65936 ~(s64)(ndir->itype.index.block_size - 1)));
65937 /* Bounds checks. */
65938- if (unlikely((u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
65939+ if (unlikely(!kaddr || (u8*)ia < kaddr || (u8*)ia > kaddr + PAGE_CACHE_SIZE)) {
65940 ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
65941 "inode 0x%lx or driver bug.", vdir->i_ino);
65942 goto err_out;
65943diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
65944index 1da9b2d..9cca092a 100644
65945--- a/fs/ntfs/file.c
65946+++ b/fs/ntfs/file.c
65947@@ -1281,7 +1281,7 @@ static inline size_t ntfs_copy_from_user(struct page **pages,
65948 char *addr;
65949 size_t total = 0;
65950 unsigned len;
65951- int left;
65952+ unsigned left;
65953
65954 do {
65955 len = PAGE_CACHE_SIZE - ofs;
65956diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c
65957index 9e1e112..241a52a 100644
65958--- a/fs/ntfs/super.c
65959+++ b/fs/ntfs/super.c
65960@@ -688,7 +688,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
65961 if (!silent)
65962 ntfs_error(sb, "Primary boot sector is invalid.");
65963 } else if (!silent)
65964- ntfs_error(sb, read_err_str, "primary");
65965+ ntfs_error(sb, read_err_str, "%s", "primary");
65966 if (!(NTFS_SB(sb)->on_errors & ON_ERRORS_RECOVER)) {
65967 if (bh_primary)
65968 brelse(bh_primary);
65969@@ -704,7 +704,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
65970 goto hotfix_primary_boot_sector;
65971 brelse(bh_backup);
65972 } else if (!silent)
65973- ntfs_error(sb, read_err_str, "backup");
65974+ ntfs_error(sb, read_err_str, "%s", "backup");
65975 /* Try to read NT3.51- backup boot sector. */
65976 if ((bh_backup = sb_bread(sb, nr_blocks >> 1))) {
65977 if (is_boot_sector_ntfs(sb, (NTFS_BOOT_SECTOR*)
65978@@ -715,7 +715,7 @@ static struct buffer_head *read_ntfs_boot_sector(struct super_block *sb,
65979 "sector.");
65980 brelse(bh_backup);
65981 } else if (!silent)
65982- ntfs_error(sb, read_err_str, "backup");
65983+ ntfs_error(sb, read_err_str, "%s", "backup");
65984 /* We failed. Cleanup and return. */
65985 if (bh_primary)
65986 brelse(bh_primary);
65987diff --git a/fs/ocfs2/localalloc.c b/fs/ocfs2/localalloc.c
65988index 0440134..d52c93a 100644
65989--- a/fs/ocfs2/localalloc.c
65990+++ b/fs/ocfs2/localalloc.c
65991@@ -1320,7 +1320,7 @@ static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,
65992 goto bail;
65993 }
65994
65995- atomic_inc(&osb->alloc_stats.moves);
65996+ atomic_inc_unchecked(&osb->alloc_stats.moves);
65997
65998 bail:
65999 if (handle)
66000diff --git a/fs/ocfs2/ocfs2.h b/fs/ocfs2/ocfs2.h
66001index 460c6c3..b4ef513 100644
66002--- a/fs/ocfs2/ocfs2.h
66003+++ b/fs/ocfs2/ocfs2.h
66004@@ -247,11 +247,11 @@ enum ocfs2_vol_state
66005
66006 struct ocfs2_alloc_stats
66007 {
66008- atomic_t moves;
66009- atomic_t local_data;
66010- atomic_t bitmap_data;
66011- atomic_t bg_allocs;
66012- atomic_t bg_extends;
66013+ atomic_unchecked_t moves;
66014+ atomic_unchecked_t local_data;
66015+ atomic_unchecked_t bitmap_data;
66016+ atomic_unchecked_t bg_allocs;
66017+ atomic_unchecked_t bg_extends;
66018 };
66019
66020 enum ocfs2_local_alloc_state
66021diff --git a/fs/ocfs2/refcounttree.c b/fs/ocfs2/refcounttree.c
66022index ee541f9..df3a500 100644
66023--- a/fs/ocfs2/refcounttree.c
66024+++ b/fs/ocfs2/refcounttree.c
66025@@ -4276,7 +4276,7 @@ static int ocfs2_reflink(struct dentry *old_dentry, struct inode *dir,
66026 error = posix_acl_create(dir, &mode, &default_acl, &acl);
66027 if (error) {
66028 mlog_errno(error);
66029- goto out;
66030+ return error;
66031 }
66032
66033 error = ocfs2_create_inode_in_orphan(dir, mode,
66034diff --git a/fs/ocfs2/suballoc.c b/fs/ocfs2/suballoc.c
66035index 0cb889a..6a26b24 100644
66036--- a/fs/ocfs2/suballoc.c
66037+++ b/fs/ocfs2/suballoc.c
66038@@ -867,7 +867,7 @@ static int ocfs2_reserve_suballoc_bits(struct ocfs2_super *osb,
66039 mlog_errno(status);
66040 goto bail;
66041 }
66042- atomic_inc(&osb->alloc_stats.bg_extends);
66043+ atomic_inc_unchecked(&osb->alloc_stats.bg_extends);
66044
66045 /* You should never ask for this much metadata */
66046 BUG_ON(bits_wanted >
66047@@ -2014,7 +2014,7 @@ int ocfs2_claim_metadata(handle_t *handle,
66048 mlog_errno(status);
66049 goto bail;
66050 }
66051- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
66052+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
66053
66054 *suballoc_loc = res.sr_bg_blkno;
66055 *suballoc_bit_start = res.sr_bit_offset;
66056@@ -2180,7 +2180,7 @@ int ocfs2_claim_new_inode_at_loc(handle_t *handle,
66057 trace_ocfs2_claim_new_inode_at_loc((unsigned long long)di_blkno,
66058 res->sr_bits);
66059
66060- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
66061+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
66062
66063 BUG_ON(res->sr_bits != 1);
66064
66065@@ -2222,7 +2222,7 @@ int ocfs2_claim_new_inode(handle_t *handle,
66066 mlog_errno(status);
66067 goto bail;
66068 }
66069- atomic_inc(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
66070+ atomic_inc_unchecked(&OCFS2_SB(ac->ac_inode->i_sb)->alloc_stats.bg_allocs);
66071
66072 BUG_ON(res.sr_bits != 1);
66073
66074@@ -2326,7 +2326,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
66075 cluster_start,
66076 num_clusters);
66077 if (!status)
66078- atomic_inc(&osb->alloc_stats.local_data);
66079+ atomic_inc_unchecked(&osb->alloc_stats.local_data);
66080 } else {
66081 if (min_clusters > (osb->bitmap_cpg - 1)) {
66082 /* The only paths asking for contiguousness
66083@@ -2352,7 +2352,7 @@ int __ocfs2_claim_clusters(handle_t *handle,
66084 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
66085 res.sr_bg_blkno,
66086 res.sr_bit_offset);
66087- atomic_inc(&osb->alloc_stats.bitmap_data);
66088+ atomic_inc_unchecked(&osb->alloc_stats.bitmap_data);
66089 *num_clusters = res.sr_bits;
66090 }
66091 }
66092diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
66093index 2667518..24bcf79 100644
66094--- a/fs/ocfs2/super.c
66095+++ b/fs/ocfs2/super.c
66096@@ -308,11 +308,11 @@ static int ocfs2_osb_dump(struct ocfs2_super *osb, char *buf, int len)
66097 "%10s => GlobalAllocs: %d LocalAllocs: %d "
66098 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n",
66099 "Stats",
66100- atomic_read(&osb->alloc_stats.bitmap_data),
66101- atomic_read(&osb->alloc_stats.local_data),
66102- atomic_read(&osb->alloc_stats.bg_allocs),
66103- atomic_read(&osb->alloc_stats.moves),
66104- atomic_read(&osb->alloc_stats.bg_extends));
66105+ atomic_read_unchecked(&osb->alloc_stats.bitmap_data),
66106+ atomic_read_unchecked(&osb->alloc_stats.local_data),
66107+ atomic_read_unchecked(&osb->alloc_stats.bg_allocs),
66108+ atomic_read_unchecked(&osb->alloc_stats.moves),
66109+ atomic_read_unchecked(&osb->alloc_stats.bg_extends));
66110
66111 out += snprintf(buf + out, len - out,
66112 "%10s => State: %u Descriptor: %llu Size: %u bits "
66113@@ -2093,11 +2093,11 @@ static int ocfs2_initialize_super(struct super_block *sb,
66114
66115 mutex_init(&osb->system_file_mutex);
66116
66117- atomic_set(&osb->alloc_stats.moves, 0);
66118- atomic_set(&osb->alloc_stats.local_data, 0);
66119- atomic_set(&osb->alloc_stats.bitmap_data, 0);
66120- atomic_set(&osb->alloc_stats.bg_allocs, 0);
66121- atomic_set(&osb->alloc_stats.bg_extends, 0);
66122+ atomic_set_unchecked(&osb->alloc_stats.moves, 0);
66123+ atomic_set_unchecked(&osb->alloc_stats.local_data, 0);
66124+ atomic_set_unchecked(&osb->alloc_stats.bitmap_data, 0);
66125+ atomic_set_unchecked(&osb->alloc_stats.bg_allocs, 0);
66126+ atomic_set_unchecked(&osb->alloc_stats.bg_extends, 0);
66127
66128 /* Copy the blockcheck stats from the superblock probe */
66129 osb->osb_ecc_stats = *stats;
66130diff --git a/fs/open.c b/fs/open.c
66131index 44a3be1..5e97aa1 100644
66132--- a/fs/open.c
66133+++ b/fs/open.c
66134@@ -32,6 +32,8 @@
66135 #include <linux/dnotify.h>
66136 #include <linux/compat.h>
66137
66138+#define CREATE_TRACE_POINTS
66139+#include <trace/events/fs.h>
66140 #include "internal.h"
66141
66142 int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
66143@@ -103,6 +105,8 @@ long vfs_truncate(struct path *path, loff_t length)
66144 error = locks_verify_truncate(inode, NULL, length);
66145 if (!error)
66146 error = security_path_truncate(path);
66147+ if (!error && !gr_acl_handle_truncate(path->dentry, path->mnt))
66148+ error = -EACCES;
66149 if (!error)
66150 error = do_truncate(path->dentry, length, 0, NULL);
66151
66152@@ -187,6 +191,8 @@ static long do_sys_ftruncate(unsigned int fd, loff_t length, int small)
66153 error = locks_verify_truncate(inode, f.file, length);
66154 if (!error)
66155 error = security_path_truncate(&f.file->f_path);
66156+ if (!error && !gr_acl_handle_truncate(f.file->f_path.dentry, f.file->f_path.mnt))
66157+ error = -EACCES;
66158 if (!error)
66159 error = do_truncate(dentry, length, ATTR_MTIME|ATTR_CTIME, f.file);
66160 sb_end_write(inode->i_sb);
66161@@ -392,6 +398,9 @@ retry:
66162 if (__mnt_is_readonly(path.mnt))
66163 res = -EROFS;
66164
66165+ if (!res && !gr_acl_handle_access(path.dentry, path.mnt, mode))
66166+ res = -EACCES;
66167+
66168 out_path_release:
66169 path_put(&path);
66170 if (retry_estale(res, lookup_flags)) {
66171@@ -423,6 +432,8 @@ retry:
66172 if (error)
66173 goto dput_and_out;
66174
66175+ gr_log_chdir(path.dentry, path.mnt);
66176+
66177 set_fs_pwd(current->fs, &path);
66178
66179 dput_and_out:
66180@@ -452,6 +463,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd)
66181 goto out_putf;
66182
66183 error = inode_permission(inode, MAY_EXEC | MAY_CHDIR);
66184+
66185+ if (!error && !gr_chroot_fchdir(f.file->f_path.dentry, f.file->f_path.mnt))
66186+ error = -EPERM;
66187+
66188+ if (!error)
66189+ gr_log_chdir(f.file->f_path.dentry, f.file->f_path.mnt);
66190+
66191 if (!error)
66192 set_fs_pwd(current->fs, &f.file->f_path);
66193 out_putf:
66194@@ -481,7 +499,13 @@ retry:
66195 if (error)
66196 goto dput_and_out;
66197
66198+ if (gr_handle_chroot_chroot(path.dentry, path.mnt))
66199+ goto dput_and_out;
66200+
66201 set_fs_root(current->fs, &path);
66202+
66203+ gr_handle_chroot_chdir(&path);
66204+
66205 error = 0;
66206 dput_and_out:
66207 path_put(&path);
66208@@ -505,6 +529,16 @@ static int chmod_common(struct path *path, umode_t mode)
66209 return error;
66210 retry_deleg:
66211 mutex_lock(&inode->i_mutex);
66212+
66213+ if (!gr_acl_handle_chmod(path->dentry, path->mnt, &mode)) {
66214+ error = -EACCES;
66215+ goto out_unlock;
66216+ }
66217+ if (gr_handle_chroot_chmod(path->dentry, path->mnt, mode)) {
66218+ error = -EACCES;
66219+ goto out_unlock;
66220+ }
66221+
66222 error = security_path_chmod(path, mode);
66223 if (error)
66224 goto out_unlock;
66225@@ -570,6 +604,9 @@ static int chown_common(struct path *path, uid_t user, gid_t group)
66226 uid = make_kuid(current_user_ns(), user);
66227 gid = make_kgid(current_user_ns(), group);
66228
66229+ if (!gr_acl_handle_chown(path->dentry, path->mnt))
66230+ return -EACCES;
66231+
66232 retry_deleg:
66233 newattrs.ia_valid = ATTR_CTIME;
66234 if (user != (uid_t) -1) {
66235@@ -1017,6 +1054,7 @@ long do_sys_open(int dfd, const char __user *filename, int flags, umode_t mode)
66236 } else {
66237 fsnotify_open(f);
66238 fd_install(fd, f);
66239+ trace_do_sys_open(tmp->name, flags, mode);
66240 }
66241 }
66242 putname(tmp);
66243diff --git a/fs/overlayfs/super.c b/fs/overlayfs/super.c
66244index 5f0d199..13b74b9 100644
66245--- a/fs/overlayfs/super.c
66246+++ b/fs/overlayfs/super.c
66247@@ -172,7 +172,7 @@ void ovl_path_lower(struct dentry *dentry, struct path *path)
66248 {
66249 struct ovl_entry *oe = dentry->d_fsdata;
66250
66251- *path = oe->numlower ? oe->lowerstack[0] : (struct path) { NULL, NULL };
66252+ *path = oe->numlower ? oe->lowerstack[0] : (struct path) { .dentry = NULL, .mnt = NULL };
66253 }
66254
66255 int ovl_want_write(struct dentry *dentry)
66256@@ -816,8 +816,8 @@ static unsigned int ovl_split_lowerdirs(char *str)
66257
66258 static int ovl_fill_super(struct super_block *sb, void *data, int silent)
66259 {
66260- struct path upperpath = { NULL, NULL };
66261- struct path workpath = { NULL, NULL };
66262+ struct path upperpath = { .dentry = NULL, .mnt = NULL };
66263+ struct path workpath = { .dentry = NULL, .mnt = NULL };
66264 struct dentry *root_dentry;
66265 struct ovl_entry *oe;
66266 struct ovl_fs *ufs;
66267diff --git a/fs/pipe.c b/fs/pipe.c
66268index 21981e5..2c0bffb 100644
66269--- a/fs/pipe.c
66270+++ b/fs/pipe.c
66271@@ -37,7 +37,7 @@ unsigned int pipe_max_size = 1048576;
66272 /*
66273 * Minimum pipe size, as required by POSIX
66274 */
66275-unsigned int pipe_min_size = PAGE_SIZE;
66276+unsigned int pipe_min_size __read_only = PAGE_SIZE;
66277
66278 /*
66279 * We use a start+len construction, which provides full use of the
66280@@ -56,7 +56,7 @@ unsigned int pipe_min_size = PAGE_SIZE;
66281
66282 static void pipe_lock_nested(struct pipe_inode_info *pipe, int subclass)
66283 {
66284- if (pipe->files)
66285+ if (atomic_read(&pipe->files))
66286 mutex_lock_nested(&pipe->mutex, subclass);
66287 }
66288
66289@@ -71,7 +71,7 @@ EXPORT_SYMBOL(pipe_lock);
66290
66291 void pipe_unlock(struct pipe_inode_info *pipe)
66292 {
66293- if (pipe->files)
66294+ if (atomic_read(&pipe->files))
66295 mutex_unlock(&pipe->mutex);
66296 }
66297 EXPORT_SYMBOL(pipe_unlock);
66298@@ -292,9 +292,9 @@ pipe_read(struct kiocb *iocb, struct iov_iter *to)
66299 }
66300 if (bufs) /* More to do? */
66301 continue;
66302- if (!pipe->writers)
66303+ if (!atomic_read(&pipe->writers))
66304 break;
66305- if (!pipe->waiting_writers) {
66306+ if (!atomic_read(&pipe->waiting_writers)) {
66307 /* syscall merging: Usually we must not sleep
66308 * if O_NONBLOCK is set, or if we got some data.
66309 * But if a writer sleeps in kernel space, then
66310@@ -351,7 +351,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
66311
66312 __pipe_lock(pipe);
66313
66314- if (!pipe->readers) {
66315+ if (!atomic_read(&pipe->readers)) {
66316 send_sig(SIGPIPE, current, 0);
66317 ret = -EPIPE;
66318 goto out;
66319@@ -387,7 +387,7 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
66320 for (;;) {
66321 int bufs;
66322
66323- if (!pipe->readers) {
66324+ if (!atomic_read(&pipe->readers)) {
66325 send_sig(SIGPIPE, current, 0);
66326 if (!ret)
66327 ret = -EPIPE;
66328@@ -455,9 +455,9 @@ pipe_write(struct kiocb *iocb, struct iov_iter *from)
66329 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
66330 do_wakeup = 0;
66331 }
66332- pipe->waiting_writers++;
66333+ atomic_inc(&pipe->waiting_writers);
66334 pipe_wait(pipe);
66335- pipe->waiting_writers--;
66336+ atomic_dec(&pipe->waiting_writers);
66337 }
66338 out:
66339 __pipe_unlock(pipe);
66340@@ -512,7 +512,7 @@ pipe_poll(struct file *filp, poll_table *wait)
66341 mask = 0;
66342 if (filp->f_mode & FMODE_READ) {
66343 mask = (nrbufs > 0) ? POLLIN | POLLRDNORM : 0;
66344- if (!pipe->writers && filp->f_version != pipe->w_counter)
66345+ if (!atomic_read(&pipe->writers) && filp->f_version != pipe->w_counter)
66346 mask |= POLLHUP;
66347 }
66348
66349@@ -522,7 +522,7 @@ pipe_poll(struct file *filp, poll_table *wait)
66350 * Most Unices do not set POLLERR for FIFOs but on Linux they
66351 * behave exactly like pipes for poll().
66352 */
66353- if (!pipe->readers)
66354+ if (!atomic_read(&pipe->readers))
66355 mask |= POLLERR;
66356 }
66357
66358@@ -534,7 +534,7 @@ static void put_pipe_info(struct inode *inode, struct pipe_inode_info *pipe)
66359 int kill = 0;
66360
66361 spin_lock(&inode->i_lock);
66362- if (!--pipe->files) {
66363+ if (atomic_dec_and_test(&pipe->files)) {
66364 inode->i_pipe = NULL;
66365 kill = 1;
66366 }
66367@@ -551,11 +551,11 @@ pipe_release(struct inode *inode, struct file *file)
66368
66369 __pipe_lock(pipe);
66370 if (file->f_mode & FMODE_READ)
66371- pipe->readers--;
66372+ atomic_dec(&pipe->readers);
66373 if (file->f_mode & FMODE_WRITE)
66374- pipe->writers--;
66375+ atomic_dec(&pipe->writers);
66376
66377- if (pipe->readers || pipe->writers) {
66378+ if (atomic_read(&pipe->readers) || atomic_read(&pipe->writers)) {
66379 wake_up_interruptible_sync_poll(&pipe->wait, POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM | POLLERR | POLLHUP);
66380 kill_fasync(&pipe->fasync_readers, SIGIO, POLL_IN);
66381 kill_fasync(&pipe->fasync_writers, SIGIO, POLL_OUT);
66382@@ -620,7 +620,7 @@ void free_pipe_info(struct pipe_inode_info *pipe)
66383 kfree(pipe);
66384 }
66385
66386-static struct vfsmount *pipe_mnt __read_mostly;
66387+struct vfsmount *pipe_mnt __read_mostly;
66388
66389 /*
66390 * pipefs_dname() is called from d_path().
66391@@ -650,8 +650,9 @@ static struct inode * get_pipe_inode(void)
66392 goto fail_iput;
66393
66394 inode->i_pipe = pipe;
66395- pipe->files = 2;
66396- pipe->readers = pipe->writers = 1;
66397+ atomic_set(&pipe->files, 2);
66398+ atomic_set(&pipe->readers, 1);
66399+ atomic_set(&pipe->writers, 1);
66400 inode->i_fop = &pipefifo_fops;
66401
66402 /*
66403@@ -830,17 +831,17 @@ static int fifo_open(struct inode *inode, struct file *filp)
66404 spin_lock(&inode->i_lock);
66405 if (inode->i_pipe) {
66406 pipe = inode->i_pipe;
66407- pipe->files++;
66408+ atomic_inc(&pipe->files);
66409 spin_unlock(&inode->i_lock);
66410 } else {
66411 spin_unlock(&inode->i_lock);
66412 pipe = alloc_pipe_info();
66413 if (!pipe)
66414 return -ENOMEM;
66415- pipe->files = 1;
66416+ atomic_set(&pipe->files, 1);
66417 spin_lock(&inode->i_lock);
66418 if (unlikely(inode->i_pipe)) {
66419- inode->i_pipe->files++;
66420+ atomic_inc(&inode->i_pipe->files);
66421 spin_unlock(&inode->i_lock);
66422 free_pipe_info(pipe);
66423 pipe = inode->i_pipe;
66424@@ -865,10 +866,10 @@ static int fifo_open(struct inode *inode, struct file *filp)
66425 * opened, even when there is no process writing the FIFO.
66426 */
66427 pipe->r_counter++;
66428- if (pipe->readers++ == 0)
66429+ if (atomic_inc_return(&pipe->readers) == 1)
66430 wake_up_partner(pipe);
66431
66432- if (!is_pipe && !pipe->writers) {
66433+ if (!is_pipe && !atomic_read(&pipe->writers)) {
66434 if ((filp->f_flags & O_NONBLOCK)) {
66435 /* suppress POLLHUP until we have
66436 * seen a writer */
66437@@ -887,14 +888,14 @@ static int fifo_open(struct inode *inode, struct file *filp)
66438 * errno=ENXIO when there is no process reading the FIFO.
66439 */
66440 ret = -ENXIO;
66441- if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !pipe->readers)
66442+ if (!is_pipe && (filp->f_flags & O_NONBLOCK) && !atomic_read(&pipe->readers))
66443 goto err;
66444
66445 pipe->w_counter++;
66446- if (!pipe->writers++)
66447+ if (atomic_inc_return(&pipe->writers) == 1)
66448 wake_up_partner(pipe);
66449
66450- if (!is_pipe && !pipe->readers) {
66451+ if (!is_pipe && !atomic_read(&pipe->readers)) {
66452 if (wait_for_partner(pipe, &pipe->r_counter))
66453 goto err_wr;
66454 }
66455@@ -908,11 +909,11 @@ static int fifo_open(struct inode *inode, struct file *filp)
66456 * the process can at least talk to itself.
66457 */
66458
66459- pipe->readers++;
66460- pipe->writers++;
66461+ atomic_inc(&pipe->readers);
66462+ atomic_inc(&pipe->writers);
66463 pipe->r_counter++;
66464 pipe->w_counter++;
66465- if (pipe->readers == 1 || pipe->writers == 1)
66466+ if (atomic_read(&pipe->readers) == 1 || atomic_read(&pipe->writers) == 1)
66467 wake_up_partner(pipe);
66468 break;
66469
66470@@ -926,13 +927,13 @@ static int fifo_open(struct inode *inode, struct file *filp)
66471 return 0;
66472
66473 err_rd:
66474- if (!--pipe->readers)
66475+ if (atomic_dec_and_test(&pipe->readers))
66476 wake_up_interruptible(&pipe->wait);
66477 ret = -ERESTARTSYS;
66478 goto err;
66479
66480 err_wr:
66481- if (!--pipe->writers)
66482+ if (atomic_dec_and_test(&pipe->writers))
66483 wake_up_interruptible(&pipe->wait);
66484 ret = -ERESTARTSYS;
66485 goto err;
66486@@ -1010,7 +1011,7 @@ static long pipe_set_size(struct pipe_inode_info *pipe, unsigned long nr_pages)
66487 * Currently we rely on the pipe array holding a power-of-2 number
66488 * of pages.
66489 */
66490-static inline unsigned int round_pipe_size(unsigned int size)
66491+static inline unsigned long round_pipe_size(unsigned long size)
66492 {
66493 unsigned long nr_pages;
66494
66495@@ -1058,13 +1059,16 @@ long pipe_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
66496
66497 switch (cmd) {
66498 case F_SETPIPE_SZ: {
66499- unsigned int size, nr_pages;
66500+ unsigned long size, nr_pages;
66501+
66502+ ret = -EINVAL;
66503+ if (arg < pipe_min_size)
66504+ goto out;
66505
66506 size = round_pipe_size(arg);
66507 nr_pages = size >> PAGE_SHIFT;
66508
66509- ret = -EINVAL;
66510- if (!nr_pages)
66511+ if (size < pipe_min_size)
66512 goto out;
66513
66514 if (!capable(CAP_SYS_RESOURCE) && size > pipe_max_size) {
66515diff --git a/fs/posix_acl.c b/fs/posix_acl.c
66516index 3a48bb7..403067b 100644
66517--- a/fs/posix_acl.c
66518+++ b/fs/posix_acl.c
66519@@ -20,6 +20,7 @@
66520 #include <linux/xattr.h>
66521 #include <linux/export.h>
66522 #include <linux/user_namespace.h>
66523+#include <linux/grsecurity.h>
66524
66525 struct posix_acl **acl_by_type(struct inode *inode, int type)
66526 {
66527@@ -277,7 +278,7 @@ posix_acl_equiv_mode(const struct posix_acl *acl, umode_t *mode_p)
66528 }
66529 }
66530 if (mode_p)
66531- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
66532+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
66533 return not_equiv;
66534 }
66535 EXPORT_SYMBOL(posix_acl_equiv_mode);
66536@@ -427,7 +428,7 @@ static int posix_acl_create_masq(struct posix_acl *acl, umode_t *mode_p)
66537 mode &= (group_obj->e_perm << 3) | ~S_IRWXG;
66538 }
66539
66540- *mode_p = (*mode_p & ~S_IRWXUGO) | mode;
66541+ *mode_p = ((*mode_p & ~S_IRWXUGO) | mode) & ~gr_acl_umask();
66542 return not_equiv;
66543 }
66544
66545@@ -485,6 +486,8 @@ __posix_acl_create(struct posix_acl **acl, gfp_t gfp, umode_t *mode_p)
66546 struct posix_acl *clone = posix_acl_clone(*acl, gfp);
66547 int err = -ENOMEM;
66548 if (clone) {
66549+ *mode_p &= ~gr_acl_umask();
66550+
66551 err = posix_acl_create_masq(clone, mode_p);
66552 if (err < 0) {
66553 posix_acl_release(clone);
66554@@ -663,11 +666,12 @@ struct posix_acl *
66555 posix_acl_from_xattr(struct user_namespace *user_ns,
66556 const void *value, size_t size)
66557 {
66558- posix_acl_xattr_header *header = (posix_acl_xattr_header *)value;
66559- posix_acl_xattr_entry *entry = (posix_acl_xattr_entry *)(header+1), *end;
66560+ const posix_acl_xattr_header *header = (const posix_acl_xattr_header *)value;
66561+ const posix_acl_xattr_entry *entry = (const posix_acl_xattr_entry *)(header+1), *end;
66562 int count;
66563 struct posix_acl *acl;
66564 struct posix_acl_entry *acl_e;
66565+ umode_t umask = gr_acl_umask();
66566
66567 if (!value)
66568 return NULL;
66569@@ -693,12 +697,18 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
66570
66571 switch(acl_e->e_tag) {
66572 case ACL_USER_OBJ:
66573+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
66574+ break;
66575 case ACL_GROUP_OBJ:
66576 case ACL_MASK:
66577+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
66578+ break;
66579 case ACL_OTHER:
66580+ acl_e->e_perm &= ~(umask & S_IRWXO);
66581 break;
66582
66583 case ACL_USER:
66584+ acl_e->e_perm &= ~((umask & S_IRWXU) >> 6);
66585 acl_e->e_uid =
66586 make_kuid(user_ns,
66587 le32_to_cpu(entry->e_id));
66588@@ -706,6 +716,7 @@ posix_acl_from_xattr(struct user_namespace *user_ns,
66589 goto fail;
66590 break;
66591 case ACL_GROUP:
66592+ acl_e->e_perm &= ~((umask & S_IRWXG) >> 3);
66593 acl_e->e_gid =
66594 make_kgid(user_ns,
66595 le32_to_cpu(entry->e_id));
66596diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
66597index 2183fcf..3c32a98 100644
66598--- a/fs/proc/Kconfig
66599+++ b/fs/proc/Kconfig
66600@@ -30,7 +30,7 @@ config PROC_FS
66601
66602 config PROC_KCORE
66603 bool "/proc/kcore support" if !ARM
66604- depends on PROC_FS && MMU
66605+ depends on PROC_FS && MMU && !GRKERNSEC_PROC_ADD
66606 help
66607 Provides a virtual ELF core file of the live kernel. This can
66608 be read with gdb and other ELF tools. No modifications can be
66609@@ -38,8 +38,8 @@ config PROC_KCORE
66610
66611 config PROC_VMCORE
66612 bool "/proc/vmcore support"
66613- depends on PROC_FS && CRASH_DUMP
66614- default y
66615+ depends on PROC_FS && CRASH_DUMP && !GRKERNSEC
66616+ default n
66617 help
66618 Exports the dump image of crashed kernel in ELF format.
66619
66620@@ -63,8 +63,8 @@ config PROC_SYSCTL
66621 limited in memory.
66622
66623 config PROC_PAGE_MONITOR
66624- default y
66625- depends on PROC_FS && MMU
66626+ default n
66627+ depends on PROC_FS && MMU && !GRKERNSEC
66628 bool "Enable /proc page monitoring" if EXPERT
66629 help
66630 Various /proc files exist to monitor process memory utilization:
66631diff --git a/fs/proc/array.c b/fs/proc/array.c
66632index 1295a00..4c91a6b 100644
66633--- a/fs/proc/array.c
66634+++ b/fs/proc/array.c
66635@@ -60,6 +60,7 @@
66636 #include <linux/tty.h>
66637 #include <linux/string.h>
66638 #include <linux/mman.h>
66639+#include <linux/grsecurity.h>
66640 #include <linux/proc_fs.h>
66641 #include <linux/ioport.h>
66642 #include <linux/uaccess.h>
66643@@ -322,6 +323,21 @@ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
66644 cpumask_pr_args(&task->cpus_allowed));
66645 }
66646
66647+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66648+static inline void task_pax(struct seq_file *m, struct task_struct *p)
66649+{
66650+ if (p->mm)
66651+ seq_printf(m, "PaX:\t%c%c%c%c%c\n",
66652+ p->mm->pax_flags & MF_PAX_PAGEEXEC ? 'P' : 'p',
66653+ p->mm->pax_flags & MF_PAX_EMUTRAMP ? 'E' : 'e',
66654+ p->mm->pax_flags & MF_PAX_MPROTECT ? 'M' : 'm',
66655+ p->mm->pax_flags & MF_PAX_RANDMMAP ? 'R' : 'r',
66656+ p->mm->pax_flags & MF_PAX_SEGMEXEC ? 'S' : 's');
66657+ else
66658+ seq_printf(m, "PaX:\t-----\n");
66659+}
66660+#endif
66661+
66662 int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
66663 struct pid *pid, struct task_struct *task)
66664 {
66665@@ -340,9 +356,24 @@ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
66666 task_cpus_allowed(m, task);
66667 cpuset_task_status_allowed(m, task);
66668 task_context_switch_counts(m, task);
66669+
66670+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
66671+ task_pax(m, task);
66672+#endif
66673+
66674+#if defined(CONFIG_GRKERNSEC) && !defined(CONFIG_GRKERNSEC_NO_RBAC)
66675+ task_grsec_rbac(m, task);
66676+#endif
66677+
66678 return 0;
66679 }
66680
66681+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66682+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
66683+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
66684+ _mm->pax_flags & MF_PAX_SEGMEXEC))
66685+#endif
66686+
66687 static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
66688 struct pid *pid, struct task_struct *task, int whole)
66689 {
66690@@ -364,6 +395,13 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
66691 char tcomm[sizeof(task->comm)];
66692 unsigned long flags;
66693
66694+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66695+ if (current->exec_id != m->exec_id) {
66696+ gr_log_badprocpid("stat");
66697+ return 0;
66698+ }
66699+#endif
66700+
66701 state = *get_task_state(task);
66702 vsize = eip = esp = 0;
66703 permitted = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
66704@@ -434,6 +472,19 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
66705 gtime = task_gtime(task);
66706 }
66707
66708+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66709+ if (PAX_RAND_FLAGS(mm)) {
66710+ eip = 0;
66711+ esp = 0;
66712+ wchan = 0;
66713+ }
66714+#endif
66715+#ifdef CONFIG_GRKERNSEC_HIDESYM
66716+ wchan = 0;
66717+ eip =0;
66718+ esp =0;
66719+#endif
66720+
66721 /* scale priority and nice values from timeslices to -20..20 */
66722 /* to make it look like a "normal" Unix priority/nice value */
66723 priority = task_prio(task);
66724@@ -465,9 +516,15 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
66725 seq_put_decimal_ull(m, ' ', vsize);
66726 seq_put_decimal_ull(m, ' ', mm ? get_mm_rss(mm) : 0);
66727 seq_put_decimal_ull(m, ' ', rsslim);
66728+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66729+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->start_code : 1) : 0));
66730+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 1 : (mm ? (permitted ? mm->end_code : 1) : 0));
66731+ seq_put_decimal_ull(m, ' ', PAX_RAND_FLAGS(mm) ? 0 : ((permitted && mm) ? mm->start_stack : 0));
66732+#else
66733 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->start_code : 1) : 0);
66734 seq_put_decimal_ull(m, ' ', mm ? (permitted ? mm->end_code : 1) : 0);
66735 seq_put_decimal_ull(m, ' ', (permitted && mm) ? mm->start_stack : 0);
66736+#endif
66737 seq_put_decimal_ull(m, ' ', esp);
66738 seq_put_decimal_ull(m, ' ', eip);
66739 /* The signal information here is obsolete.
66740@@ -489,7 +546,11 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
66741 seq_put_decimal_ull(m, ' ', cputime_to_clock_t(gtime));
66742 seq_put_decimal_ll(m, ' ', cputime_to_clock_t(cgtime));
66743
66744- if (mm && permitted) {
66745+ if (mm && permitted
66746+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66747+ && !PAX_RAND_FLAGS(mm)
66748+#endif
66749+ ) {
66750 seq_put_decimal_ull(m, ' ', mm->start_data);
66751 seq_put_decimal_ull(m, ' ', mm->end_data);
66752 seq_put_decimal_ull(m, ' ', mm->start_brk);
66753@@ -527,8 +588,15 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
66754 struct pid *pid, struct task_struct *task)
66755 {
66756 unsigned long size = 0, resident = 0, shared = 0, text = 0, data = 0;
66757- struct mm_struct *mm = get_task_mm(task);
66758+ struct mm_struct *mm;
66759
66760+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66761+ if (current->exec_id != m->exec_id) {
66762+ gr_log_badprocpid("statm");
66763+ return 0;
66764+ }
66765+#endif
66766+ mm = get_task_mm(task);
66767 if (mm) {
66768 size = task_statm(mm, &shared, &text, &data, &resident);
66769 mmput(mm);
66770@@ -551,6 +619,20 @@ int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
66771 return 0;
66772 }
66773
66774+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
66775+int proc_pid_ipaddr(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task)
66776+{
66777+ unsigned long flags;
66778+ u32 curr_ip = 0;
66779+
66780+ if (lock_task_sighand(task, &flags)) {
66781+ curr_ip = task->signal->curr_ip;
66782+ unlock_task_sighand(task, &flags);
66783+ }
66784+ return seq_printf(m, "%pI4\n", &curr_ip);
66785+}
66786+#endif
66787+
66788 #ifdef CONFIG_CHECKPOINT_RESTORE
66789 static struct pid *
66790 get_children_pid(struct inode *inode, struct pid *pid_prev, loff_t pos)
66791diff --git a/fs/proc/base.c b/fs/proc/base.c
66792index 3f3d7ae..68de109 100644
66793--- a/fs/proc/base.c
66794+++ b/fs/proc/base.c
66795@@ -113,6 +113,14 @@ struct pid_entry {
66796 union proc_op op;
66797 };
66798
66799+struct getdents_callback {
66800+ struct linux_dirent __user * current_dir;
66801+ struct linux_dirent __user * previous;
66802+ struct file * file;
66803+ int count;
66804+ int error;
66805+};
66806+
66807 #define NOD(NAME, MODE, IOP, FOP, OP) { \
66808 .name = (NAME), \
66809 .len = sizeof(NAME) - 1, \
66810@@ -208,12 +216,28 @@ static int proc_pid_cmdline(struct seq_file *m, struct pid_namespace *ns,
66811 return 0;
66812 }
66813
66814+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66815+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
66816+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
66817+ _mm->pax_flags & MF_PAX_SEGMEXEC))
66818+#endif
66819+
66820 static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
66821 struct pid *pid, struct task_struct *task)
66822 {
66823 struct mm_struct *mm = mm_access(task, PTRACE_MODE_READ);
66824 if (mm && !IS_ERR(mm)) {
66825 unsigned int nwords = 0;
66826+
66827+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66828+ /* allow if we're currently ptracing this task */
66829+ if (PAX_RAND_FLAGS(mm) &&
66830+ (!(task->ptrace & PT_PTRACED) || (task->parent != current))) {
66831+ mmput(mm);
66832+ return 0;
66833+ }
66834+#endif
66835+
66836 do {
66837 nwords += 2;
66838 } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */
66839@@ -225,7 +249,7 @@ static int proc_pid_auxv(struct seq_file *m, struct pid_namespace *ns,
66840 }
66841
66842
66843-#ifdef CONFIG_KALLSYMS
66844+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66845 /*
66846 * Provides a wchan file via kallsyms in a proper one-value-per-file format.
66847 * Returns the resolved symbol. If that fails, simply return the address.
66848@@ -265,7 +289,7 @@ static void unlock_trace(struct task_struct *task)
66849 mutex_unlock(&task->signal->cred_guard_mutex);
66850 }
66851
66852-#ifdef CONFIG_STACKTRACE
66853+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
66854
66855 #define MAX_STACK_TRACE_DEPTH 64
66856
66857@@ -456,7 +480,7 @@ static int proc_pid_limits(struct seq_file *m, struct pid_namespace *ns,
66858 return 0;
66859 }
66860
66861-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
66862+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
66863 static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
66864 struct pid *pid, struct task_struct *task)
66865 {
66866@@ -486,7 +510,7 @@ static int proc_pid_syscall(struct seq_file *m, struct pid_namespace *ns,
66867 /************************************************************************/
66868
66869 /* permission checks */
66870-static int proc_fd_access_allowed(struct inode *inode)
66871+static int proc_fd_access_allowed(struct inode *inode, unsigned int log)
66872 {
66873 struct task_struct *task;
66874 int allowed = 0;
66875@@ -496,7 +520,10 @@ static int proc_fd_access_allowed(struct inode *inode)
66876 */
66877 task = get_proc_task(inode);
66878 if (task) {
66879- allowed = ptrace_may_access(task, PTRACE_MODE_READ);
66880+ if (log)
66881+ allowed = ptrace_may_access(task, PTRACE_MODE_READ);
66882+ else
66883+ allowed = ptrace_may_access(task, PTRACE_MODE_READ | PTRACE_MODE_NOAUDIT);
66884 put_task_struct(task);
66885 }
66886 return allowed;
66887@@ -527,10 +554,35 @@ static bool has_pid_permissions(struct pid_namespace *pid,
66888 struct task_struct *task,
66889 int hide_pid_min)
66890 {
66891+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
66892+ return false;
66893+
66894+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66895+ rcu_read_lock();
66896+ {
66897+ const struct cred *tmpcred = current_cred();
66898+ const struct cred *cred = __task_cred(task);
66899+
66900+ if (uid_eq(tmpcred->uid, GLOBAL_ROOT_UID) || uid_eq(tmpcred->uid, cred->uid)
66901+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
66902+ || in_group_p(grsec_proc_gid)
66903+#endif
66904+ ) {
66905+ rcu_read_unlock();
66906+ return true;
66907+ }
66908+ }
66909+ rcu_read_unlock();
66910+
66911+ if (!pid->hide_pid)
66912+ return false;
66913+#endif
66914+
66915 if (pid->hide_pid < hide_pid_min)
66916 return true;
66917 if (in_group_p(pid->pid_gid))
66918 return true;
66919+
66920 return ptrace_may_access(task, PTRACE_MODE_READ);
66921 }
66922
66923@@ -548,7 +600,11 @@ static int proc_pid_permission(struct inode *inode, int mask)
66924 put_task_struct(task);
66925
66926 if (!has_perms) {
66927+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
66928+ {
66929+#else
66930 if (pid->hide_pid == 2) {
66931+#endif
66932 /*
66933 * Let's make getdents(), stat(), and open()
66934 * consistent with each other. If a process
66935@@ -609,6 +665,10 @@ struct mm_struct *proc_mem_open(struct inode *inode, unsigned int mode)
66936
66937 if (task) {
66938 mm = mm_access(task, mode);
66939+ if (!IS_ERR_OR_NULL(mm) && gr_acl_handle_procpidmem(task)) {
66940+ mmput(mm);
66941+ mm = ERR_PTR(-EPERM);
66942+ }
66943 put_task_struct(task);
66944
66945 if (!IS_ERR_OR_NULL(mm)) {
66946@@ -630,6 +690,11 @@ static int __mem_open(struct inode *inode, struct file *file, unsigned int mode)
66947 return PTR_ERR(mm);
66948
66949 file->private_data = mm;
66950+
66951+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66952+ file->f_version = current->exec_id;
66953+#endif
66954+
66955 return 0;
66956 }
66957
66958@@ -651,6 +716,17 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
66959 ssize_t copied;
66960 char *page;
66961
66962+#ifdef CONFIG_GRKERNSEC
66963+ if (write)
66964+ return -EPERM;
66965+#endif
66966+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66967+ if (file->f_version != current->exec_id) {
66968+ gr_log_badprocpid("mem");
66969+ return 0;
66970+ }
66971+#endif
66972+
66973 if (!mm)
66974 return 0;
66975
66976@@ -663,7 +739,7 @@ static ssize_t mem_rw(struct file *file, char __user *buf,
66977 goto free;
66978
66979 while (count > 0) {
66980- int this_len = min_t(int, count, PAGE_SIZE);
66981+ ssize_t this_len = min_t(ssize_t, count, PAGE_SIZE);
66982
66983 if (write && copy_from_user(page, buf, this_len)) {
66984 copied = -EFAULT;
66985@@ -755,6 +831,13 @@ static ssize_t environ_read(struct file *file, char __user *buf,
66986 if (!mm)
66987 return 0;
66988
66989+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
66990+ if (file->f_version != current->exec_id) {
66991+ gr_log_badprocpid("environ");
66992+ return 0;
66993+ }
66994+#endif
66995+
66996 page = (char *)__get_free_page(GFP_TEMPORARY);
66997 if (!page)
66998 return -ENOMEM;
66999@@ -764,7 +847,7 @@ static ssize_t environ_read(struct file *file, char __user *buf,
67000 goto free;
67001 while (count > 0) {
67002 size_t this_len, max_len;
67003- int retval;
67004+ ssize_t retval;
67005
67006 if (src >= (mm->env_end - mm->env_start))
67007 break;
67008@@ -1378,7 +1461,7 @@ static void *proc_pid_follow_link(struct dentry *dentry, struct nameidata *nd)
67009 int error = -EACCES;
67010
67011 /* Are we allowed to snoop on the tasks file descriptors? */
67012- if (!proc_fd_access_allowed(inode))
67013+ if (!proc_fd_access_allowed(inode, 0))
67014 goto out;
67015
67016 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
67017@@ -1422,8 +1505,18 @@ static int proc_pid_readlink(struct dentry * dentry, char __user * buffer, int b
67018 struct path path;
67019
67020 /* Are we allowed to snoop on the tasks file descriptors? */
67021- if (!proc_fd_access_allowed(inode))
67022- goto out;
67023+ /* logging this is needed for learning on chromium to work properly,
67024+ but we don't want to flood the logs from 'ps' which does a readlink
67025+ on /proc/fd/2 of tasks in the listing, nor do we want 'ps' to learn
67026+ CAP_SYS_PTRACE as it's not necessary for its basic functionality
67027+ */
67028+ if (dentry->d_name.name[0] == '2' && dentry->d_name.name[1] == '\0') {
67029+ if (!proc_fd_access_allowed(inode,0))
67030+ goto out;
67031+ } else {
67032+ if (!proc_fd_access_allowed(inode,1))
67033+ goto out;
67034+ }
67035
67036 error = PROC_I(inode)->op.proc_get_link(dentry, &path);
67037 if (error)
67038@@ -1473,7 +1566,11 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
67039 rcu_read_lock();
67040 cred = __task_cred(task);
67041 inode->i_uid = cred->euid;
67042+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
67043+ inode->i_gid = grsec_proc_gid;
67044+#else
67045 inode->i_gid = cred->egid;
67046+#endif
67047 rcu_read_unlock();
67048 }
67049 security_task_to_inode(task, inode);
67050@@ -1509,10 +1606,19 @@ int pid_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
67051 return -ENOENT;
67052 }
67053 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
67054+#ifdef CONFIG_GRKERNSEC_PROC_USER
67055+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
67056+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67057+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
67058+#endif
67059 task_dumpable(task)) {
67060 cred = __task_cred(task);
67061 stat->uid = cred->euid;
67062+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
67063+ stat->gid = grsec_proc_gid;
67064+#else
67065 stat->gid = cred->egid;
67066+#endif
67067 }
67068 }
67069 rcu_read_unlock();
67070@@ -1550,11 +1656,20 @@ int pid_revalidate(struct dentry *dentry, unsigned int flags)
67071
67072 if (task) {
67073 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) ||
67074+#ifdef CONFIG_GRKERNSEC_PROC_USER
67075+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IXUSR)) ||
67076+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67077+ (inode->i_mode == (S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP)) ||
67078+#endif
67079 task_dumpable(task)) {
67080 rcu_read_lock();
67081 cred = __task_cred(task);
67082 inode->i_uid = cred->euid;
67083+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
67084+ inode->i_gid = grsec_proc_gid;
67085+#else
67086 inode->i_gid = cred->egid;
67087+#endif
67088 rcu_read_unlock();
67089 } else {
67090 inode->i_uid = GLOBAL_ROOT_UID;
67091@@ -2085,6 +2200,9 @@ static struct dentry *proc_pident_lookup(struct inode *dir,
67092 if (!task)
67093 goto out_no_task;
67094
67095+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
67096+ goto out;
67097+
67098 /*
67099 * Yes, it does not scale. And it should not. Don't add
67100 * new entries into /proc/<tgid>/ without very good reasons.
67101@@ -2115,6 +2233,9 @@ static int proc_pident_readdir(struct file *file, struct dir_context *ctx,
67102 if (!task)
67103 return -ENOENT;
67104
67105+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
67106+ goto out;
67107+
67108 if (!dir_emit_dots(file, ctx))
67109 goto out;
67110
67111@@ -2557,7 +2678,7 @@ static const struct pid_entry tgid_base_stuff[] = {
67112 REG("autogroup", S_IRUGO|S_IWUSR, proc_pid_sched_autogroup_operations),
67113 #endif
67114 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
67115-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
67116+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
67117 ONE("syscall", S_IRUSR, proc_pid_syscall),
67118 #endif
67119 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
67120@@ -2582,10 +2703,10 @@ static const struct pid_entry tgid_base_stuff[] = {
67121 #ifdef CONFIG_SECURITY
67122 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
67123 #endif
67124-#ifdef CONFIG_KALLSYMS
67125+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
67126 ONE("wchan", S_IRUGO, proc_pid_wchan),
67127 #endif
67128-#ifdef CONFIG_STACKTRACE
67129+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
67130 ONE("stack", S_IRUSR, proc_pid_stack),
67131 #endif
67132 #ifdef CONFIG_SCHEDSTATS
67133@@ -2619,6 +2740,9 @@ static const struct pid_entry tgid_base_stuff[] = {
67134 #ifdef CONFIG_HARDWALL
67135 ONE("hardwall", S_IRUGO, proc_pid_hardwall),
67136 #endif
67137+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
67138+ ONE("ipaddr", S_IRUSR, proc_pid_ipaddr),
67139+#endif
67140 #ifdef CONFIG_USER_NS
67141 REG("uid_map", S_IRUGO|S_IWUSR, proc_uid_map_operations),
67142 REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations),
67143@@ -2751,7 +2875,14 @@ static int proc_pid_instantiate(struct inode *dir,
67144 if (!inode)
67145 goto out;
67146
67147+#ifdef CONFIG_GRKERNSEC_PROC_USER
67148+ inode->i_mode = S_IFDIR|S_IRUSR|S_IXUSR;
67149+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67150+ inode->i_gid = grsec_proc_gid;
67151+ inode->i_mode = S_IFDIR|S_IRUSR|S_IRGRP|S_IXUSR|S_IXGRP;
67152+#else
67153 inode->i_mode = S_IFDIR|S_IRUGO|S_IXUGO;
67154+#endif
67155 inode->i_op = &proc_tgid_base_inode_operations;
67156 inode->i_fop = &proc_tgid_base_operations;
67157 inode->i_flags|=S_IMMUTABLE;
67158@@ -2789,7 +2920,11 @@ struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, unsign
67159 if (!task)
67160 goto out;
67161
67162+ if (gr_pid_is_chrooted(task) || gr_check_hidden_task(task))
67163+ goto out_put_task;
67164+
67165 result = proc_pid_instantiate(dir, dentry, task, NULL);
67166+out_put_task:
67167 put_task_struct(task);
67168 out:
67169 return ERR_PTR(result);
67170@@ -2903,7 +3038,7 @@ static const struct pid_entry tid_base_stuff[] = {
67171 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
67172 #endif
67173 REG("comm", S_IRUGO|S_IWUSR, proc_pid_set_comm_operations),
67174-#ifdef CONFIG_HAVE_ARCH_TRACEHOOK
67175+#if defined(CONFIG_HAVE_ARCH_TRACEHOOK) && !defined(CONFIG_GRKERNSEC_PROC_MEMMAP)
67176 ONE("syscall", S_IRUSR, proc_pid_syscall),
67177 #endif
67178 ONE("cmdline", S_IRUGO, proc_pid_cmdline),
67179@@ -2930,10 +3065,10 @@ static const struct pid_entry tid_base_stuff[] = {
67180 #ifdef CONFIG_SECURITY
67181 DIR("attr", S_IRUGO|S_IXUGO, proc_attr_dir_inode_operations, proc_attr_dir_operations),
67182 #endif
67183-#ifdef CONFIG_KALLSYMS
67184+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
67185 ONE("wchan", S_IRUGO, proc_pid_wchan),
67186 #endif
67187-#ifdef CONFIG_STACKTRACE
67188+#if defined(CONFIG_STACKTRACE) && !defined(CONFIG_GRKERNSEC_HIDESYM)
67189 ONE("stack", S_IRUSR, proc_pid_stack),
67190 #endif
67191 #ifdef CONFIG_SCHEDSTATS
67192diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
67193index cbd82df..c0407d2 100644
67194--- a/fs/proc/cmdline.c
67195+++ b/fs/proc/cmdline.c
67196@@ -23,7 +23,11 @@ static const struct file_operations cmdline_proc_fops = {
67197
67198 static int __init proc_cmdline_init(void)
67199 {
67200+#ifdef CONFIG_GRKERNSEC_PROC_ADD
67201+ proc_create_grsec("cmdline", 0, NULL, &cmdline_proc_fops);
67202+#else
67203 proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
67204+#endif
67205 return 0;
67206 }
67207 fs_initcall(proc_cmdline_init);
67208diff --git a/fs/proc/devices.c b/fs/proc/devices.c
67209index 50493ed..248166b 100644
67210--- a/fs/proc/devices.c
67211+++ b/fs/proc/devices.c
67212@@ -64,7 +64,11 @@ static const struct file_operations proc_devinfo_operations = {
67213
67214 static int __init proc_devices_init(void)
67215 {
67216+#ifdef CONFIG_GRKERNSEC_PROC_ADD
67217+ proc_create_grsec("devices", 0, NULL, &proc_devinfo_operations);
67218+#else
67219 proc_create("devices", 0, NULL, &proc_devinfo_operations);
67220+#endif
67221 return 0;
67222 }
67223 fs_initcall(proc_devices_init);
67224diff --git a/fs/proc/fd.c b/fs/proc/fd.c
67225index 8e5ad83..1f07a8c 100644
67226--- a/fs/proc/fd.c
67227+++ b/fs/proc/fd.c
67228@@ -26,7 +26,8 @@ static int seq_show(struct seq_file *m, void *v)
67229 if (!task)
67230 return -ENOENT;
67231
67232- files = get_files_struct(task);
67233+ if (!gr_acl_handle_procpidmem(task))
67234+ files = get_files_struct(task);
67235 put_task_struct(task);
67236
67237 if (files) {
67238@@ -284,11 +285,21 @@ static struct dentry *proc_lookupfd(struct inode *dir, struct dentry *dentry,
67239 */
67240 int proc_fd_permission(struct inode *inode, int mask)
67241 {
67242+ struct task_struct *task;
67243 int rv = generic_permission(inode, mask);
67244- if (rv == 0)
67245- return 0;
67246+
67247 if (task_tgid(current) == proc_pid(inode))
67248 rv = 0;
67249+
67250+ task = get_proc_task(inode);
67251+ if (task == NULL)
67252+ return rv;
67253+
67254+ if (gr_acl_handle_procpidmem(task))
67255+ rv = -EACCES;
67256+
67257+ put_task_struct(task);
67258+
67259 return rv;
67260 }
67261
67262diff --git a/fs/proc/generic.c b/fs/proc/generic.c
67263index be65b20..2998ba8 100644
67264--- a/fs/proc/generic.c
67265+++ b/fs/proc/generic.c
67266@@ -22,6 +22,7 @@
67267 #include <linux/bitops.h>
67268 #include <linux/spinlock.h>
67269 #include <linux/completion.h>
67270+#include <linux/grsecurity.h>
67271 #include <asm/uaccess.h>
67272
67273 #include "internal.h"
67274@@ -253,6 +254,15 @@ struct dentry *proc_lookup(struct inode *dir, struct dentry *dentry,
67275 return proc_lookup_de(PDE(dir), dir, dentry);
67276 }
67277
67278+struct dentry *proc_lookup_restrict(struct inode *dir, struct dentry *dentry,
67279+ unsigned int flags)
67280+{
67281+ if (gr_proc_is_restricted())
67282+ return ERR_PTR(-EACCES);
67283+
67284+ return proc_lookup_de(PDE(dir), dir, dentry);
67285+}
67286+
67287 /*
67288 * This returns non-zero if at EOF, so that the /proc
67289 * root directory can use this and check if it should
67290@@ -310,6 +320,16 @@ int proc_readdir(struct file *file, struct dir_context *ctx)
67291 return proc_readdir_de(PDE(inode), file, ctx);
67292 }
67293
67294+int proc_readdir_restrict(struct file *file, struct dir_context *ctx)
67295+{
67296+ struct inode *inode = file_inode(file);
67297+
67298+ if (gr_proc_is_restricted())
67299+ return -EACCES;
67300+
67301+ return proc_readdir_de(PDE(inode), file, ctx);
67302+}
67303+
67304 /*
67305 * These are the generic /proc directory operations. They
67306 * use the in-memory "struct proc_dir_entry" tree to parse
67307@@ -321,6 +341,12 @@ static const struct file_operations proc_dir_operations = {
67308 .iterate = proc_readdir,
67309 };
67310
67311+static const struct file_operations proc_dir_restricted_operations = {
67312+ .llseek = generic_file_llseek,
67313+ .read = generic_read_dir,
67314+ .iterate = proc_readdir_restrict,
67315+};
67316+
67317 /*
67318 * proc directories can do almost nothing..
67319 */
67320@@ -330,6 +356,12 @@ static const struct inode_operations proc_dir_inode_operations = {
67321 .setattr = proc_notify_change,
67322 };
67323
67324+static const struct inode_operations proc_dir_restricted_inode_operations = {
67325+ .lookup = proc_lookup_restrict,
67326+ .getattr = proc_getattr,
67327+ .setattr = proc_notify_change,
67328+};
67329+
67330 static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp)
67331 {
67332 int ret;
67333@@ -441,6 +473,31 @@ struct proc_dir_entry *proc_mkdir_data(const char *name, umode_t mode,
67334 }
67335 EXPORT_SYMBOL_GPL(proc_mkdir_data);
67336
67337+struct proc_dir_entry *proc_mkdir_data_restrict(const char *name, umode_t mode,
67338+ struct proc_dir_entry *parent, void *data)
67339+{
67340+ struct proc_dir_entry *ent;
67341+
67342+ if (mode == 0)
67343+ mode = S_IRUGO | S_IXUGO;
67344+
67345+ ent = __proc_create(&parent, name, S_IFDIR | mode, 2);
67346+ if (ent) {
67347+ ent->data = data;
67348+ ent->restricted = 1;
67349+ ent->proc_fops = &proc_dir_restricted_operations;
67350+ ent->proc_iops = &proc_dir_restricted_inode_operations;
67351+ parent->nlink++;
67352+ if (proc_register(parent, ent) < 0) {
67353+ kfree(ent);
67354+ parent->nlink--;
67355+ ent = NULL;
67356+ }
67357+ }
67358+ return ent;
67359+}
67360+EXPORT_SYMBOL_GPL(proc_mkdir_data_restrict);
67361+
67362 struct proc_dir_entry *proc_mkdir_mode(const char *name, umode_t mode,
67363 struct proc_dir_entry *parent)
67364 {
67365@@ -455,6 +512,13 @@ struct proc_dir_entry *proc_mkdir(const char *name,
67366 }
67367 EXPORT_SYMBOL(proc_mkdir);
67368
67369+struct proc_dir_entry *proc_mkdir_restrict(const char *name,
67370+ struct proc_dir_entry *parent)
67371+{
67372+ return proc_mkdir_data_restrict(name, 0, parent, NULL);
67373+}
67374+EXPORT_SYMBOL(proc_mkdir_restrict);
67375+
67376 struct proc_dir_entry *proc_create_data(const char *name, umode_t mode,
67377 struct proc_dir_entry *parent,
67378 const struct file_operations *proc_fops,
67379diff --git a/fs/proc/inode.c b/fs/proc/inode.c
67380index 7697b66..8d8e541 100644
67381--- a/fs/proc/inode.c
67382+++ b/fs/proc/inode.c
67383@@ -24,11 +24,17 @@
67384 #include <linux/mount.h>
67385 #include <linux/magic.h>
67386 #include <linux/namei.h>
67387+#include <linux/grsecurity.h>
67388
67389 #include <asm/uaccess.h>
67390
67391 #include "internal.h"
67392
67393+#ifdef CONFIG_PROC_SYSCTL
67394+extern const struct inode_operations proc_sys_inode_operations;
67395+extern const struct inode_operations proc_sys_dir_operations;
67396+#endif
67397+
67398 static void proc_evict_inode(struct inode *inode)
67399 {
67400 struct proc_dir_entry *de;
67401@@ -49,6 +55,13 @@ static void proc_evict_inode(struct inode *inode)
67402 RCU_INIT_POINTER(PROC_I(inode)->sysctl, NULL);
67403 sysctl_head_put(head);
67404 }
67405+
67406+#ifdef CONFIG_PROC_SYSCTL
67407+ if (inode->i_op == &proc_sys_inode_operations ||
67408+ inode->i_op == &proc_sys_dir_operations)
67409+ gr_handle_delete(inode->i_ino, inode->i_sb->s_dev);
67410+#endif
67411+
67412 }
67413
67414 static struct kmem_cache * proc_inode_cachep;
67415@@ -426,7 +439,11 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
67416 if (de->mode) {
67417 inode->i_mode = de->mode;
67418 inode->i_uid = de->uid;
67419+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
67420+ inode->i_gid = grsec_proc_gid;
67421+#else
67422 inode->i_gid = de->gid;
67423+#endif
67424 }
67425 if (de->size)
67426 inode->i_size = de->size;
67427diff --git a/fs/proc/internal.h b/fs/proc/internal.h
67428index c835b94..c9e01a3 100644
67429--- a/fs/proc/internal.h
67430+++ b/fs/proc/internal.h
67431@@ -47,9 +47,10 @@ struct proc_dir_entry {
67432 struct completion *pde_unload_completion;
67433 struct list_head pde_openers; /* who did ->open, but not ->release */
67434 spinlock_t pde_unload_lock; /* proc_fops checks and pde_users bumps */
67435+ u8 restricted; /* a directory in /proc/net that should be restricted via GRKERNSEC_PROC */
67436 u8 namelen;
67437 char name[];
67438-};
67439+} __randomize_layout;
67440
67441 union proc_op {
67442 int (*proc_get_link)(struct dentry *, struct path *);
67443@@ -67,7 +68,7 @@ struct proc_inode {
67444 struct ctl_table *sysctl_entry;
67445 const struct proc_ns_operations *ns_ops;
67446 struct inode vfs_inode;
67447-};
67448+} __randomize_layout;
67449
67450 /*
67451 * General functions
67452@@ -155,6 +156,10 @@ extern int proc_pid_status(struct seq_file *, struct pid_namespace *,
67453 struct pid *, struct task_struct *);
67454 extern int proc_pid_statm(struct seq_file *, struct pid_namespace *,
67455 struct pid *, struct task_struct *);
67456+#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
67457+extern int proc_pid_ipaddr(struct seq_file *, struct pid_namespace *,
67458+ struct pid *, struct task_struct *);
67459+#endif
67460
67461 /*
67462 * base.c
67463@@ -179,9 +184,11 @@ extern bool proc_fill_cache(struct file *, struct dir_context *, const char *, i
67464 * generic.c
67465 */
67466 extern struct dentry *proc_lookup(struct inode *, struct dentry *, unsigned int);
67467+extern struct dentry *proc_lookup_restrict(struct inode *, struct dentry *, unsigned int);
67468 extern struct dentry *proc_lookup_de(struct proc_dir_entry *, struct inode *,
67469 struct dentry *);
67470 extern int proc_readdir(struct file *, struct dir_context *);
67471+extern int proc_readdir_restrict(struct file *, struct dir_context *);
67472 extern int proc_readdir_de(struct proc_dir_entry *, struct file *, struct dir_context *);
67473
67474 static inline struct proc_dir_entry *pde_get(struct proc_dir_entry *pde)
67475diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
67476index a352d57..cb94a5c 100644
67477--- a/fs/proc/interrupts.c
67478+++ b/fs/proc/interrupts.c
67479@@ -47,7 +47,11 @@ static const struct file_operations proc_interrupts_operations = {
67480
67481 static int __init proc_interrupts_init(void)
67482 {
67483+#ifdef CONFIG_GRKERNSEC_PROC_ADD
67484+ proc_create_grsec("interrupts", 0, NULL, &proc_interrupts_operations);
67485+#else
67486 proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
67487+#endif
67488 return 0;
67489 }
67490 fs_initcall(proc_interrupts_init);
67491diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
67492index 91a4e64..69f1a3e 100644
67493--- a/fs/proc/kcore.c
67494+++ b/fs/proc/kcore.c
67495@@ -483,9 +483,10 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
67496 * the addresses in the elf_phdr on our list.
67497 */
67498 start = kc_offset_to_vaddr(*fpos - elf_buflen);
67499- if ((tsz = (PAGE_SIZE - (start & ~PAGE_MASK))) > buflen)
67500+ tsz = PAGE_SIZE - (start & ~PAGE_MASK);
67501+ if (tsz > buflen)
67502 tsz = buflen;
67503-
67504+
67505 while (buflen) {
67506 struct kcore_list *m;
67507
67508@@ -514,20 +515,23 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
67509 kfree(elf_buf);
67510 } else {
67511 if (kern_addr_valid(start)) {
67512- unsigned long n;
67513+ char *elf_buf;
67514+ mm_segment_t oldfs;
67515
67516- n = copy_to_user(buffer, (char *)start, tsz);
67517- /*
67518- * We cannot distinguish between fault on source
67519- * and fault on destination. When this happens
67520- * we clear too and hope it will trigger the
67521- * EFAULT again.
67522- */
67523- if (n) {
67524- if (clear_user(buffer + tsz - n,
67525- n))
67526+ elf_buf = kmalloc(tsz, GFP_KERNEL);
67527+ if (!elf_buf)
67528+ return -ENOMEM;
67529+ oldfs = get_fs();
67530+ set_fs(KERNEL_DS);
67531+ if (!__copy_from_user(elf_buf, (const void __user *)start, tsz)) {
67532+ set_fs(oldfs);
67533+ if (copy_to_user(buffer, elf_buf, tsz)) {
67534+ kfree(elf_buf);
67535 return -EFAULT;
67536+ }
67537 }
67538+ set_fs(oldfs);
67539+ kfree(elf_buf);
67540 } else {
67541 if (clear_user(buffer, tsz))
67542 return -EFAULT;
67543@@ -547,6 +551,9 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
67544
67545 static int open_kcore(struct inode *inode, struct file *filp)
67546 {
67547+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
67548+ return -EPERM;
67549+#endif
67550 if (!capable(CAP_SYS_RAWIO))
67551 return -EPERM;
67552 if (kcore_need_update)
67553@@ -580,7 +587,7 @@ static int __meminit kcore_callback(struct notifier_block *self,
67554 return NOTIFY_OK;
67555 }
67556
67557-static struct notifier_block kcore_callback_nb __meminitdata = {
67558+static struct notifier_block kcore_callback_nb __meminitconst = {
67559 .notifier_call = kcore_callback,
67560 .priority = 0,
67561 };
67562diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
67563index d3ebf2e..6ad42d1 100644
67564--- a/fs/proc/meminfo.c
67565+++ b/fs/proc/meminfo.c
67566@@ -194,7 +194,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
67567 vmi.used >> 10,
67568 vmi.largest_chunk >> 10
67569 #ifdef CONFIG_MEMORY_FAILURE
67570- , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10)
67571+ , atomic_long_read_unchecked(&num_poisoned_pages) << (PAGE_SHIFT - 10)
67572 #endif
67573 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
67574 , K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
67575diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
67576index d4a3574..b421ce9 100644
67577--- a/fs/proc/nommu.c
67578+++ b/fs/proc/nommu.c
67579@@ -64,7 +64,7 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region)
67580
67581 if (file) {
67582 seq_pad(m, ' ');
67583- seq_path(m, &file->f_path, "");
67584+ seq_path(m, &file->f_path, "\n\\");
67585 }
67586
67587 seq_putc(m, '\n');
67588diff --git a/fs/proc/proc_net.c b/fs/proc/proc_net.c
67589index 1bde894..22ac7eb 100644
67590--- a/fs/proc/proc_net.c
67591+++ b/fs/proc/proc_net.c
67592@@ -23,9 +23,27 @@
67593 #include <linux/nsproxy.h>
67594 #include <net/net_namespace.h>
67595 #include <linux/seq_file.h>
67596+#include <linux/grsecurity.h>
67597
67598 #include "internal.h"
67599
67600+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
67601+static struct seq_operations *ipv6_seq_ops_addr;
67602+
67603+void register_ipv6_seq_ops_addr(struct seq_operations *addr)
67604+{
67605+ ipv6_seq_ops_addr = addr;
67606+}
67607+
67608+void unregister_ipv6_seq_ops_addr(void)
67609+{
67610+ ipv6_seq_ops_addr = NULL;
67611+}
67612+
67613+EXPORT_SYMBOL_GPL(register_ipv6_seq_ops_addr);
67614+EXPORT_SYMBOL_GPL(unregister_ipv6_seq_ops_addr);
67615+#endif
67616+
67617 static inline struct net *PDE_NET(struct proc_dir_entry *pde)
67618 {
67619 return pde->parent->data;
67620@@ -36,6 +54,8 @@ static struct net *get_proc_net(const struct inode *inode)
67621 return maybe_get_net(PDE_NET(PDE(inode)));
67622 }
67623
67624+extern const struct seq_operations dev_seq_ops;
67625+
67626 int seq_open_net(struct inode *ino, struct file *f,
67627 const struct seq_operations *ops, int size)
67628 {
67629@@ -44,6 +64,14 @@ int seq_open_net(struct inode *ino, struct file *f,
67630
67631 BUG_ON(size < sizeof(*p));
67632
67633+ /* only permit access to /proc/net/dev */
67634+ if (
67635+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
67636+ ops != ipv6_seq_ops_addr &&
67637+#endif
67638+ ops != &dev_seq_ops && gr_proc_is_restricted())
67639+ return -EACCES;
67640+
67641 net = get_proc_net(ino);
67642 if (net == NULL)
67643 return -ENXIO;
67644@@ -66,6 +94,9 @@ int single_open_net(struct inode *inode, struct file *file,
67645 int err;
67646 struct net *net;
67647
67648+ if (gr_proc_is_restricted())
67649+ return -EACCES;
67650+
67651 err = -ENXIO;
67652 net = get_proc_net(inode);
67653 if (net == NULL)
67654diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
67655index f92d5dd..26398ac 100644
67656--- a/fs/proc/proc_sysctl.c
67657+++ b/fs/proc/proc_sysctl.c
67658@@ -11,13 +11,21 @@
67659 #include <linux/namei.h>
67660 #include <linux/mm.h>
67661 #include <linux/module.h>
67662+#include <linux/nsproxy.h>
67663+#ifdef CONFIG_GRKERNSEC
67664+#include <net/net_namespace.h>
67665+#endif
67666 #include "internal.h"
67667
67668+extern int gr_handle_chroot_sysctl(const int op);
67669+extern int gr_handle_sysctl_mod(const char *dirname, const char *name,
67670+ const int op);
67671+
67672 static const struct dentry_operations proc_sys_dentry_operations;
67673 static const struct file_operations proc_sys_file_operations;
67674-static const struct inode_operations proc_sys_inode_operations;
67675+const struct inode_operations proc_sys_inode_operations;
67676 static const struct file_operations proc_sys_dir_file_operations;
67677-static const struct inode_operations proc_sys_dir_operations;
67678+const struct inode_operations proc_sys_dir_operations;
67679
67680 void proc_sys_poll_notify(struct ctl_table_poll *poll)
67681 {
67682@@ -467,6 +475,9 @@ static struct dentry *proc_sys_lookup(struct inode *dir, struct dentry *dentry,
67683
67684 err = NULL;
67685 d_set_d_op(dentry, &proc_sys_dentry_operations);
67686+
67687+ gr_handle_proc_create(dentry, inode);
67688+
67689 d_add(dentry, inode);
67690
67691 out:
67692@@ -482,6 +493,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
67693 struct inode *inode = file_inode(filp);
67694 struct ctl_table_header *head = grab_header(inode);
67695 struct ctl_table *table = PROC_I(inode)->sysctl_entry;
67696+ int op = write ? MAY_WRITE : MAY_READ;
67697 ssize_t error;
67698 size_t res;
67699
67700@@ -493,7 +505,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
67701 * and won't be until we finish.
67702 */
67703 error = -EPERM;
67704- if (sysctl_perm(head, table, write ? MAY_WRITE : MAY_READ))
67705+ if (sysctl_perm(head, table, op))
67706 goto out;
67707
67708 /* if that can happen at all, it should be -EINVAL, not -EISDIR */
67709@@ -501,6 +513,27 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *buf,
67710 if (!table->proc_handler)
67711 goto out;
67712
67713+#ifdef CONFIG_GRKERNSEC
67714+ error = -EPERM;
67715+ if (gr_handle_chroot_sysctl(op))
67716+ goto out;
67717+ dget(filp->f_path.dentry);
67718+ if (gr_handle_sysctl_mod(filp->f_path.dentry->d_parent->d_name.name, table->procname, op)) {
67719+ dput(filp->f_path.dentry);
67720+ goto out;
67721+ }
67722+ dput(filp->f_path.dentry);
67723+ if (!gr_acl_handle_open(filp->f_path.dentry, filp->f_path.mnt, op))
67724+ goto out;
67725+ if (write) {
67726+ if (current->nsproxy->net_ns != table->extra2) {
67727+ if (!capable(CAP_SYS_ADMIN))
67728+ goto out;
67729+ } else if (!ns_capable(current->nsproxy->net_ns->user_ns, CAP_NET_ADMIN))
67730+ goto out;
67731+ }
67732+#endif
67733+
67734 /* careful: calling conventions are nasty here */
67735 res = count;
67736 error = table->proc_handler(table, write, buf, &res, ppos);
67737@@ -598,6 +631,9 @@ static bool proc_sys_fill_cache(struct file *file,
67738 return false;
67739 } else {
67740 d_set_d_op(child, &proc_sys_dentry_operations);
67741+
67742+ gr_handle_proc_create(child, inode);
67743+
67744 d_add(child, inode);
67745 }
67746 } else {
67747@@ -641,6 +677,9 @@ static int scan(struct ctl_table_header *head, struct ctl_table *table,
67748 if ((*pos)++ < ctx->pos)
67749 return true;
67750
67751+ if (!gr_acl_handle_hidden_file(file->f_path.dentry, file->f_path.mnt))
67752+ return 0;
67753+
67754 if (unlikely(S_ISLNK(table->mode)))
67755 res = proc_sys_link_fill_cache(file, ctx, head, table);
67756 else
67757@@ -734,6 +773,9 @@ static int proc_sys_getattr(struct vfsmount *mnt, struct dentry *dentry, struct
67758 if (IS_ERR(head))
67759 return PTR_ERR(head);
67760
67761+ if (table && !gr_acl_handle_hidden_file(dentry, mnt))
67762+ return -ENOENT;
67763+
67764 generic_fillattr(inode, stat);
67765 if (table)
67766 stat->mode = (stat->mode & S_IFMT) | table->mode;
67767@@ -756,13 +798,13 @@ static const struct file_operations proc_sys_dir_file_operations = {
67768 .llseek = generic_file_llseek,
67769 };
67770
67771-static const struct inode_operations proc_sys_inode_operations = {
67772+const struct inode_operations proc_sys_inode_operations = {
67773 .permission = proc_sys_permission,
67774 .setattr = proc_sys_setattr,
67775 .getattr = proc_sys_getattr,
67776 };
67777
67778-static const struct inode_operations proc_sys_dir_operations = {
67779+const struct inode_operations proc_sys_dir_operations = {
67780 .lookup = proc_sys_lookup,
67781 .permission = proc_sys_permission,
67782 .setattr = proc_sys_setattr,
67783@@ -839,7 +881,7 @@ static struct ctl_dir *find_subdir(struct ctl_dir *dir,
67784 static struct ctl_dir *new_dir(struct ctl_table_set *set,
67785 const char *name, int namelen)
67786 {
67787- struct ctl_table *table;
67788+ ctl_table_no_const *table;
67789 struct ctl_dir *new;
67790 struct ctl_node *node;
67791 char *new_name;
67792@@ -851,7 +893,7 @@ static struct ctl_dir *new_dir(struct ctl_table_set *set,
67793 return NULL;
67794
67795 node = (struct ctl_node *)(new + 1);
67796- table = (struct ctl_table *)(node + 1);
67797+ table = (ctl_table_no_const *)(node + 1);
67798 new_name = (char *)(table + 2);
67799 memcpy(new_name, name, namelen);
67800 new_name[namelen] = '\0';
67801@@ -1020,7 +1062,8 @@ static int sysctl_check_table(const char *path, struct ctl_table *table)
67802 static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table *table,
67803 struct ctl_table_root *link_root)
67804 {
67805- struct ctl_table *link_table, *entry, *link;
67806+ ctl_table_no_const *link_table, *link;
67807+ struct ctl_table *entry;
67808 struct ctl_table_header *links;
67809 struct ctl_node *node;
67810 char *link_name;
67811@@ -1043,7 +1086,7 @@ static struct ctl_table_header *new_links(struct ctl_dir *dir, struct ctl_table
67812 return NULL;
67813
67814 node = (struct ctl_node *)(links + 1);
67815- link_table = (struct ctl_table *)(node + nr_entries);
67816+ link_table = (ctl_table_no_const *)(node + nr_entries);
67817 link_name = (char *)&link_table[nr_entries + 1];
67818
67819 for (link = link_table, entry = table; entry->procname; link++, entry++) {
67820@@ -1291,8 +1334,8 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
67821 struct ctl_table_header ***subheader, struct ctl_table_set *set,
67822 struct ctl_table *table)
67823 {
67824- struct ctl_table *ctl_table_arg = NULL;
67825- struct ctl_table *entry, *files;
67826+ ctl_table_no_const *ctl_table_arg = NULL, *files = NULL;
67827+ struct ctl_table *entry;
67828 int nr_files = 0;
67829 int nr_dirs = 0;
67830 int err = -ENOMEM;
67831@@ -1304,10 +1347,9 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
67832 nr_files++;
67833 }
67834
67835- files = table;
67836 /* If there are mixed files and directories we need a new table */
67837 if (nr_dirs && nr_files) {
67838- struct ctl_table *new;
67839+ ctl_table_no_const *new;
67840 files = kzalloc(sizeof(struct ctl_table) * (nr_files + 1),
67841 GFP_KERNEL);
67842 if (!files)
67843@@ -1325,7 +1367,7 @@ static int register_leaf_sysctl_tables(const char *path, char *pos,
67844 /* Register everything except a directory full of subdirectories */
67845 if (nr_files || !nr_dirs) {
67846 struct ctl_table_header *header;
67847- header = __register_sysctl_table(set, path, files);
67848+ header = __register_sysctl_table(set, path, files ? files : table);
67849 if (!header) {
67850 kfree(ctl_table_arg);
67851 goto out;
67852diff --git a/fs/proc/root.c b/fs/proc/root.c
67853index e74ac9f..35e89f4 100644
67854--- a/fs/proc/root.c
67855+++ b/fs/proc/root.c
67856@@ -188,7 +188,15 @@ void __init proc_root_init(void)
67857 proc_mkdir("openprom", NULL);
67858 #endif
67859 proc_tty_init();
67860+#ifdef CONFIG_GRKERNSEC_PROC_ADD
67861+#ifdef CONFIG_GRKERNSEC_PROC_USER
67862+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR, NULL);
67863+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67864+ proc_mkdir_mode("bus", S_IRUSR | S_IXUSR | S_IRGRP | S_IXGRP, NULL);
67865+#endif
67866+#else
67867 proc_mkdir("bus", NULL);
67868+#endif
67869 proc_sys_init();
67870 }
67871
67872diff --git a/fs/proc/stat.c b/fs/proc/stat.c
67873index 510413eb..34d9a8c 100644
67874--- a/fs/proc/stat.c
67875+++ b/fs/proc/stat.c
67876@@ -11,6 +11,7 @@
67877 #include <linux/irqnr.h>
67878 #include <linux/cputime.h>
67879 #include <linux/tick.h>
67880+#include <linux/grsecurity.h>
67881
67882 #ifndef arch_irq_stat_cpu
67883 #define arch_irq_stat_cpu(cpu) 0
67884@@ -87,6 +88,18 @@ static int show_stat(struct seq_file *p, void *v)
67885 u64 sum_softirq = 0;
67886 unsigned int per_softirq_sums[NR_SOFTIRQS] = {0};
67887 struct timespec boottime;
67888+ int unrestricted = 1;
67889+
67890+#ifdef CONFIG_GRKERNSEC_PROC_ADD
67891+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
67892+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
67893+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
67894+ && !in_group_p(grsec_proc_gid)
67895+#endif
67896+ )
67897+ unrestricted = 0;
67898+#endif
67899+#endif
67900
67901 user = nice = system = idle = iowait =
67902 irq = softirq = steal = 0;
67903@@ -99,23 +112,25 @@ static int show_stat(struct seq_file *p, void *v)
67904 nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE];
67905 system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
67906 idle += get_idle_time(i);
67907- iowait += get_iowait_time(i);
67908- irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
67909- softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
67910- steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
67911- guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
67912- guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
67913- sum += kstat_cpu_irqs_sum(i);
67914- sum += arch_irq_stat_cpu(i);
67915+ if (unrestricted) {
67916+ iowait += get_iowait_time(i);
67917+ irq += kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
67918+ softirq += kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
67919+ steal += kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
67920+ guest += kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
67921+ guest_nice += kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
67922+ sum += kstat_cpu_irqs_sum(i);
67923+ sum += arch_irq_stat_cpu(i);
67924+ for (j = 0; j < NR_SOFTIRQS; j++) {
67925+ unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
67926
67927- for (j = 0; j < NR_SOFTIRQS; j++) {
67928- unsigned int softirq_stat = kstat_softirqs_cpu(j, i);
67929-
67930- per_softirq_sums[j] += softirq_stat;
67931- sum_softirq += softirq_stat;
67932+ per_softirq_sums[j] += softirq_stat;
67933+ sum_softirq += softirq_stat;
67934+ }
67935 }
67936 }
67937- sum += arch_irq_stat();
67938+ if (unrestricted)
67939+ sum += arch_irq_stat();
67940
67941 seq_puts(p, "cpu ");
67942 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
67943@@ -136,12 +151,14 @@ static int show_stat(struct seq_file *p, void *v)
67944 nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE];
67945 system = kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM];
67946 idle = get_idle_time(i);
67947- iowait = get_iowait_time(i);
67948- irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
67949- softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
67950- steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
67951- guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
67952- guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
67953+ if (unrestricted) {
67954+ iowait = get_iowait_time(i);
67955+ irq = kcpustat_cpu(i).cpustat[CPUTIME_IRQ];
67956+ softirq = kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ];
67957+ steal = kcpustat_cpu(i).cpustat[CPUTIME_STEAL];
67958+ guest = kcpustat_cpu(i).cpustat[CPUTIME_GUEST];
67959+ guest_nice = kcpustat_cpu(i).cpustat[CPUTIME_GUEST_NICE];
67960+ }
67961 seq_printf(p, "cpu%d", i);
67962 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(user));
67963 seq_put_decimal_ull(p, ' ', cputime64_to_clock_t(nice));
67964@@ -159,7 +176,7 @@ static int show_stat(struct seq_file *p, void *v)
67965
67966 /* sum again ? it could be updated? */
67967 for_each_irq_nr(j)
67968- seq_put_decimal_ull(p, ' ', kstat_irqs_usr(j));
67969+ seq_put_decimal_ull(p, ' ', unrestricted ? kstat_irqs_usr(j) : 0ULL);
67970
67971 seq_printf(p,
67972 "\nctxt %llu\n"
67973@@ -167,11 +184,11 @@ static int show_stat(struct seq_file *p, void *v)
67974 "processes %lu\n"
67975 "procs_running %lu\n"
67976 "procs_blocked %lu\n",
67977- nr_context_switches(),
67978+ unrestricted ? nr_context_switches() : 0ULL,
67979 (unsigned long)jif,
67980- total_forks,
67981- nr_running(),
67982- nr_iowait());
67983+ unrestricted ? total_forks : 0UL,
67984+ unrestricted ? nr_running() : 0UL,
67985+ unrestricted ? nr_iowait() : 0UL);
67986
67987 seq_printf(p, "softirq %llu", (unsigned long long)sum_softirq);
67988
67989diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
67990index 6dee68d..1b4add0 100644
67991--- a/fs/proc/task_mmu.c
67992+++ b/fs/proc/task_mmu.c
67993@@ -13,12 +13,19 @@
67994 #include <linux/swap.h>
67995 #include <linux/swapops.h>
67996 #include <linux/mmu_notifier.h>
67997+#include <linux/grsecurity.h>
67998
67999 #include <asm/elf.h>
68000 #include <asm/uaccess.h>
68001 #include <asm/tlbflush.h>
68002 #include "internal.h"
68003
68004+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68005+#define PAX_RAND_FLAGS(_mm) (_mm != NULL && _mm != current->mm && \
68006+ (_mm->pax_flags & MF_PAX_RANDMMAP || \
68007+ _mm->pax_flags & MF_PAX_SEGMEXEC))
68008+#endif
68009+
68010 void task_mem(struct seq_file *m, struct mm_struct *mm)
68011 {
68012 unsigned long data, text, lib, swap, ptes, pmds;
68013@@ -57,8 +64,13 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
68014 "VmLib:\t%8lu kB\n"
68015 "VmPTE:\t%8lu kB\n"
68016 "VmPMD:\t%8lu kB\n"
68017- "VmSwap:\t%8lu kB\n",
68018- hiwater_vm << (PAGE_SHIFT-10),
68019+ "VmSwap:\t%8lu kB\n"
68020+
68021+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
68022+ "CsBase:\t%8lx\nCsLim:\t%8lx\n"
68023+#endif
68024+
68025+ ,hiwater_vm << (PAGE_SHIFT-10),
68026 total_vm << (PAGE_SHIFT-10),
68027 mm->locked_vm << (PAGE_SHIFT-10),
68028 mm->pinned_vm << (PAGE_SHIFT-10),
68029@@ -68,7 +80,19 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
68030 mm->stack_vm << (PAGE_SHIFT-10), text, lib,
68031 ptes >> 10,
68032 pmds >> 10,
68033- swap << (PAGE_SHIFT-10));
68034+ swap << (PAGE_SHIFT-10)
68035+
68036+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
68037+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68038+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_base
68039+ , PAX_RAND_FLAGS(mm) ? 0 : mm->context.user_cs_limit
68040+#else
68041+ , mm->context.user_cs_base
68042+ , mm->context.user_cs_limit
68043+#endif
68044+#endif
68045+
68046+ );
68047 }
68048
68049 unsigned long task_vsize(struct mm_struct *mm)
68050@@ -285,13 +309,13 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
68051 pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
68052 }
68053
68054- /* We don't show the stack guard page in /proc/maps */
68055+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68056+ start = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_start;
68057+ end = PAX_RAND_FLAGS(mm) ? 0UL : vma->vm_end;
68058+#else
68059 start = vma->vm_start;
68060- if (stack_guard_page_start(vma, start))
68061- start += PAGE_SIZE;
68062 end = vma->vm_end;
68063- if (stack_guard_page_end(vma, end))
68064- end -= PAGE_SIZE;
68065+#endif
68066
68067 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1);
68068 seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ",
68069@@ -301,7 +325,11 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
68070 flags & VM_WRITE ? 'w' : '-',
68071 flags & VM_EXEC ? 'x' : '-',
68072 flags & VM_MAYSHARE ? 's' : 'p',
68073+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68074+ PAX_RAND_FLAGS(mm) ? 0UL : pgoff,
68075+#else
68076 pgoff,
68077+#endif
68078 MAJOR(dev), MINOR(dev), ino);
68079
68080 /*
68081@@ -310,7 +338,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
68082 */
68083 if (file) {
68084 seq_pad(m, ' ');
68085- seq_path(m, &file->f_path, "\n");
68086+ seq_path(m, &file->f_path, "\n\\");
68087 goto done;
68088 }
68089
68090@@ -341,8 +369,9 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
68091 * Thread stack in /proc/PID/task/TID/maps or
68092 * the main process stack.
68093 */
68094- if (!is_pid || (vma->vm_start <= mm->start_stack &&
68095- vma->vm_end >= mm->start_stack)) {
68096+ if (!is_pid || (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP)) ||
68097+ (vma->vm_start <= mm->start_stack &&
68098+ vma->vm_end >= mm->start_stack)) {
68099 name = "[stack]";
68100 } else {
68101 /* Thread stack in /proc/PID/maps */
68102@@ -362,6 +391,12 @@ done:
68103
68104 static int show_map(struct seq_file *m, void *v, int is_pid)
68105 {
68106+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68107+ if (current->exec_id != m->exec_id) {
68108+ gr_log_badprocpid("maps");
68109+ return 0;
68110+ }
68111+#endif
68112 show_map_vma(m, v, is_pid);
68113 m_cache_vma(m, v);
68114 return 0;
68115@@ -620,9 +655,18 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
68116 .private = &mss,
68117 };
68118
68119+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68120+ if (current->exec_id != m->exec_id) {
68121+ gr_log_badprocpid("smaps");
68122+ return 0;
68123+ }
68124+#endif
68125 memset(&mss, 0, sizeof mss);
68126- /* mmap_sem is held in m_start */
68127- walk_page_vma(vma, &smaps_walk);
68128+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68129+ if (!PAX_RAND_FLAGS(vma->vm_mm))
68130+#endif
68131+ /* mmap_sem is held in m_start */
68132+ walk_page_vma(vma, &smaps_walk);
68133
68134 show_map_vma(m, vma, is_pid);
68135
68136@@ -641,7 +685,11 @@ static int show_smap(struct seq_file *m, void *v, int is_pid)
68137 "KernelPageSize: %8lu kB\n"
68138 "MMUPageSize: %8lu kB\n"
68139 "Locked: %8lu kB\n",
68140+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68141+ PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : (vma->vm_end - vma->vm_start) >> 10,
68142+#else
68143 (vma->vm_end - vma->vm_start) >> 10,
68144+#endif
68145 mss.resident >> 10,
68146 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
68147 mss.shared_clean >> 10,
68148@@ -1491,6 +1539,13 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
68149 char buffer[64];
68150 int nid;
68151
68152+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68153+ if (current->exec_id != m->exec_id) {
68154+ gr_log_badprocpid("numa_maps");
68155+ return 0;
68156+ }
68157+#endif
68158+
68159 if (!mm)
68160 return 0;
68161
68162@@ -1505,11 +1560,15 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
68163 mpol_to_str(buffer, sizeof(buffer), proc_priv->task_mempolicy);
68164 }
68165
68166+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68167+ seq_printf(m, "%08lx %s", PAX_RAND_FLAGS(vma->vm_mm) ? 0UL : vma->vm_start, buffer);
68168+#else
68169 seq_printf(m, "%08lx %s", vma->vm_start, buffer);
68170+#endif
68171
68172 if (file) {
68173 seq_puts(m, " file=");
68174- seq_path(m, &file->f_path, "\n\t= ");
68175+ seq_path(m, &file->f_path, "\n\t\\= ");
68176 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
68177 seq_puts(m, " heap");
68178 } else {
68179diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c
68180index 599ec2e..f1413ae 100644
68181--- a/fs/proc/task_nommu.c
68182+++ b/fs/proc/task_nommu.c
68183@@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct mm_struct *mm)
68184 else
68185 bytes += kobjsize(mm);
68186
68187- if (current->fs && current->fs->users > 1)
68188+ if (current->fs && atomic_read(&current->fs->users) > 1)
68189 sbytes += kobjsize(current->fs);
68190 else
68191 bytes += kobjsize(current->fs);
68192@@ -180,7 +180,7 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma,
68193
68194 if (file) {
68195 seq_pad(m, ' ');
68196- seq_path(m, &file->f_path, "");
68197+ seq_path(m, &file->f_path, "\n\\");
68198 } else if (mm) {
68199 pid_t tid = pid_of_stack(priv, vma, is_pid);
68200
68201diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
68202index 4e61388..1a2523d 100644
68203--- a/fs/proc/vmcore.c
68204+++ b/fs/proc/vmcore.c
68205@@ -105,9 +105,13 @@ static ssize_t read_from_oldmem(char *buf, size_t count,
68206 nr_bytes = count;
68207
68208 /* If pfn is not ram, return zeros for sparse dump files */
68209- if (pfn_is_ram(pfn) == 0)
68210- memset(buf, 0, nr_bytes);
68211- else {
68212+ if (pfn_is_ram(pfn) == 0) {
68213+ if (userbuf) {
68214+ if (clear_user((char __force_user *)buf, nr_bytes))
68215+ return -EFAULT;
68216+ } else
68217+ memset(buf, 0, nr_bytes);
68218+ } else {
68219 tmp = copy_oldmem_page(pfn, buf, nr_bytes,
68220 offset, userbuf);
68221 if (tmp < 0)
68222@@ -170,7 +174,7 @@ int __weak remap_oldmem_pfn_range(struct vm_area_struct *vma,
68223 static int copy_to(void *target, void *src, size_t size, int userbuf)
68224 {
68225 if (userbuf) {
68226- if (copy_to_user((char __user *) target, src, size))
68227+ if (copy_to_user((char __force_user *) target, src, size))
68228 return -EFAULT;
68229 } else {
68230 memcpy(target, src, size);
68231@@ -233,7 +237,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
68232 if (*fpos < m->offset + m->size) {
68233 tsz = min_t(size_t, m->offset + m->size - *fpos, buflen);
68234 start = m->paddr + *fpos - m->offset;
68235- tmp = read_from_oldmem(buffer, tsz, &start, userbuf);
68236+ tmp = read_from_oldmem((char __force_kernel *)buffer, tsz, &start, userbuf);
68237 if (tmp < 0)
68238 return tmp;
68239 buflen -= tsz;
68240@@ -253,7 +257,7 @@ static ssize_t __read_vmcore(char *buffer, size_t buflen, loff_t *fpos,
68241 static ssize_t read_vmcore(struct file *file, char __user *buffer,
68242 size_t buflen, loff_t *fpos)
68243 {
68244- return __read_vmcore((__force char *) buffer, buflen, fpos, 1);
68245+ return __read_vmcore((__force_kernel char *) buffer, buflen, fpos, 1);
68246 }
68247
68248 /*
68249diff --git a/fs/qnx6/qnx6.h b/fs/qnx6/qnx6.h
68250index d3fb2b6..43a8140 100644
68251--- a/fs/qnx6/qnx6.h
68252+++ b/fs/qnx6/qnx6.h
68253@@ -74,7 +74,7 @@ enum {
68254 BYTESEX_BE,
68255 };
68256
68257-static inline __u64 fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
68258+static inline __u64 __intentional_overflow(-1) fs64_to_cpu(struct qnx6_sb_info *sbi, __fs64 n)
68259 {
68260 if (sbi->s_bytesex == BYTESEX_LE)
68261 return le64_to_cpu((__force __le64)n);
68262@@ -90,7 +90,7 @@ static inline __fs64 cpu_to_fs64(struct qnx6_sb_info *sbi, __u64 n)
68263 return (__force __fs64)cpu_to_be64(n);
68264 }
68265
68266-static inline __u32 fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
68267+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct qnx6_sb_info *sbi, __fs32 n)
68268 {
68269 if (sbi->s_bytesex == BYTESEX_LE)
68270 return le32_to_cpu((__force __le32)n);
68271diff --git a/fs/quota/netlink.c b/fs/quota/netlink.c
68272index bb2869f..d34ada8 100644
68273--- a/fs/quota/netlink.c
68274+++ b/fs/quota/netlink.c
68275@@ -44,7 +44,7 @@ static struct genl_family quota_genl_family = {
68276 void quota_send_warning(struct kqid qid, dev_t dev,
68277 const char warntype)
68278 {
68279- static atomic_t seq;
68280+ static atomic_unchecked_t seq;
68281 struct sk_buff *skb;
68282 void *msg_head;
68283 int ret;
68284@@ -60,7 +60,7 @@ void quota_send_warning(struct kqid qid, dev_t dev,
68285 "VFS: Not enough memory to send quota warning.\n");
68286 return;
68287 }
68288- msg_head = genlmsg_put(skb, 0, atomic_add_return(1, &seq),
68289+ msg_head = genlmsg_put(skb, 0, atomic_add_return_unchecked(1, &seq),
68290 &quota_genl_family, 0, QUOTA_NL_C_WARNING);
68291 if (!msg_head) {
68292 printk(KERN_ERR
68293diff --git a/fs/read_write.c b/fs/read_write.c
68294index 8e1b687..bad2eec 100644
68295--- a/fs/read_write.c
68296+++ b/fs/read_write.c
68297@@ -553,7 +553,7 @@ ssize_t __kernel_write(struct file *file, const char *buf, size_t count, loff_t
68298
68299 old_fs = get_fs();
68300 set_fs(get_ds());
68301- p = (__force const char __user *)buf;
68302+ p = (const char __force_user *)buf;
68303 if (count > MAX_RW_COUNT)
68304 count = MAX_RW_COUNT;
68305 if (file->f_op->write)
68306diff --git a/fs/readdir.c b/fs/readdir.c
68307index ced6791..936687b 100644
68308--- a/fs/readdir.c
68309+++ b/fs/readdir.c
68310@@ -18,6 +18,7 @@
68311 #include <linux/security.h>
68312 #include <linux/syscalls.h>
68313 #include <linux/unistd.h>
68314+#include <linux/namei.h>
68315
68316 #include <asm/uaccess.h>
68317
68318@@ -71,6 +72,7 @@ struct old_linux_dirent {
68319 struct readdir_callback {
68320 struct dir_context ctx;
68321 struct old_linux_dirent __user * dirent;
68322+ struct file * file;
68323 int result;
68324 };
68325
68326@@ -89,6 +91,10 @@ static int fillonedir(struct dir_context *ctx, const char *name, int namlen,
68327 buf->result = -EOVERFLOW;
68328 return -EOVERFLOW;
68329 }
68330+
68331+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68332+ return 0;
68333+
68334 buf->result++;
68335 dirent = buf->dirent;
68336 if (!access_ok(VERIFY_WRITE, dirent,
68337@@ -120,6 +126,7 @@ SYSCALL_DEFINE3(old_readdir, unsigned int, fd,
68338 if (!f.file)
68339 return -EBADF;
68340
68341+ buf.file = f.file;
68342 error = iterate_dir(f.file, &buf.ctx);
68343 if (buf.result)
68344 error = buf.result;
68345@@ -145,6 +152,7 @@ struct getdents_callback {
68346 struct dir_context ctx;
68347 struct linux_dirent __user * current_dir;
68348 struct linux_dirent __user * previous;
68349+ struct file * file;
68350 int count;
68351 int error;
68352 };
68353@@ -167,6 +175,10 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen,
68354 buf->error = -EOVERFLOW;
68355 return -EOVERFLOW;
68356 }
68357+
68358+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68359+ return 0;
68360+
68361 dirent = buf->previous;
68362 if (dirent) {
68363 if (__put_user(offset, &dirent->d_off))
68364@@ -212,6 +224,7 @@ SYSCALL_DEFINE3(getdents, unsigned int, fd,
68365 if (!f.file)
68366 return -EBADF;
68367
68368+ buf.file = f.file;
68369 error = iterate_dir(f.file, &buf.ctx);
68370 if (error >= 0)
68371 error = buf.error;
68372@@ -230,6 +243,7 @@ struct getdents_callback64 {
68373 struct dir_context ctx;
68374 struct linux_dirent64 __user * current_dir;
68375 struct linux_dirent64 __user * previous;
68376+ struct file *file;
68377 int count;
68378 int error;
68379 };
68380@@ -246,6 +260,10 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen,
68381 buf->error = -EINVAL; /* only used if we fail.. */
68382 if (reclen > buf->count)
68383 return -EINVAL;
68384+
68385+ if (!gr_acl_handle_filldir(buf->file, name, namlen, ino))
68386+ return 0;
68387+
68388 dirent = buf->previous;
68389 if (dirent) {
68390 if (__put_user(offset, &dirent->d_off))
68391@@ -293,6 +311,7 @@ SYSCALL_DEFINE3(getdents64, unsigned int, fd,
68392 if (!f.file)
68393 return -EBADF;
68394
68395+ buf.file = f.file;
68396 error = iterate_dir(f.file, &buf.ctx);
68397 if (error >= 0)
68398 error = buf.error;
68399diff --git a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
68400index 9c02d96..6562c10 100644
68401--- a/fs/reiserfs/do_balan.c
68402+++ b/fs/reiserfs/do_balan.c
68403@@ -1887,7 +1887,7 @@ void do_balance(struct tree_balance *tb, struct item_head *ih,
68404 return;
68405 }
68406
68407- atomic_inc(&fs_generation(tb->tb_sb));
68408+ atomic_inc_unchecked(&fs_generation(tb->tb_sb));
68409 do_balance_starts(tb);
68410
68411 /*
68412diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
68413index aca73dd..e3c558d 100644
68414--- a/fs/reiserfs/item_ops.c
68415+++ b/fs/reiserfs/item_ops.c
68416@@ -724,18 +724,18 @@ static void errcatch_print_vi(struct virtual_item *vi)
68417 }
68418
68419 static struct item_operations errcatch_ops = {
68420- errcatch_bytes_number,
68421- errcatch_decrement_key,
68422- errcatch_is_left_mergeable,
68423- errcatch_print_item,
68424- errcatch_check_item,
68425+ .bytes_number = errcatch_bytes_number,
68426+ .decrement_key = errcatch_decrement_key,
68427+ .is_left_mergeable = errcatch_is_left_mergeable,
68428+ .print_item = errcatch_print_item,
68429+ .check_item = errcatch_check_item,
68430
68431- errcatch_create_vi,
68432- errcatch_check_left,
68433- errcatch_check_right,
68434- errcatch_part_size,
68435- errcatch_unit_num,
68436- errcatch_print_vi
68437+ .create_vi = errcatch_create_vi,
68438+ .check_left = errcatch_check_left,
68439+ .check_right = errcatch_check_right,
68440+ .part_size = errcatch_part_size,
68441+ .unit_num = errcatch_unit_num,
68442+ .print_vi = errcatch_print_vi
68443 };
68444
68445 #if ! (TYPE_STAT_DATA == 0 && TYPE_INDIRECT == 1 && TYPE_DIRECT == 2 && TYPE_DIRENTRY == 3)
68446diff --git a/fs/reiserfs/procfs.c b/fs/reiserfs/procfs.c
68447index 621b9f3..af527fd 100644
68448--- a/fs/reiserfs/procfs.c
68449+++ b/fs/reiserfs/procfs.c
68450@@ -114,7 +114,7 @@ static int show_super(struct seq_file *m, void *unused)
68451 "SMALL_TAILS " : "NO_TAILS ",
68452 replay_only(sb) ? "REPLAY_ONLY " : "",
68453 convert_reiserfs(sb) ? "CONV " : "",
68454- atomic_read(&r->s_generation_counter),
68455+ atomic_read_unchecked(&r->s_generation_counter),
68456 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
68457 SF(s_do_balance), SF(s_unneeded_left_neighbor),
68458 SF(s_good_search_by_key_reada), SF(s_bmaps),
68459diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
68460index bb79cdd..fcf49ef 100644
68461--- a/fs/reiserfs/reiserfs.h
68462+++ b/fs/reiserfs/reiserfs.h
68463@@ -580,7 +580,7 @@ struct reiserfs_sb_info {
68464 /* Comment? -Hans */
68465 wait_queue_head_t s_wait;
68466 /* increased by one every time the tree gets re-balanced */
68467- atomic_t s_generation_counter;
68468+ atomic_unchecked_t s_generation_counter;
68469
68470 /* File system properties. Currently holds on-disk FS format */
68471 unsigned long s_properties;
68472@@ -2301,7 +2301,7 @@ static inline loff_t max_reiserfs_offset(struct inode *inode)
68473 #define REISERFS_USER_MEM 1 /* user memory mode */
68474
68475 #define fs_generation(s) (REISERFS_SB(s)->s_generation_counter)
68476-#define get_generation(s) atomic_read (&fs_generation(s))
68477+#define get_generation(s) atomic_read_unchecked (&fs_generation(s))
68478 #define FILESYSTEM_CHANGED_TB(tb) (get_generation((tb)->tb_sb) != (tb)->fs_gen)
68479 #define __fs_changed(gen,s) (gen != get_generation (s))
68480 #define fs_changed(gen,s) \
68481diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
68482index 71fbbe3..eff29ba 100644
68483--- a/fs/reiserfs/super.c
68484+++ b/fs/reiserfs/super.c
68485@@ -1868,6 +1868,10 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
68486 sbi->s_mount_opt |= (1 << REISERFS_SMALLTAIL);
68487 sbi->s_mount_opt |= (1 << REISERFS_ERROR_RO);
68488 sbi->s_mount_opt |= (1 << REISERFS_BARRIER_FLUSH);
68489+#ifdef CONFIG_REISERFS_FS_XATTR
68490+ /* turn on user xattrs by default */
68491+ sbi->s_mount_opt |= (1 << REISERFS_XATTRS_USER);
68492+#endif
68493 /* no preallocation minimum, be smart in reiserfs_file_write instead */
68494 sbi->s_alloc_options.preallocmin = 0;
68495 /* Preallocate by 16 blocks (17-1) at once */
68496diff --git a/fs/select.c b/fs/select.c
68497index f684c75..4117611 100644
68498--- a/fs/select.c
68499+++ b/fs/select.c
68500@@ -20,6 +20,7 @@
68501 #include <linux/export.h>
68502 #include <linux/slab.h>
68503 #include <linux/poll.h>
68504+#include <linux/security.h>
68505 #include <linux/personality.h> /* for STICKY_TIMEOUTS */
68506 #include <linux/file.h>
68507 #include <linux/fdtable.h>
68508@@ -880,6 +881,7 @@ int do_sys_poll(struct pollfd __user *ufds, unsigned int nfds,
68509 struct poll_list *walk = head;
68510 unsigned long todo = nfds;
68511
68512+ gr_learn_resource(current, RLIMIT_NOFILE, nfds, 1);
68513 if (nfds > rlimit(RLIMIT_NOFILE))
68514 return -EINVAL;
68515
68516diff --git a/fs/seq_file.c b/fs/seq_file.c
68517index 555f821..34684d7 100644
68518--- a/fs/seq_file.c
68519+++ b/fs/seq_file.c
68520@@ -12,6 +12,8 @@
68521 #include <linux/slab.h>
68522 #include <linux/cred.h>
68523 #include <linux/mm.h>
68524+#include <linux/sched.h>
68525+#include <linux/grsecurity.h>
68526
68527 #include <asm/uaccess.h>
68528 #include <asm/page.h>
68529@@ -23,16 +25,7 @@ static void seq_set_overflow(struct seq_file *m)
68530
68531 static void *seq_buf_alloc(unsigned long size)
68532 {
68533- void *buf;
68534-
68535- /*
68536- * __GFP_NORETRY to avoid oom-killings with high-order allocations -
68537- * it's better to fall back to vmalloc() than to kill things.
68538- */
68539- buf = kmalloc(size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
68540- if (!buf && size > PAGE_SIZE)
68541- buf = vmalloc(size);
68542- return buf;
68543+ return kmalloc(size, GFP_KERNEL | GFP_USERCOPY);
68544 }
68545
68546 /**
68547@@ -65,6 +58,9 @@ int seq_open(struct file *file, const struct seq_operations *op)
68548 #ifdef CONFIG_USER_NS
68549 p->user_ns = file->f_cred->user_ns;
68550 #endif
68551+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
68552+ p->exec_id = current->exec_id;
68553+#endif
68554
68555 /*
68556 * Wrappers around seq_open(e.g. swaps_open) need to be
68557@@ -87,6 +83,16 @@ int seq_open(struct file *file, const struct seq_operations *op)
68558 }
68559 EXPORT_SYMBOL(seq_open);
68560
68561+
68562+int seq_open_restrict(struct file *file, const struct seq_operations *op)
68563+{
68564+ if (gr_proc_is_restricted())
68565+ return -EACCES;
68566+
68567+ return seq_open(file, op);
68568+}
68569+EXPORT_SYMBOL(seq_open_restrict);
68570+
68571 static int traverse(struct seq_file *m, loff_t offset)
68572 {
68573 loff_t pos = 0, index;
68574@@ -158,7 +164,7 @@ Eoverflow:
68575 ssize_t seq_read(struct file *file, char __user *buf, size_t size, loff_t *ppos)
68576 {
68577 struct seq_file *m = file->private_data;
68578- size_t copied = 0;
68579+ ssize_t copied = 0;
68580 loff_t pos;
68581 size_t n;
68582 void *p;
68583@@ -557,7 +563,7 @@ static void single_stop(struct seq_file *p, void *v)
68584 int single_open(struct file *file, int (*show)(struct seq_file *, void *),
68585 void *data)
68586 {
68587- struct seq_operations *op = kmalloc(sizeof(*op), GFP_KERNEL);
68588+ seq_operations_no_const *op = kzalloc(sizeof(*op), GFP_KERNEL);
68589 int res = -ENOMEM;
68590
68591 if (op) {
68592@@ -593,6 +599,17 @@ int single_open_size(struct file *file, int (*show)(struct seq_file *, void *),
68593 }
68594 EXPORT_SYMBOL(single_open_size);
68595
68596+int single_open_restrict(struct file *file, int (*show)(struct seq_file *, void *),
68597+ void *data)
68598+{
68599+ if (gr_proc_is_restricted())
68600+ return -EACCES;
68601+
68602+ return single_open(file, show, data);
68603+}
68604+EXPORT_SYMBOL(single_open_restrict);
68605+
68606+
68607 int single_release(struct inode *inode, struct file *file)
68608 {
68609 const struct seq_operations *op = ((struct seq_file *)file->private_data)->op;
68610diff --git a/fs/splice.c b/fs/splice.c
68611index 7968da9..275187d 100644
68612--- a/fs/splice.c
68613+++ b/fs/splice.c
68614@@ -193,7 +193,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
68615 pipe_lock(pipe);
68616
68617 for (;;) {
68618- if (!pipe->readers) {
68619+ if (!atomic_read(&pipe->readers)) {
68620 send_sig(SIGPIPE, current, 0);
68621 if (!ret)
68622 ret = -EPIPE;
68623@@ -216,7 +216,7 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
68624 page_nr++;
68625 ret += buf->len;
68626
68627- if (pipe->files)
68628+ if (atomic_read(&pipe->files))
68629 do_wakeup = 1;
68630
68631 if (!--spd->nr_pages)
68632@@ -247,9 +247,9 @@ ssize_t splice_to_pipe(struct pipe_inode_info *pipe,
68633 do_wakeup = 0;
68634 }
68635
68636- pipe->waiting_writers++;
68637+ atomic_inc(&pipe->waiting_writers);
68638 pipe_wait(pipe);
68639- pipe->waiting_writers--;
68640+ atomic_dec(&pipe->waiting_writers);
68641 }
68642
68643 pipe_unlock(pipe);
68644@@ -576,7 +576,7 @@ static ssize_t kernel_readv(struct file *file, const struct iovec *vec,
68645 old_fs = get_fs();
68646 set_fs(get_ds());
68647 /* The cast to a user pointer is valid due to the set_fs() */
68648- res = vfs_readv(file, (const struct iovec __user *)vec, vlen, &pos);
68649+ res = vfs_readv(file, (const struct iovec __force_user *)vec, vlen, &pos);
68650 set_fs(old_fs);
68651
68652 return res;
68653@@ -591,7 +591,7 @@ ssize_t kernel_write(struct file *file, const char *buf, size_t count,
68654 old_fs = get_fs();
68655 set_fs(get_ds());
68656 /* The cast to a user pointer is valid due to the set_fs() */
68657- res = vfs_write(file, (__force const char __user *)buf, count, &pos);
68658+ res = vfs_write(file, (const char __force_user *)buf, count, &pos);
68659 set_fs(old_fs);
68660
68661 return res;
68662@@ -644,7 +644,7 @@ ssize_t default_file_splice_read(struct file *in, loff_t *ppos,
68663 goto err;
68664
68665 this_len = min_t(size_t, len, PAGE_CACHE_SIZE - offset);
68666- vec[i].iov_base = (void __user *) page_address(page);
68667+ vec[i].iov_base = (void __force_user *) page_address(page);
68668 vec[i].iov_len = this_len;
68669 spd.pages[i] = page;
68670 spd.nr_pages++;
68671@@ -783,7 +783,7 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
68672 ops->release(pipe, buf);
68673 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
68674 pipe->nrbufs--;
68675- if (pipe->files)
68676+ if (atomic_read(&pipe->files))
68677 sd->need_wakeup = true;
68678 }
68679
68680@@ -807,10 +807,10 @@ static int splice_from_pipe_feed(struct pipe_inode_info *pipe, struct splice_des
68681 static int splice_from_pipe_next(struct pipe_inode_info *pipe, struct splice_desc *sd)
68682 {
68683 while (!pipe->nrbufs) {
68684- if (!pipe->writers)
68685+ if (!atomic_read(&pipe->writers))
68686 return 0;
68687
68688- if (!pipe->waiting_writers && sd->num_spliced)
68689+ if (!atomic_read(&pipe->waiting_writers) && sd->num_spliced)
68690 return 0;
68691
68692 if (sd->flags & SPLICE_F_NONBLOCK)
68693@@ -1025,7 +1025,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
68694 ops->release(pipe, buf);
68695 pipe->curbuf = (pipe->curbuf + 1) & (pipe->buffers - 1);
68696 pipe->nrbufs--;
68697- if (pipe->files)
68698+ if (atomic_read(&pipe->files))
68699 sd.need_wakeup = true;
68700 } else {
68701 buf->offset += ret;
68702@@ -1185,7 +1185,7 @@ ssize_t splice_direct_to_actor(struct file *in, struct splice_desc *sd,
68703 * out of the pipe right after the splice_to_pipe(). So set
68704 * PIPE_READERS appropriately.
68705 */
68706- pipe->readers = 1;
68707+ atomic_set(&pipe->readers, 1);
68708
68709 current->splice_pipe = pipe;
68710 }
68711@@ -1482,6 +1482,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
68712
68713 partial[buffers].offset = off;
68714 partial[buffers].len = plen;
68715+ partial[buffers].private = 0;
68716
68717 off = 0;
68718 len -= plen;
68719@@ -1718,9 +1719,9 @@ static int ipipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
68720 ret = -ERESTARTSYS;
68721 break;
68722 }
68723- if (!pipe->writers)
68724+ if (!atomic_read(&pipe->writers))
68725 break;
68726- if (!pipe->waiting_writers) {
68727+ if (!atomic_read(&pipe->waiting_writers)) {
68728 if (flags & SPLICE_F_NONBLOCK) {
68729 ret = -EAGAIN;
68730 break;
68731@@ -1752,7 +1753,7 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
68732 pipe_lock(pipe);
68733
68734 while (pipe->nrbufs >= pipe->buffers) {
68735- if (!pipe->readers) {
68736+ if (!atomic_read(&pipe->readers)) {
68737 send_sig(SIGPIPE, current, 0);
68738 ret = -EPIPE;
68739 break;
68740@@ -1765,9 +1766,9 @@ static int opipe_prep(struct pipe_inode_info *pipe, unsigned int flags)
68741 ret = -ERESTARTSYS;
68742 break;
68743 }
68744- pipe->waiting_writers++;
68745+ atomic_inc(&pipe->waiting_writers);
68746 pipe_wait(pipe);
68747- pipe->waiting_writers--;
68748+ atomic_dec(&pipe->waiting_writers);
68749 }
68750
68751 pipe_unlock(pipe);
68752@@ -1803,14 +1804,14 @@ retry:
68753 pipe_double_lock(ipipe, opipe);
68754
68755 do {
68756- if (!opipe->readers) {
68757+ if (!atomic_read(&opipe->readers)) {
68758 send_sig(SIGPIPE, current, 0);
68759 if (!ret)
68760 ret = -EPIPE;
68761 break;
68762 }
68763
68764- if (!ipipe->nrbufs && !ipipe->writers)
68765+ if (!ipipe->nrbufs && !atomic_read(&ipipe->writers))
68766 break;
68767
68768 /*
68769@@ -1907,7 +1908,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
68770 pipe_double_lock(ipipe, opipe);
68771
68772 do {
68773- if (!opipe->readers) {
68774+ if (!atomic_read(&opipe->readers)) {
68775 send_sig(SIGPIPE, current, 0);
68776 if (!ret)
68777 ret = -EPIPE;
68778@@ -1952,7 +1953,7 @@ static int link_pipe(struct pipe_inode_info *ipipe,
68779 * return EAGAIN if we have the potential of some data in the
68780 * future, otherwise just return 0
68781 */
68782- if (!ret && ipipe->waiting_writers && (flags & SPLICE_F_NONBLOCK))
68783+ if (!ret && atomic_read(&ipipe->waiting_writers) && (flags & SPLICE_F_NONBLOCK))
68784 ret = -EAGAIN;
68785
68786 pipe_unlock(ipipe);
68787diff --git a/fs/stat.c b/fs/stat.c
68788index ae0c3ce..9ee641c 100644
68789--- a/fs/stat.c
68790+++ b/fs/stat.c
68791@@ -28,8 +28,13 @@ void generic_fillattr(struct inode *inode, struct kstat *stat)
68792 stat->gid = inode->i_gid;
68793 stat->rdev = inode->i_rdev;
68794 stat->size = i_size_read(inode);
68795- stat->atime = inode->i_atime;
68796- stat->mtime = inode->i_mtime;
68797+ if (is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
68798+ stat->atime = inode->i_ctime;
68799+ stat->mtime = inode->i_ctime;
68800+ } else {
68801+ stat->atime = inode->i_atime;
68802+ stat->mtime = inode->i_mtime;
68803+ }
68804 stat->ctime = inode->i_ctime;
68805 stat->blksize = (1 << inode->i_blkbits);
68806 stat->blocks = inode->i_blocks;
68807@@ -52,9 +57,16 @@ EXPORT_SYMBOL(generic_fillattr);
68808 int vfs_getattr_nosec(struct path *path, struct kstat *stat)
68809 {
68810 struct inode *inode = path->dentry->d_inode;
68811+ int retval;
68812
68813- if (inode->i_op->getattr)
68814- return inode->i_op->getattr(path->mnt, path->dentry, stat);
68815+ if (inode->i_op->getattr) {
68816+ retval = inode->i_op->getattr(path->mnt, path->dentry, stat);
68817+ if (!retval && is_sidechannel_device(inode) && !capable_nolog(CAP_MKNOD)) {
68818+ stat->atime = stat->ctime;
68819+ stat->mtime = stat->ctime;
68820+ }
68821+ return retval;
68822+ }
68823
68824 generic_fillattr(inode, stat);
68825 return 0;
68826diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
68827index 0b45ff4..edf9d3a 100644
68828--- a/fs/sysfs/dir.c
68829+++ b/fs/sysfs/dir.c
68830@@ -33,6 +33,10 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
68831 kfree(buf);
68832 }
68833
68834+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68835+extern int grsec_enable_sysfs_restrict;
68836+#endif
68837+
68838 /**
68839 * sysfs_create_dir_ns - create a directory for an object with a namespace tag
68840 * @kobj: object we're creating directory for
68841@@ -41,9 +45,16 @@ void sysfs_warn_dup(struct kernfs_node *parent, const char *name)
68842 int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
68843 {
68844 struct kernfs_node *parent, *kn;
68845+ const char *name;
68846+ umode_t mode = S_IRWXU | S_IRUGO | S_IXUGO;
68847+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68848+ const char *parent_name;
68849+#endif
68850
68851 BUG_ON(!kobj);
68852
68853+ name = kobject_name(kobj);
68854+
68855 if (kobj->parent)
68856 parent = kobj->parent->sd;
68857 else
68858@@ -52,11 +63,24 @@ int sysfs_create_dir_ns(struct kobject *kobj, const void *ns)
68859 if (!parent)
68860 return -ENOENT;
68861
68862- kn = kernfs_create_dir_ns(parent, kobject_name(kobj),
68863- S_IRWXU | S_IRUGO | S_IXUGO, kobj, ns);
68864+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
68865+ parent_name = parent->name;
68866+ mode = S_IRWXU;
68867+
68868+ if ((!strcmp(parent_name, "") && (!strcmp(name, "devices") || !strcmp(name, "fs"))) ||
68869+ (!strcmp(parent_name, "devices") && !strcmp(name, "system")) ||
68870+ (!strcmp(parent_name, "fs") && (!strcmp(name, "selinux") || !strcmp(name, "fuse") || !strcmp(name, "ecryptfs"))) ||
68871+ (!strcmp(parent_name, "system") && !strcmp(name, "cpu")))
68872+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
68873+ if (!grsec_enable_sysfs_restrict)
68874+ mode = S_IRWXU | S_IRUGO | S_IXUGO;
68875+#endif
68876+
68877+ kn = kernfs_create_dir_ns(parent, name,
68878+ mode, kobj, ns);
68879 if (IS_ERR(kn)) {
68880 if (PTR_ERR(kn) == -EEXIST)
68881- sysfs_warn_dup(parent, kobject_name(kobj));
68882+ sysfs_warn_dup(parent, name);
68883 return PTR_ERR(kn);
68884 }
68885
68886diff --git a/fs/sysv/sysv.h b/fs/sysv/sysv.h
68887index 69d4889..a810bd4 100644
68888--- a/fs/sysv/sysv.h
68889+++ b/fs/sysv/sysv.h
68890@@ -188,7 +188,7 @@ static inline u32 PDP_swab(u32 x)
68891 #endif
68892 }
68893
68894-static inline __u32 fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
68895+static inline __u32 __intentional_overflow(-1) fs32_to_cpu(struct sysv_sb_info *sbi, __fs32 n)
68896 {
68897 if (sbi->s_bytesex == BYTESEX_PDP)
68898 return PDP_swab((__force __u32)n);
68899diff --git a/fs/ubifs/io.c b/fs/ubifs/io.c
68900index fb08b0c..65fcc7e 100644
68901--- a/fs/ubifs/io.c
68902+++ b/fs/ubifs/io.c
68903@@ -155,7 +155,7 @@ int ubifs_leb_change(struct ubifs_info *c, int lnum, const void *buf, int len)
68904 return err;
68905 }
68906
68907-int ubifs_leb_unmap(struct ubifs_info *c, int lnum)
68908+int __intentional_overflow(-1) ubifs_leb_unmap(struct ubifs_info *c, int lnum)
68909 {
68910 int err;
68911
68912diff --git a/fs/udf/misc.c b/fs/udf/misc.c
68913index c175b4d..8f36a16 100644
68914--- a/fs/udf/misc.c
68915+++ b/fs/udf/misc.c
68916@@ -289,7 +289,7 @@ void udf_new_tag(char *data, uint16_t ident, uint16_t version, uint16_t snum,
68917
68918 u8 udf_tag_checksum(const struct tag *t)
68919 {
68920- u8 *data = (u8 *)t;
68921+ const u8 *data = (const u8 *)t;
68922 u8 checksum = 0;
68923 int i;
68924 for (i = 0; i < sizeof(struct tag); ++i)
68925diff --git a/fs/ufs/swab.h b/fs/ufs/swab.h
68926index 8d974c4..b82f6ec 100644
68927--- a/fs/ufs/swab.h
68928+++ b/fs/ufs/swab.h
68929@@ -22,7 +22,7 @@ enum {
68930 BYTESEX_BE
68931 };
68932
68933-static inline u64
68934+static inline u64 __intentional_overflow(-1)
68935 fs64_to_cpu(struct super_block *sbp, __fs64 n)
68936 {
68937 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
68938@@ -40,7 +40,7 @@ cpu_to_fs64(struct super_block *sbp, u64 n)
68939 return (__force __fs64)cpu_to_be64(n);
68940 }
68941
68942-static inline u32
68943+static inline u32 __intentional_overflow(-1)
68944 fs32_to_cpu(struct super_block *sbp, __fs32 n)
68945 {
68946 if (UFS_SB(sbp)->s_bytesex == BYTESEX_LE)
68947diff --git a/fs/utimes.c b/fs/utimes.c
68948index aa138d6..5f3a811 100644
68949--- a/fs/utimes.c
68950+++ b/fs/utimes.c
68951@@ -1,6 +1,7 @@
68952 #include <linux/compiler.h>
68953 #include <linux/file.h>
68954 #include <linux/fs.h>
68955+#include <linux/security.h>
68956 #include <linux/linkage.h>
68957 #include <linux/mount.h>
68958 #include <linux/namei.h>
68959@@ -103,6 +104,12 @@ static int utimes_common(struct path *path, struct timespec *times)
68960 }
68961 }
68962 retry_deleg:
68963+
68964+ if (!gr_acl_handle_utime(path->dentry, path->mnt)) {
68965+ error = -EACCES;
68966+ goto mnt_drop_write_and_out;
68967+ }
68968+
68969 mutex_lock(&inode->i_mutex);
68970 error = notify_change(path->dentry, &newattrs, &delegated_inode);
68971 mutex_unlock(&inode->i_mutex);
68972diff --git a/fs/xattr.c b/fs/xattr.c
68973index 4ef6985..a6cd6567 100644
68974--- a/fs/xattr.c
68975+++ b/fs/xattr.c
68976@@ -227,6 +227,27 @@ int vfs_xattr_cmp(struct dentry *dentry, const char *xattr_name,
68977 return rc;
68978 }
68979
68980+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
68981+ssize_t
68982+pax_getxattr(struct dentry *dentry, void *value, size_t size)
68983+{
68984+ struct inode *inode = dentry->d_inode;
68985+ ssize_t error;
68986+
68987+ error = inode_permission(inode, MAY_EXEC);
68988+ if (error)
68989+ return error;
68990+
68991+ if (inode->i_op->getxattr)
68992+ error = inode->i_op->getxattr(dentry, XATTR_NAME_PAX_FLAGS, value, size);
68993+ else
68994+ error = -EOPNOTSUPP;
68995+
68996+ return error;
68997+}
68998+EXPORT_SYMBOL(pax_getxattr);
68999+#endif
69000+
69001 ssize_t
69002 vfs_getxattr(struct dentry *dentry, const char *name, void *value, size_t size)
69003 {
69004@@ -319,7 +340,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
69005 * Extended attribute SET operations
69006 */
69007 static long
69008-setxattr(struct dentry *d, const char __user *name, const void __user *value,
69009+setxattr(struct path *path, const char __user *name, const void __user *value,
69010 size_t size, int flags)
69011 {
69012 int error;
69013@@ -355,7 +376,12 @@ setxattr(struct dentry *d, const char __user *name, const void __user *value,
69014 posix_acl_fix_xattr_from_user(kvalue, size);
69015 }
69016
69017- error = vfs_setxattr(d, kname, kvalue, size, flags);
69018+ if (!gr_acl_handle_setxattr(path->dentry, path->mnt)) {
69019+ error = -EACCES;
69020+ goto out;
69021+ }
69022+
69023+ error = vfs_setxattr(path->dentry, kname, kvalue, size, flags);
69024 out:
69025 if (vvalue)
69026 vfree(vvalue);
69027@@ -376,7 +402,7 @@ retry:
69028 return error;
69029 error = mnt_want_write(path.mnt);
69030 if (!error) {
69031- error = setxattr(path.dentry, name, value, size, flags);
69032+ error = setxattr(&path, name, value, size, flags);
69033 mnt_drop_write(path.mnt);
69034 }
69035 path_put(&path);
69036@@ -412,7 +438,7 @@ SYSCALL_DEFINE5(fsetxattr, int, fd, const char __user *, name,
69037 audit_file(f.file);
69038 error = mnt_want_write_file(f.file);
69039 if (!error) {
69040- error = setxattr(f.file->f_path.dentry, name, value, size, flags);
69041+ error = setxattr(&f.file->f_path, name, value, size, flags);
69042 mnt_drop_write_file(f.file);
69043 }
69044 fdput(f);
69045@@ -598,7 +624,7 @@ SYSCALL_DEFINE3(flistxattr, int, fd, char __user *, list, size_t, size)
69046 * Extended attribute REMOVE operations
69047 */
69048 static long
69049-removexattr(struct dentry *d, const char __user *name)
69050+removexattr(struct path *path, const char __user *name)
69051 {
69052 int error;
69053 char kname[XATTR_NAME_MAX + 1];
69054@@ -609,7 +635,10 @@ removexattr(struct dentry *d, const char __user *name)
69055 if (error < 0)
69056 return error;
69057
69058- return vfs_removexattr(d, kname);
69059+ if (!gr_acl_handle_removexattr(path->dentry, path->mnt))
69060+ return -EACCES;
69061+
69062+ return vfs_removexattr(path->dentry, kname);
69063 }
69064
69065 static int path_removexattr(const char __user *pathname,
69066@@ -623,7 +652,7 @@ retry:
69067 return error;
69068 error = mnt_want_write(path.mnt);
69069 if (!error) {
69070- error = removexattr(path.dentry, name);
69071+ error = removexattr(&path, name);
69072 mnt_drop_write(path.mnt);
69073 }
69074 path_put(&path);
69075@@ -649,14 +678,16 @@ SYSCALL_DEFINE2(lremovexattr, const char __user *, pathname,
69076 SYSCALL_DEFINE2(fremovexattr, int, fd, const char __user *, name)
69077 {
69078 struct fd f = fdget(fd);
69079+ struct path *path;
69080 int error = -EBADF;
69081
69082 if (!f.file)
69083 return error;
69084+ path = &f.file->f_path;
69085 audit_file(f.file);
69086 error = mnt_want_write_file(f.file);
69087 if (!error) {
69088- error = removexattr(f.file->f_path.dentry, name);
69089+ error = removexattr(path, name);
69090 mnt_drop_write_file(f.file);
69091 }
69092 fdput(f);
69093diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
69094index 61ec015..7c18807 100644
69095--- a/fs/xfs/libxfs/xfs_bmap.c
69096+++ b/fs/xfs/libxfs/xfs_bmap.c
69097@@ -580,7 +580,7 @@ xfs_bmap_validate_ret(
69098
69099 #else
69100 #define xfs_bmap_check_leaf_extents(cur, ip, whichfork) do { } while (0)
69101-#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap)
69102+#define xfs_bmap_validate_ret(bno,len,flags,mval,onmap,nmap) do { } while (0)
69103 #endif /* DEBUG */
69104
69105 /*
69106diff --git a/fs/xfs/xfs_dir2_readdir.c b/fs/xfs/xfs_dir2_readdir.c
69107index 098cd78..724d3f8 100644
69108--- a/fs/xfs/xfs_dir2_readdir.c
69109+++ b/fs/xfs/xfs_dir2_readdir.c
69110@@ -140,7 +140,12 @@ xfs_dir2_sf_getdents(
69111 ino = dp->d_ops->sf_get_ino(sfp, sfep);
69112 filetype = dp->d_ops->sf_get_ftype(sfep);
69113 ctx->pos = off & 0x7fffffff;
69114- if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
69115+ if (dp->i_df.if_u1.if_data == dp->i_df.if_u2.if_inline_data) {
69116+ char name[sfep->namelen];
69117+ memcpy(name, sfep->name, sfep->namelen);
69118+ if (!dir_emit(ctx, name, sfep->namelen, ino, xfs_dir3_get_dtype(dp->i_mount, filetype)))
69119+ return 0;
69120+ } else if (!dir_emit(ctx, (char *)sfep->name, sfep->namelen, ino,
69121 xfs_dir3_get_dtype(dp->i_mount, filetype)))
69122 return 0;
69123 sfep = dp->d_ops->sf_nextentry(sfp, sfep);
69124diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
69125index ac4feae..386d551 100644
69126--- a/fs/xfs/xfs_ioctl.c
69127+++ b/fs/xfs/xfs_ioctl.c
69128@@ -120,7 +120,7 @@ xfs_find_handle(
69129 }
69130
69131 error = -EFAULT;
69132- if (copy_to_user(hreq->ohandle, &handle, hsize) ||
69133+ if (hsize > sizeof handle || copy_to_user(hreq->ohandle, &handle, hsize) ||
69134 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
69135 goto out_put;
69136
69137diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h
69138index c31d2c2..6ec8f62 100644
69139--- a/fs/xfs/xfs_linux.h
69140+++ b/fs/xfs/xfs_linux.h
69141@@ -234,7 +234,7 @@ static inline kgid_t xfs_gid_to_kgid(__uint32_t gid)
69142 * of the compiler which do not like us using do_div in the middle
69143 * of large functions.
69144 */
69145-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
69146+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
69147 {
69148 __u32 mod;
69149
69150@@ -290,7 +290,7 @@ static inline __u32 xfs_do_mod(void *a, __u32 b, int n)
69151 return 0;
69152 }
69153 #else
69154-static inline __u32 xfs_do_div(void *a, __u32 b, int n)
69155+static inline __u32 __intentional_overflow(-1) xfs_do_div(void *a, __u32 b, int n)
69156 {
69157 __u32 mod;
69158
69159diff --git a/grsecurity/Kconfig b/grsecurity/Kconfig
69160new file mode 100644
69161index 0000000..31f8fe4
69162--- /dev/null
69163+++ b/grsecurity/Kconfig
69164@@ -0,0 +1,1182 @@
69165+#
69166+# grecurity configuration
69167+#
69168+menu "Memory Protections"
69169+depends on GRKERNSEC
69170+
69171+config GRKERNSEC_KMEM
69172+ bool "Deny reading/writing to /dev/kmem, /dev/mem, and /dev/port"
69173+ default y if GRKERNSEC_CONFIG_AUTO
69174+ select STRICT_DEVMEM if (X86 || ARM || TILE || S390)
69175+ help
69176+ If you say Y here, /dev/kmem and /dev/mem won't be allowed to
69177+ be written to or read from to modify or leak the contents of the running
69178+ kernel. /dev/port will also not be allowed to be opened, writing to
69179+ /dev/cpu/*/msr will be prevented, and support for kexec will be removed.
69180+ If you have module support disabled, enabling this will close up several
69181+ ways that are currently used to insert malicious code into the running
69182+ kernel.
69183+
69184+ Even with this feature enabled, we still highly recommend that
69185+ you use the RBAC system, as it is still possible for an attacker to
69186+ modify the running kernel through other more obscure methods.
69187+
69188+ It is highly recommended that you say Y here if you meet all the
69189+ conditions above.
69190+
69191+config GRKERNSEC_VM86
69192+ bool "Restrict VM86 mode"
69193+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
69194+ depends on X86_32
69195+
69196+ help
69197+ If you say Y here, only processes with CAP_SYS_RAWIO will be able to
69198+ make use of a special execution mode on 32bit x86 processors called
69199+ Virtual 8086 (VM86) mode. XFree86 may need vm86 mode for certain
69200+ video cards and will still work with this option enabled. The purpose
69201+ of the option is to prevent exploitation of emulation errors in
69202+ virtualization of vm86 mode like the one discovered in VMWare in 2009.
69203+ Nearly all users should be able to enable this option.
69204+
69205+config GRKERNSEC_IO
69206+ bool "Disable privileged I/O"
69207+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
69208+ depends on X86
69209+ select RTC_CLASS
69210+ select RTC_INTF_DEV
69211+ select RTC_DRV_CMOS
69212+
69213+ help
69214+ If you say Y here, all ioperm and iopl calls will return an error.
69215+ Ioperm and iopl can be used to modify the running kernel.
69216+ Unfortunately, some programs need this access to operate properly,
69217+ the most notable of which are XFree86 and hwclock. hwclock can be
69218+ remedied by having RTC support in the kernel, so real-time
69219+ clock support is enabled if this option is enabled, to ensure
69220+ that hwclock operates correctly. If hwclock still does not work,
69221+ either update udev or symlink /dev/rtc to /dev/rtc0.
69222+
69223+ If you're using XFree86 or a version of Xorg from 2012 or earlier,
69224+ you may not be able to boot into a graphical environment with this
69225+ option enabled. In this case, you should use the RBAC system instead.
69226+
69227+config GRKERNSEC_BPF_HARDEN
69228+ bool "Harden BPF interpreter"
69229+ default y if GRKERNSEC_CONFIG_AUTO
69230+ help
69231+ Unlike previous versions of grsecurity that hardened both the BPF
69232+ interpreted code against corruption at rest as well as the JIT code
69233+ against JIT-spray attacks and attacker-controlled immediate values
69234+ for ROP, this feature will enforce disabling of the new eBPF JIT engine
69235+ and will ensure the interpreted code is read-only at rest. This feature
69236+ may be removed at a later time when eBPF stabilizes to entirely revert
69237+ back to the more secure pre-3.16 BPF interpreter/JIT.
69238+
69239+ If you're using KERNEXEC, it's recommended that you enable this option
69240+ to supplement the hardening of the kernel.
69241+
69242+config GRKERNSEC_PERF_HARDEN
69243+ bool "Disable unprivileged PERF_EVENTS usage by default"
69244+ default y if GRKERNSEC_CONFIG_AUTO
69245+ depends on PERF_EVENTS
69246+ help
69247+ If you say Y here, the range of acceptable values for the
69248+ /proc/sys/kernel/perf_event_paranoid sysctl will be expanded to allow and
69249+ default to a new value: 3. When the sysctl is set to this value, no
69250+ unprivileged use of the PERF_EVENTS syscall interface will be permitted.
69251+
69252+ Though PERF_EVENTS can be used legitimately for performance monitoring
69253+ and low-level application profiling, it is forced on regardless of
69254+ configuration, has been at fault for several vulnerabilities, and
69255+ creates new opportunities for side channels and other information leaks.
69256+
69257+ This feature puts PERF_EVENTS into a secure default state and permits
69258+ the administrator to change out of it temporarily if unprivileged
69259+ application profiling is needed.
69260+
69261+config GRKERNSEC_RAND_THREADSTACK
69262+ bool "Insert random gaps between thread stacks"
69263+ default y if GRKERNSEC_CONFIG_AUTO
69264+ depends on PAX_RANDMMAP && !PPC
69265+ help
69266+ If you say Y here, a random-sized gap will be enforced between allocated
69267+ thread stacks. Glibc's NPTL and other threading libraries that
69268+ pass MAP_STACK to the kernel for thread stack allocation are supported.
69269+ The implementation currently provides 8 bits of entropy for the gap.
69270+
69271+ Many distributions do not compile threaded remote services with the
69272+ -fstack-check argument to GCC, causing the variable-sized stack-based
69273+ allocator, alloca(), to not probe the stack on allocation. This
69274+ permits an unbounded alloca() to skip over any guard page and potentially
69275+ modify another thread's stack reliably. An enforced random gap
69276+ reduces the reliability of such an attack and increases the chance
69277+ that such a read/write to another thread's stack instead lands in
69278+ an unmapped area, causing a crash and triggering grsecurity's
69279+ anti-bruteforcing logic.
69280+
69281+config GRKERNSEC_PROC_MEMMAP
69282+ bool "Harden ASLR against information leaks and entropy reduction"
69283+ default y if (GRKERNSEC_CONFIG_AUTO || PAX_NOEXEC || PAX_ASLR)
69284+ depends on PAX_NOEXEC || PAX_ASLR
69285+ help
69286+ If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will
69287+ give no information about the addresses of its mappings if
69288+ PaX features that rely on random addresses are enabled on the task.
69289+ In addition to sanitizing this information and disabling other
69290+ dangerous sources of information, this option causes reads of sensitive
69291+ /proc/<pid> entries where the file descriptor was opened in a different
69292+ task than the one performing the read. Such attempts are logged.
69293+ This option also limits argv/env strings for suid/sgid binaries
69294+ to 512KB to prevent a complete exhaustion of the stack entropy provided
69295+ by ASLR. Finally, it places an 8MB stack resource limit on suid/sgid
69296+ binaries to prevent alternative mmap layouts from being abused.
69297+
69298+ If you use PaX it is essential that you say Y here as it closes up
69299+ several holes that make full ASLR useless locally.
69300+
69301+
69302+config GRKERNSEC_KSTACKOVERFLOW
69303+ bool "Prevent kernel stack overflows"
69304+ default y if GRKERNSEC_CONFIG_AUTO
69305+ depends on !IA64 && 64BIT
69306+ help
69307+ If you say Y here, the kernel's process stacks will be allocated
69308+ with vmalloc instead of the kernel's default allocator. This
69309+ introduces guard pages that in combination with the alloca checking
69310+ of the STACKLEAK feature prevents all forms of kernel process stack
69311+ overflow abuse. Note that this is different from kernel stack
69312+ buffer overflows.
69313+
69314+config GRKERNSEC_BRUTE
69315+ bool "Deter exploit bruteforcing"
69316+ default y if GRKERNSEC_CONFIG_AUTO
69317+ help
69318+ If you say Y here, attempts to bruteforce exploits against forking
69319+ daemons such as apache or sshd, as well as against suid/sgid binaries
69320+ will be deterred. When a child of a forking daemon is killed by PaX
69321+ or crashes due to an illegal instruction or other suspicious signal,
69322+ the parent process will be delayed 30 seconds upon every subsequent
69323+ fork until the administrator is able to assess the situation and
69324+ restart the daemon.
69325+ In the suid/sgid case, the attempt is logged, the user has all their
69326+ existing instances of the suid/sgid binary terminated and will
69327+ be unable to execute any suid/sgid binaries for 15 minutes.
69328+
69329+ It is recommended that you also enable signal logging in the auditing
69330+ section so that logs are generated when a process triggers a suspicious
69331+ signal.
69332+ If the sysctl option is enabled, a sysctl option with name
69333+ "deter_bruteforce" is created.
69334+
69335+config GRKERNSEC_MODHARDEN
69336+ bool "Harden module auto-loading"
69337+ default y if GRKERNSEC_CONFIG_AUTO
69338+ depends on MODULES
69339+ help
69340+ If you say Y here, module auto-loading in response to use of some
69341+ feature implemented by an unloaded module will be restricted to
69342+ root users. Enabling this option helps defend against attacks
69343+ by unprivileged users who abuse the auto-loading behavior to
69344+ cause a vulnerable module to load that is then exploited.
69345+
69346+ If this option prevents a legitimate use of auto-loading for a
69347+ non-root user, the administrator can execute modprobe manually
69348+ with the exact name of the module mentioned in the alert log.
69349+ Alternatively, the administrator can add the module to the list
69350+ of modules loaded at boot by modifying init scripts.
69351+
69352+ Modification of init scripts will most likely be needed on
69353+ Ubuntu servers with encrypted home directory support enabled,
69354+ as the first non-root user logging in will cause the ecb(aes),
69355+ ecb(aes)-all, cbc(aes), and cbc(aes)-all modules to be loaded.
69356+
69357+config GRKERNSEC_HIDESYM
69358+ bool "Hide kernel symbols"
69359+ default y if GRKERNSEC_CONFIG_AUTO
69360+ select PAX_USERCOPY_SLABS
69361+ help
69362+ If you say Y here, getting information on loaded modules, and
69363+ displaying all kernel symbols through a syscall will be restricted
69364+ to users with CAP_SYS_MODULE. For software compatibility reasons,
69365+ /proc/kallsyms will be restricted to the root user. The RBAC
69366+ system can hide that entry even from root.
69367+
69368+ This option also prevents leaking of kernel addresses through
69369+ several /proc entries.
69370+
69371+ Note that this option is only effective provided the following
69372+ conditions are met:
69373+ 1) The kernel using grsecurity is not precompiled by some distribution
69374+ 2) You have also enabled GRKERNSEC_DMESG
69375+ 3) You are using the RBAC system and hiding other files such as your
69376+ kernel image and System.map. Alternatively, enabling this option
69377+ causes the permissions on /boot, /lib/modules, and the kernel
69378+ source directory to change at compile time to prevent
69379+ reading by non-root users.
69380+ If the above conditions are met, this option will aid in providing a
69381+ useful protection against local kernel exploitation of overflows
69382+ and arbitrary read/write vulnerabilities.
69383+
69384+ It is highly recommended that you enable GRKERNSEC_PERF_HARDEN
69385+ in addition to this feature.
69386+
69387+config GRKERNSEC_RANDSTRUCT
69388+ bool "Randomize layout of sensitive kernel structures"
69389+ default y if GRKERNSEC_CONFIG_AUTO
69390+ select GRKERNSEC_HIDESYM
69391+ select MODVERSIONS if MODULES
69392+ help
69393+ If you say Y here, the layouts of a number of sensitive kernel
69394+ structures (task, fs, cred, etc) and all structures composed entirely
69395+ of function pointers (aka "ops" structs) will be randomized at compile-time.
69396+ This can introduce the requirement of an additional infoleak
69397+ vulnerability for exploits targeting these structure types.
69398+
69399+ Enabling this feature will introduce some performance impact, slightly
69400+ increase memory usage, and prevent the use of forensic tools like
69401+ Volatility against the system (unless the kernel source tree isn't
69402+ cleaned after kernel installation).
69403+
69404+ The seed used for compilation is located at tools/gcc/randomize_layout_seed.h.
69405+ It remains after a make clean to allow for external modules to be compiled
69406+ with the existing seed and will be removed by a make mrproper or
69407+ make distclean.
69408+
69409+ Note that the implementation requires gcc 4.6.4. or newer. You may need
69410+ to install the supporting headers explicitly in addition to the normal
69411+ gcc package.
69412+
69413+config GRKERNSEC_RANDSTRUCT_PERFORMANCE
69414+ bool "Use cacheline-aware structure randomization"
69415+ depends on GRKERNSEC_RANDSTRUCT
69416+ default y if GRKERNSEC_CONFIG_PRIORITY_PERF
69417+ help
69418+ If you say Y here, the RANDSTRUCT randomization will make a best effort
69419+ at restricting randomization to cacheline-sized groups of elements. It
69420+ will further not randomize bitfields in structures. This reduces the
69421+ performance hit of RANDSTRUCT at the cost of weakened randomization.
69422+
69423+config GRKERNSEC_KERN_LOCKOUT
69424+ bool "Active kernel exploit response"
69425+ default y if GRKERNSEC_CONFIG_AUTO
69426+ depends on X86 || ARM || PPC || SPARC
69427+ help
69428+ If you say Y here, when a PaX alert is triggered due to suspicious
69429+ activity in the kernel (from KERNEXEC/UDEREF/USERCOPY)
69430+ or an OOPS occurs due to bad memory accesses, instead of just
69431+ terminating the offending process (and potentially allowing
69432+ a subsequent exploit from the same user), we will take one of two
69433+ actions:
69434+ If the user was root, we will panic the system
69435+ If the user was non-root, we will log the attempt, terminate
69436+ all processes owned by the user, then prevent them from creating
69437+ any new processes until the system is restarted
69438+ This deters repeated kernel exploitation/bruteforcing attempts
69439+ and is useful for later forensics.
69440+
69441+config GRKERNSEC_OLD_ARM_USERLAND
69442+ bool "Old ARM userland compatibility"
69443+ depends on ARM && (CPU_V6 || CPU_V6K || CPU_V7)
69444+ help
69445+ If you say Y here, stubs of executable code to perform such operations
69446+ as "compare-exchange" will be placed at fixed locations in the ARM vector
69447+ table. This is unfortunately needed for old ARM userland meant to run
69448+ across a wide range of processors. Without this option enabled,
69449+ the get_tls and data memory barrier stubs will be emulated by the kernel,
69450+ which is enough for Linaro userlands or other userlands designed for v6
69451+ and newer ARM CPUs. It's recommended that you try without this option enabled
69452+ first, and only enable it if your userland does not boot (it will likely fail
69453+ at init time).
69454+
69455+endmenu
69456+menu "Role Based Access Control Options"
69457+depends on GRKERNSEC
69458+
69459+config GRKERNSEC_RBAC_DEBUG
69460+ bool
69461+
69462+config GRKERNSEC_NO_RBAC
69463+ bool "Disable RBAC system"
69464+ help
69465+ If you say Y here, the /dev/grsec device will be removed from the kernel,
69466+ preventing the RBAC system from being enabled. You should only say Y
69467+ here if you have no intention of using the RBAC system, so as to prevent
69468+ an attacker with root access from misusing the RBAC system to hide files
69469+ and processes when loadable module support and /dev/[k]mem have been
69470+ locked down.
69471+
69472+config GRKERNSEC_ACL_HIDEKERN
69473+ bool "Hide kernel processes"
69474+ help
69475+ If you say Y here, all kernel threads will be hidden to all
69476+ processes but those whose subject has the "view hidden processes"
69477+ flag.
69478+
69479+config GRKERNSEC_ACL_MAXTRIES
69480+ int "Maximum tries before password lockout"
69481+ default 3
69482+ help
69483+ This option enforces the maximum number of times a user can attempt
69484+ to authorize themselves with the grsecurity RBAC system before being
69485+ denied the ability to attempt authorization again for a specified time.
69486+ The lower the number, the harder it will be to brute-force a password.
69487+
69488+config GRKERNSEC_ACL_TIMEOUT
69489+ int "Time to wait after max password tries, in seconds"
69490+ default 30
69491+ help
69492+ This option specifies the time the user must wait after attempting to
69493+ authorize to the RBAC system with the maximum number of invalid
69494+ passwords. The higher the number, the harder it will be to brute-force
69495+ a password.
69496+
69497+endmenu
69498+menu "Filesystem Protections"
69499+depends on GRKERNSEC
69500+
69501+config GRKERNSEC_PROC
69502+ bool "Proc restrictions"
69503+ default y if GRKERNSEC_CONFIG_AUTO
69504+ help
69505+ If you say Y here, the permissions of the /proc filesystem
69506+ will be altered to enhance system security and privacy. You MUST
69507+ choose either a user only restriction or a user and group restriction.
69508+ Depending upon the option you choose, you can either restrict users to
69509+ see only the processes they themselves run, or choose a group that can
69510+ view all processes and files normally restricted to root if you choose
69511+ the "restrict to user only" option. NOTE: If you're running identd or
69512+ ntpd as a non-root user, you will have to run it as the group you
69513+ specify here.
69514+
69515+config GRKERNSEC_PROC_USER
69516+ bool "Restrict /proc to user only"
69517+ depends on GRKERNSEC_PROC
69518+ help
69519+ If you say Y here, non-root users will only be able to view their own
69520+ processes, and restricts them from viewing network-related information,
69521+ and viewing kernel symbol and module information.
69522+
69523+config GRKERNSEC_PROC_USERGROUP
69524+ bool "Allow special group"
69525+ default y if GRKERNSEC_CONFIG_AUTO
69526+ depends on GRKERNSEC_PROC && !GRKERNSEC_PROC_USER
69527+ help
69528+ If you say Y here, you will be able to select a group that will be
69529+ able to view all processes and network-related information. If you've
69530+ enabled GRKERNSEC_HIDESYM, kernel and symbol information may still
69531+ remain hidden. This option is useful if you want to run identd as
69532+ a non-root user. The group you select may also be chosen at boot time
69533+ via "grsec_proc_gid=" on the kernel commandline.
69534+
69535+config GRKERNSEC_PROC_GID
69536+ int "GID for special group"
69537+ depends on GRKERNSEC_PROC_USERGROUP
69538+ default 1001
69539+
69540+config GRKERNSEC_PROC_ADD
69541+ bool "Additional restrictions"
69542+ default y if GRKERNSEC_CONFIG_AUTO
69543+ depends on GRKERNSEC_PROC_USER || GRKERNSEC_PROC_USERGROUP
69544+ help
69545+ If you say Y here, additional restrictions will be placed on
69546+ /proc that keep normal users from viewing device information and
69547+ slabinfo information that could be useful for exploits.
69548+
69549+config GRKERNSEC_LINK
69550+ bool "Linking restrictions"
69551+ default y if GRKERNSEC_CONFIG_AUTO
69552+ help
69553+ If you say Y here, /tmp race exploits will be prevented, since users
69554+ will no longer be able to follow symlinks owned by other users in
69555+ world-writable +t directories (e.g. /tmp), unless the owner of the
69556+ symlink is the owner of the directory. users will also not be
69557+ able to hardlink to files they do not own. If the sysctl option is
69558+ enabled, a sysctl option with name "linking_restrictions" is created.
69559+
69560+config GRKERNSEC_SYMLINKOWN
69561+ bool "Kernel-enforced SymlinksIfOwnerMatch"
69562+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
69563+ help
69564+ Apache's SymlinksIfOwnerMatch option has an inherent race condition
69565+ that prevents it from being used as a security feature. As Apache
69566+ verifies the symlink by performing a stat() against the target of
69567+ the symlink before it is followed, an attacker can setup a symlink
69568+ to point to a same-owned file, then replace the symlink with one
69569+ that targets another user's file just after Apache "validates" the
69570+ symlink -- a classic TOCTOU race. If you say Y here, a complete,
69571+ race-free replacement for Apache's "SymlinksIfOwnerMatch" option
69572+ will be in place for the group you specify. If the sysctl option
69573+ is enabled, a sysctl option with name "enforce_symlinksifowner" is
69574+ created.
69575+
69576+config GRKERNSEC_SYMLINKOWN_GID
69577+ int "GID for users with kernel-enforced SymlinksIfOwnerMatch"
69578+ depends on GRKERNSEC_SYMLINKOWN
69579+ default 1006
69580+ help
69581+ Setting this GID determines what group kernel-enforced
69582+ SymlinksIfOwnerMatch will be enabled for. If the sysctl option
69583+ is enabled, a sysctl option with name "symlinkown_gid" is created.
69584+
69585+config GRKERNSEC_FIFO
69586+ bool "FIFO restrictions"
69587+ default y if GRKERNSEC_CONFIG_AUTO
69588+ help
69589+ If you say Y here, users will not be able to write to FIFOs they don't
69590+ own in world-writable +t directories (e.g. /tmp), unless the owner of
69591+ the FIFO is the same owner of the directory it's held in. If the sysctl
69592+ option is enabled, a sysctl option with name "fifo_restrictions" is
69593+ created.
69594+
69595+config GRKERNSEC_SYSFS_RESTRICT
69596+ bool "Sysfs/debugfs restriction"
69597+ default y if (GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER)
69598+ depends on SYSFS
69599+ help
69600+ If you say Y here, sysfs (the pseudo-filesystem mounted at /sys) and
69601+ any filesystem normally mounted under it (e.g. debugfs) will be
69602+ mostly accessible only by root. These filesystems generally provide access
69603+ to hardware and debug information that isn't appropriate for unprivileged
69604+ users of the system. Sysfs and debugfs have also become a large source
69605+ of new vulnerabilities, ranging from infoleaks to local compromise.
69606+ There has been very little oversight with an eye toward security involved
69607+ in adding new exporters of information to these filesystems, so their
69608+ use is discouraged.
69609+ For reasons of compatibility, a few directories have been whitelisted
69610+ for access by non-root users:
69611+ /sys/fs/selinux
69612+ /sys/fs/fuse
69613+ /sys/devices/system/cpu
69614+
69615+config GRKERNSEC_ROFS
69616+ bool "Runtime read-only mount protection"
69617+ depends on SYSCTL
69618+ help
69619+ If you say Y here, a sysctl option with name "romount_protect" will
69620+ be created. By setting this option to 1 at runtime, filesystems
69621+ will be protected in the following ways:
69622+ * No new writable mounts will be allowed
69623+ * Existing read-only mounts won't be able to be remounted read/write
69624+ * Write operations will be denied on all block devices
69625+ This option acts independently of grsec_lock: once it is set to 1,
69626+ it cannot be turned off. Therefore, please be mindful of the resulting
69627+ behavior if this option is enabled in an init script on a read-only
69628+ filesystem.
69629+ Also be aware that as with other root-focused features, GRKERNSEC_KMEM
69630+ and GRKERNSEC_IO should be enabled and module loading disabled via
69631+ config or at runtime.
69632+ This feature is mainly intended for secure embedded systems.
69633+
69634+
69635+config GRKERNSEC_DEVICE_SIDECHANNEL
69636+ bool "Eliminate stat/notify-based device sidechannels"
69637+ default y if GRKERNSEC_CONFIG_AUTO
69638+ help
69639+ If you say Y here, timing analyses on block or character
69640+ devices like /dev/ptmx using stat or inotify/dnotify/fanotify
69641+ will be thwarted for unprivileged users. If a process without
69642+ CAP_MKNOD stats such a device, the last access and last modify times
69643+ will match the device's create time. No access or modify events
69644+ will be triggered through inotify/dnotify/fanotify for such devices.
69645+ This feature will prevent attacks that may at a minimum
69646+ allow an attacker to determine the administrator's password length.
69647+
69648+config GRKERNSEC_CHROOT
69649+ bool "Chroot jail restrictions"
69650+ default y if GRKERNSEC_CONFIG_AUTO
69651+ help
69652+ If you say Y here, you will be able to choose several options that will
69653+ make breaking out of a chrooted jail much more difficult. If you
69654+ encounter no software incompatibilities with the following options, it
69655+ is recommended that you enable each one.
69656+
69657+ Note that the chroot restrictions are not intended to apply to "chroots"
69658+ to directories that are simple bind mounts of the global root filesystem.
69659+ For several other reasons, a user shouldn't expect any significant
69660+ security by performing such a chroot.
69661+
69662+config GRKERNSEC_CHROOT_MOUNT
69663+ bool "Deny mounts"
69664+ default y if GRKERNSEC_CONFIG_AUTO
69665+ depends on GRKERNSEC_CHROOT
69666+ help
69667+ If you say Y here, processes inside a chroot will not be able to
69668+ mount or remount filesystems. If the sysctl option is enabled, a
69669+ sysctl option with name "chroot_deny_mount" is created.
69670+
69671+config GRKERNSEC_CHROOT_DOUBLE
69672+ bool "Deny double-chroots"
69673+ default y if GRKERNSEC_CONFIG_AUTO
69674+ depends on GRKERNSEC_CHROOT
69675+ help
69676+ If you say Y here, processes inside a chroot will not be able to chroot
69677+ again outside the chroot. This is a widely used method of breaking
69678+ out of a chroot jail and should not be allowed. If the sysctl
69679+ option is enabled, a sysctl option with name
69680+ "chroot_deny_chroot" is created.
69681+
69682+config GRKERNSEC_CHROOT_PIVOT
69683+ bool "Deny pivot_root in chroot"
69684+ default y if GRKERNSEC_CONFIG_AUTO
69685+ depends on GRKERNSEC_CHROOT
69686+ help
69687+ If you say Y here, processes inside a chroot will not be able to use
69688+ a function called pivot_root() that was introduced in Linux 2.3.41. It
69689+ works similar to chroot in that it changes the root filesystem. This
69690+ function could be misused in a chrooted process to attempt to break out
69691+ of the chroot, and therefore should not be allowed. If the sysctl
69692+ option is enabled, a sysctl option with name "chroot_deny_pivot" is
69693+ created.
69694+
69695+config GRKERNSEC_CHROOT_CHDIR
69696+ bool "Enforce chdir(\"/\") on all chroots"
69697+ default y if GRKERNSEC_CONFIG_AUTO
69698+ depends on GRKERNSEC_CHROOT
69699+ help
69700+ If you say Y here, the current working directory of all newly-chrooted
69701+ applications will be set to the the root directory of the chroot.
69702+ The man page on chroot(2) states:
69703+ Note that this call does not change the current working
69704+ directory, so that `.' can be outside the tree rooted at
69705+ `/'. In particular, the super-user can escape from a
69706+ `chroot jail' by doing `mkdir foo; chroot foo; cd ..'.
69707+
69708+ It is recommended that you say Y here, since it's not known to break
69709+ any software. If the sysctl option is enabled, a sysctl option with
69710+ name "chroot_enforce_chdir" is created.
69711+
69712+config GRKERNSEC_CHROOT_CHMOD
69713+ bool "Deny (f)chmod +s"
69714+ default y if GRKERNSEC_CONFIG_AUTO
69715+ depends on GRKERNSEC_CHROOT
69716+ help
69717+ If you say Y here, processes inside a chroot will not be able to chmod
69718+ or fchmod files to make them have suid or sgid bits. This protects
69719+ against another published method of breaking a chroot. If the sysctl
69720+ option is enabled, a sysctl option with name "chroot_deny_chmod" is
69721+ created.
69722+
69723+config GRKERNSEC_CHROOT_FCHDIR
69724+ bool "Deny fchdir and fhandle out of chroot"
69725+ default y if GRKERNSEC_CONFIG_AUTO
69726+ depends on GRKERNSEC_CHROOT
69727+ help
69728+ If you say Y here, a well-known method of breaking chroots by fchdir'ing
69729+ to a file descriptor of the chrooting process that points to a directory
69730+ outside the filesystem will be stopped. Additionally, this option prevents
69731+ use of the recently-created syscall for opening files by a guessable "file
69732+ handle" inside a chroot. If the sysctl option is enabled, a sysctl option
69733+ with name "chroot_deny_fchdir" is created.
69734+
69735+config GRKERNSEC_CHROOT_MKNOD
69736+ bool "Deny mknod"
69737+ default y if GRKERNSEC_CONFIG_AUTO
69738+ depends on GRKERNSEC_CHROOT
69739+ help
69740+ If you say Y here, processes inside a chroot will not be allowed to
69741+ mknod. The problem with using mknod inside a chroot is that it
69742+ would allow an attacker to create a device entry that is the same
69743+ as one on the physical root of your system, which could range from
69744+ anything from the console device to a device for your harddrive (which
69745+ they could then use to wipe the drive or steal data). It is recommended
69746+ that you say Y here, unless you run into software incompatibilities.
69747+ If the sysctl option is enabled, a sysctl option with name
69748+ "chroot_deny_mknod" is created.
69749+
69750+config GRKERNSEC_CHROOT_SHMAT
69751+ bool "Deny shmat() out of chroot"
69752+ default y if GRKERNSEC_CONFIG_AUTO
69753+ depends on GRKERNSEC_CHROOT
69754+ help
69755+ If you say Y here, processes inside a chroot will not be able to attach
69756+ to shared memory segments that were created outside of the chroot jail.
69757+ It is recommended that you say Y here. If the sysctl option is enabled,
69758+ a sysctl option with name "chroot_deny_shmat" is created.
69759+
69760+config GRKERNSEC_CHROOT_UNIX
69761+ bool "Deny access to abstract AF_UNIX sockets out of chroot"
69762+ default y if GRKERNSEC_CONFIG_AUTO
69763+ depends on GRKERNSEC_CHROOT
69764+ help
69765+ If you say Y here, processes inside a chroot will not be able to
69766+ connect to abstract (meaning not belonging to a filesystem) Unix
69767+ domain sockets that were bound outside of a chroot. It is recommended
69768+ that you say Y here. If the sysctl option is enabled, a sysctl option
69769+ with name "chroot_deny_unix" is created.
69770+
69771+config GRKERNSEC_CHROOT_FINDTASK
69772+ bool "Protect outside processes"
69773+ default y if GRKERNSEC_CONFIG_AUTO
69774+ depends on GRKERNSEC_CHROOT
69775+ help
69776+ If you say Y here, processes inside a chroot will not be able to
69777+ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid,
69778+ getsid, or view any process outside of the chroot. If the sysctl
69779+ option is enabled, a sysctl option with name "chroot_findtask" is
69780+ created.
69781+
69782+config GRKERNSEC_CHROOT_NICE
69783+ bool "Restrict priority changes"
69784+ default y if GRKERNSEC_CONFIG_AUTO
69785+ depends on GRKERNSEC_CHROOT
69786+ help
69787+ If you say Y here, processes inside a chroot will not be able to raise
69788+ the priority of processes in the chroot, or alter the priority of
69789+ processes outside the chroot. This provides more security than simply
69790+ removing CAP_SYS_NICE from the process' capability set. If the
69791+ sysctl option is enabled, a sysctl option with name "chroot_restrict_nice"
69792+ is created.
69793+
69794+config GRKERNSEC_CHROOT_SYSCTL
69795+ bool "Deny sysctl writes"
69796+ default y if GRKERNSEC_CONFIG_AUTO
69797+ depends on GRKERNSEC_CHROOT
69798+ help
69799+ If you say Y here, an attacker in a chroot will not be able to
69800+ write to sysctl entries, either by sysctl(2) or through a /proc
69801+ interface. It is strongly recommended that you say Y here. If the
69802+ sysctl option is enabled, a sysctl option with name
69803+ "chroot_deny_sysctl" is created.
69804+
69805+config GRKERNSEC_CHROOT_RENAME
69806+ bool "Deny bad renames"
69807+ default y if GRKERNSEC_CONFIG_AUTO
69808+ depends on GRKERNSEC_CHROOT
69809+ help
69810+ If you say Y here, an attacker in a chroot will not be able to
69811+ abuse the ability to create double chroots to break out of the
69812+ chroot by exploiting a race condition between a rename of a directory
69813+ within a chroot against an open of a symlink with relative path
69814+ components. This feature will likewise prevent an accomplice outside
69815+ a chroot from enabling a user inside the chroot to break out and make
69816+ use of their credentials on the global filesystem. Enabling this
69817+ feature is essential to prevent root users from breaking out of a
69818+ chroot. If the sysctl option is enabled, a sysctl option with name
69819+ "chroot_deny_bad_rename" is created.
69820+
69821+config GRKERNSEC_CHROOT_CAPS
69822+ bool "Capability restrictions"
69823+ default y if GRKERNSEC_CONFIG_AUTO
69824+ depends on GRKERNSEC_CHROOT
69825+ help
69826+ If you say Y here, the capabilities on all processes within a
69827+ chroot jail will be lowered to stop module insertion, raw i/o,
69828+ system and net admin tasks, rebooting the system, modifying immutable
69829+ files, modifying IPC owned by another, and changing the system time.
69830+ This is left an option because it can break some apps. Disable this
69831+ if your chrooted apps are having problems performing those kinds of
69832+ tasks. If the sysctl option is enabled, a sysctl option with
69833+ name "chroot_caps" is created.
69834+
69835+config GRKERNSEC_CHROOT_INITRD
69836+ bool "Exempt initrd tasks from restrictions"
69837+ default y if GRKERNSEC_CONFIG_AUTO
69838+ depends on GRKERNSEC_CHROOT && BLK_DEV_INITRD
69839+ help
69840+ If you say Y here, tasks started prior to init will be exempted from
69841+ grsecurity's chroot restrictions. This option is mainly meant to
69842+ resolve Plymouth's performing privileged operations unnecessarily
69843+ in a chroot.
69844+
69845+endmenu
69846+menu "Kernel Auditing"
69847+depends on GRKERNSEC
69848+
69849+config GRKERNSEC_AUDIT_GROUP
69850+ bool "Single group for auditing"
69851+ help
69852+ If you say Y here, the exec and chdir logging features will only operate
69853+ on a group you specify. This option is recommended if you only want to
69854+ watch certain users instead of having a large amount of logs from the
69855+ entire system. If the sysctl option is enabled, a sysctl option with
69856+ name "audit_group" is created.
69857+
69858+config GRKERNSEC_AUDIT_GID
69859+ int "GID for auditing"
69860+ depends on GRKERNSEC_AUDIT_GROUP
69861+ default 1007
69862+
69863+config GRKERNSEC_EXECLOG
69864+ bool "Exec logging"
69865+ help
69866+ If you say Y here, all execve() calls will be logged (since the
69867+ other exec*() calls are frontends to execve(), all execution
69868+ will be logged). Useful for shell-servers that like to keep track
69869+ of their users. If the sysctl option is enabled, a sysctl option with
69870+ name "exec_logging" is created.
69871+ WARNING: This option when enabled will produce a LOT of logs, especially
69872+ on an active system.
69873+
69874+config GRKERNSEC_RESLOG
69875+ bool "Resource logging"
69876+ default y if GRKERNSEC_CONFIG_AUTO
69877+ help
69878+ If you say Y here, all attempts to overstep resource limits will
69879+ be logged with the resource name, the requested size, and the current
69880+ limit. It is highly recommended that you say Y here. If the sysctl
69881+ option is enabled, a sysctl option with name "resource_logging" is
69882+ created. If the RBAC system is enabled, the sysctl value is ignored.
69883+
69884+config GRKERNSEC_CHROOT_EXECLOG
69885+ bool "Log execs within chroot"
69886+ help
69887+ If you say Y here, all executions inside a chroot jail will be logged
69888+ to syslog. This can cause a large amount of logs if certain
69889+ applications (eg. djb's daemontools) are installed on the system, and
69890+ is therefore left as an option. If the sysctl option is enabled, a
69891+ sysctl option with name "chroot_execlog" is created.
69892+
69893+config GRKERNSEC_AUDIT_PTRACE
69894+ bool "Ptrace logging"
69895+ help
69896+ If you say Y here, all attempts to attach to a process via ptrace
69897+ will be logged. If the sysctl option is enabled, a sysctl option
69898+ with name "audit_ptrace" is created.
69899+
69900+config GRKERNSEC_AUDIT_CHDIR
69901+ bool "Chdir logging"
69902+ help
69903+ If you say Y here, all chdir() calls will be logged. If the sysctl
69904+ option is enabled, a sysctl option with name "audit_chdir" is created.
69905+
69906+config GRKERNSEC_AUDIT_MOUNT
69907+ bool "(Un)Mount logging"
69908+ help
69909+ If you say Y here, all mounts and unmounts will be logged. If the
69910+ sysctl option is enabled, a sysctl option with name "audit_mount" is
69911+ created.
69912+
69913+config GRKERNSEC_SIGNAL
69914+ bool "Signal logging"
69915+ default y if GRKERNSEC_CONFIG_AUTO
69916+ help
69917+ If you say Y here, certain important signals will be logged, such as
69918+ SIGSEGV, which will as a result inform you of when a error in a program
69919+ occurred, which in some cases could mean a possible exploit attempt.
69920+ If the sysctl option is enabled, a sysctl option with name
69921+ "signal_logging" is created.
69922+
69923+config GRKERNSEC_FORKFAIL
69924+ bool "Fork failure logging"
69925+ help
69926+ If you say Y here, all failed fork() attempts will be logged.
69927+ This could suggest a fork bomb, or someone attempting to overstep
69928+ their process limit. If the sysctl option is enabled, a sysctl option
69929+ with name "forkfail_logging" is created.
69930+
69931+config GRKERNSEC_TIME
69932+ bool "Time change logging"
69933+ default y if GRKERNSEC_CONFIG_AUTO
69934+ help
69935+ If you say Y here, any changes of the system clock will be logged.
69936+ If the sysctl option is enabled, a sysctl option with name
69937+ "timechange_logging" is created.
69938+
69939+config GRKERNSEC_PROC_IPADDR
69940+ bool "/proc/<pid>/ipaddr support"
69941+ default y if GRKERNSEC_CONFIG_AUTO
69942+ help
69943+ If you say Y here, a new entry will be added to each /proc/<pid>
69944+ directory that contains the IP address of the person using the task.
69945+ The IP is carried across local TCP and AF_UNIX stream sockets.
69946+ This information can be useful for IDS/IPSes to perform remote response
69947+ to a local attack. The entry is readable by only the owner of the
69948+ process (and root if he has CAP_DAC_OVERRIDE, which can be removed via
69949+ the RBAC system), and thus does not create privacy concerns.
69950+
69951+config GRKERNSEC_RWXMAP_LOG
69952+ bool 'Denied RWX mmap/mprotect logging'
69953+ default y if GRKERNSEC_CONFIG_AUTO
69954+ depends on PAX_MPROTECT && !PAX_EMUPLT && !PAX_EMUSIGRT
69955+ help
69956+ If you say Y here, calls to mmap() and mprotect() with explicit
69957+ usage of PROT_WRITE and PROT_EXEC together will be logged when
69958+ denied by the PAX_MPROTECT feature. This feature will also
69959+ log other problematic scenarios that can occur when PAX_MPROTECT
69960+ is enabled on a binary, like textrels and PT_GNU_STACK. If the
69961+ sysctl option is enabled, a sysctl option with name "rwxmap_logging"
69962+ is created.
69963+
69964+endmenu
69965+
69966+menu "Executable Protections"
69967+depends on GRKERNSEC
69968+
69969+config GRKERNSEC_DMESG
69970+ bool "Dmesg(8) restriction"
69971+ default y if GRKERNSEC_CONFIG_AUTO
69972+ help
69973+ If you say Y here, non-root users will not be able to use dmesg(8)
69974+ to view the contents of the kernel's circular log buffer.
69975+ The kernel's log buffer often contains kernel addresses and other
69976+ identifying information useful to an attacker in fingerprinting a
69977+ system for a targeted exploit.
69978+ If the sysctl option is enabled, a sysctl option with name "dmesg" is
69979+ created.
69980+
69981+config GRKERNSEC_HARDEN_PTRACE
69982+ bool "Deter ptrace-based process snooping"
69983+ default y if GRKERNSEC_CONFIG_AUTO
69984+ help
69985+ If you say Y here, TTY sniffers and other malicious monitoring
69986+ programs implemented through ptrace will be defeated. If you
69987+ have been using the RBAC system, this option has already been
69988+ enabled for several years for all users, with the ability to make
69989+ fine-grained exceptions.
69990+
69991+ This option only affects the ability of non-root users to ptrace
69992+ processes that are not a descendent of the ptracing process.
69993+ This means that strace ./binary and gdb ./binary will still work,
69994+ but attaching to arbitrary processes will not. If the sysctl
69995+ option is enabled, a sysctl option with name "harden_ptrace" is
69996+ created.
69997+
69998+config GRKERNSEC_PTRACE_READEXEC
69999+ bool "Require read access to ptrace sensitive binaries"
70000+ default y if GRKERNSEC_CONFIG_AUTO
70001+ help
70002+ If you say Y here, unprivileged users will not be able to ptrace unreadable
70003+ binaries. This option is useful in environments that
70004+ remove the read bits (e.g. file mode 4711) from suid binaries to
70005+ prevent infoleaking of their contents. This option adds
70006+ consistency to the use of that file mode, as the binary could normally
70007+ be read out when run without privileges while ptracing.
70008+
70009+ If the sysctl option is enabled, a sysctl option with name "ptrace_readexec"
70010+ is created.
70011+
70012+config GRKERNSEC_SETXID
70013+ bool "Enforce consistent multithreaded privileges"
70014+ default y if GRKERNSEC_CONFIG_AUTO
70015+ depends on (X86 || SPARC64 || PPC || ARM || MIPS)
70016+ help
70017+ If you say Y here, a change from a root uid to a non-root uid
70018+ in a multithreaded application will cause the resulting uids,
70019+ gids, supplementary groups, and capabilities in that thread
70020+ to be propagated to the other threads of the process. In most
70021+ cases this is unnecessary, as glibc will emulate this behavior
70022+ on behalf of the application. Other libcs do not act in the
70023+ same way, allowing the other threads of the process to continue
70024+ running with root privileges. If the sysctl option is enabled,
70025+ a sysctl option with name "consistent_setxid" is created.
70026+
70027+config GRKERNSEC_HARDEN_IPC
70028+ bool "Disallow access to overly-permissive IPC objects"
70029+ default y if GRKERNSEC_CONFIG_AUTO
70030+ depends on SYSVIPC
70031+ help
70032+ If you say Y here, access to overly-permissive IPC objects (shared
70033+ memory, message queues, and semaphores) will be denied for processes
70034+ given the following criteria beyond normal permission checks:
70035+ 1) If the IPC object is world-accessible and the euid doesn't match
70036+ that of the creator or current uid for the IPC object
70037+ 2) If the IPC object is group-accessible and the egid doesn't
70038+ match that of the creator or current gid for the IPC object
70039+ It's a common error to grant too much permission to these objects,
70040+ with impact ranging from denial of service and information leaking to
70041+ privilege escalation. This feature was developed in response to
70042+ research by Tim Brown:
70043+ http://labs.portcullis.co.uk/whitepapers/memory-squatting-attacks-on-system-v-shared-memory/
70044+ who found hundreds of such insecure usages. Processes with
70045+ CAP_IPC_OWNER are still permitted to access these IPC objects.
70046+ If the sysctl option is enabled, a sysctl option with name
70047+ "harden_ipc" is created.
70048+
70049+config GRKERNSEC_TPE
70050+ bool "Trusted Path Execution (TPE)"
70051+ default y if GRKERNSEC_CONFIG_AUTO && GRKERNSEC_CONFIG_SERVER
70052+ help
70053+ If you say Y here, you will be able to choose a gid to add to the
70054+ supplementary groups of users you want to mark as "untrusted."
70055+ These users will not be able to execute any files that are not in
70056+ root-owned directories writable only by root. If the sysctl option
70057+ is enabled, a sysctl option with name "tpe" is created.
70058+
70059+config GRKERNSEC_TPE_ALL
70060+ bool "Partially restrict all non-root users"
70061+ depends on GRKERNSEC_TPE
70062+ help
70063+ If you say Y here, all non-root users will be covered under
70064+ a weaker TPE restriction. This is separate from, and in addition to,
70065+ the main TPE options that you have selected elsewhere. Thus, if a
70066+ "trusted" GID is chosen, this restriction applies to even that GID.
70067+ Under this restriction, all non-root users will only be allowed to
70068+ execute files in directories they own that are not group or
70069+ world-writable, or in directories owned by root and writable only by
70070+ root. If the sysctl option is enabled, a sysctl option with name
70071+ "tpe_restrict_all" is created.
70072+
70073+config GRKERNSEC_TPE_INVERT
70074+ bool "Invert GID option"
70075+ depends on GRKERNSEC_TPE
70076+ help
70077+ If you say Y here, the group you specify in the TPE configuration will
70078+ decide what group TPE restrictions will be *disabled* for. This
70079+ option is useful if you want TPE restrictions to be applied to most
70080+ users on the system. If the sysctl option is enabled, a sysctl option
70081+ with name "tpe_invert" is created. Unlike other sysctl options, this
70082+ entry will default to on for backward-compatibility.
70083+
70084+config GRKERNSEC_TPE_GID
70085+ int
70086+ default GRKERNSEC_TPE_UNTRUSTED_GID if (GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT)
70087+ default GRKERNSEC_TPE_TRUSTED_GID if (GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT)
70088+
70089+config GRKERNSEC_TPE_UNTRUSTED_GID
70090+ int "GID for TPE-untrusted users"
70091+ depends on GRKERNSEC_TPE && !GRKERNSEC_TPE_INVERT
70092+ default 1005
70093+ help
70094+ Setting this GID determines what group TPE restrictions will be
70095+ *enabled* for. If the sysctl option is enabled, a sysctl option
70096+ with name "tpe_gid" is created.
70097+
70098+config GRKERNSEC_TPE_TRUSTED_GID
70099+ int "GID for TPE-trusted users"
70100+ depends on GRKERNSEC_TPE && GRKERNSEC_TPE_INVERT
70101+ default 1005
70102+ help
70103+ Setting this GID determines what group TPE restrictions will be
70104+ *disabled* for. If the sysctl option is enabled, a sysctl option
70105+ with name "tpe_gid" is created.
70106+
70107+endmenu
70108+menu "Network Protections"
70109+depends on GRKERNSEC
70110+
70111+config GRKERNSEC_BLACKHOLE
70112+ bool "TCP/UDP blackhole and LAST_ACK DoS prevention"
70113+ default y if GRKERNSEC_CONFIG_AUTO
70114+ depends on NET
70115+ help
70116+ If you say Y here, neither TCP resets nor ICMP
70117+ destination-unreachable packets will be sent in response to packets
70118+ sent to ports for which no associated listening process exists.
70119+ It will also prevent the sending of ICMP protocol unreachable packets
70120+ in response to packets with unknown protocols.
70121+ This feature supports both IPV4 and IPV6 and exempts the
70122+ loopback interface from blackholing. Enabling this feature
70123+ makes a host more resilient to DoS attacks and reduces network
70124+ visibility against scanners.
70125+
70126+ The blackhole feature as-implemented is equivalent to the FreeBSD
70127+ blackhole feature, as it prevents RST responses to all packets, not
70128+ just SYNs. Under most application behavior this causes no
70129+ problems, but applications (like haproxy) may not close certain
70130+ connections in a way that cleanly terminates them on the remote
70131+ end, leaving the remote host in LAST_ACK state. Because of this
70132+ side-effect and to prevent intentional LAST_ACK DoSes, this
70133+ feature also adds automatic mitigation against such attacks.
70134+ The mitigation drastically reduces the amount of time a socket
70135+ can spend in LAST_ACK state. If you're using haproxy and not
70136+ all servers it connects to have this option enabled, consider
70137+ disabling this feature on the haproxy host.
70138+
70139+ If the sysctl option is enabled, two sysctl options with names
70140+ "ip_blackhole" and "lastack_retries" will be created.
70141+ While "ip_blackhole" takes the standard zero/non-zero on/off
70142+ toggle, "lastack_retries" uses the same kinds of values as
70143+ "tcp_retries1" and "tcp_retries2". The default value of 4
70144+ prevents a socket from lasting more than 45 seconds in LAST_ACK
70145+ state.
70146+
70147+config GRKERNSEC_NO_SIMULT_CONNECT
70148+ bool "Disable TCP Simultaneous Connect"
70149+ default y if GRKERNSEC_CONFIG_AUTO
70150+ depends on NET
70151+ help
70152+ If you say Y here, a feature by Willy Tarreau will be enabled that
70153+ removes a weakness in Linux's strict implementation of TCP that
70154+ allows two clients to connect to each other without either entering
70155+ a listening state. The weakness allows an attacker to easily prevent
70156+ a client from connecting to a known server provided the source port
70157+ for the connection is guessed correctly.
70158+
70159+ As the weakness could be used to prevent an antivirus or IPS from
70160+ fetching updates, or prevent an SSL gateway from fetching a CRL,
70161+ it should be eliminated by enabling this option. Though Linux is
70162+ one of few operating systems supporting simultaneous connect, it
70163+ has no legitimate use in practice and is rarely supported by firewalls.
70164+
70165+config GRKERNSEC_SOCKET
70166+ bool "Socket restrictions"
70167+ depends on NET
70168+ help
70169+ If you say Y here, you will be able to choose from several options.
70170+ If you assign a GID on your system and add it to the supplementary
70171+ groups of users you want to restrict socket access to, this patch
70172+ will perform up to three things, based on the option(s) you choose.
70173+
70174+config GRKERNSEC_SOCKET_ALL
70175+ bool "Deny any sockets to group"
70176+ depends on GRKERNSEC_SOCKET
70177+ help
70178+ If you say Y here, you will be able to choose a GID of whose users will
70179+ be unable to connect to other hosts from your machine or run server
70180+ applications from your machine. If the sysctl option is enabled, a
70181+ sysctl option with name "socket_all" is created.
70182+
70183+config GRKERNSEC_SOCKET_ALL_GID
70184+ int "GID to deny all sockets for"
70185+ depends on GRKERNSEC_SOCKET_ALL
70186+ default 1004
70187+ help
70188+ Here you can choose the GID to disable socket access for. Remember to
70189+ add the users you want socket access disabled for to the GID
70190+ specified here. If the sysctl option is enabled, a sysctl option
70191+ with name "socket_all_gid" is created.
70192+
70193+config GRKERNSEC_SOCKET_CLIENT
70194+ bool "Deny client sockets to group"
70195+ depends on GRKERNSEC_SOCKET
70196+ help
70197+ If you say Y here, you will be able to choose a GID of whose users will
70198+ be unable to connect to other hosts from your machine, but will be
70199+ able to run servers. If this option is enabled, all users in the group
70200+ you specify will have to use passive mode when initiating ftp transfers
70201+ from the shell on your machine. If the sysctl option is enabled, a
70202+ sysctl option with name "socket_client" is created.
70203+
70204+config GRKERNSEC_SOCKET_CLIENT_GID
70205+ int "GID to deny client sockets for"
70206+ depends on GRKERNSEC_SOCKET_CLIENT
70207+ default 1003
70208+ help
70209+ Here you can choose the GID to disable client socket access for.
70210+ Remember to add the users you want client socket access disabled for to
70211+ the GID specified here. If the sysctl option is enabled, a sysctl
70212+ option with name "socket_client_gid" is created.
70213+
70214+config GRKERNSEC_SOCKET_SERVER
70215+ bool "Deny server sockets to group"
70216+ depends on GRKERNSEC_SOCKET
70217+ help
70218+ If you say Y here, you will be able to choose a GID of whose users will
70219+ be unable to run server applications from your machine. If the sysctl
70220+ option is enabled, a sysctl option with name "socket_server" is created.
70221+
70222+config GRKERNSEC_SOCKET_SERVER_GID
70223+ int "GID to deny server sockets for"
70224+ depends on GRKERNSEC_SOCKET_SERVER
70225+ default 1002
70226+ help
70227+ Here you can choose the GID to disable server socket access for.
70228+ Remember to add the users you want server socket access disabled for to
70229+ the GID specified here. If the sysctl option is enabled, a sysctl
70230+ option with name "socket_server_gid" is created.
70231+
70232+endmenu
70233+
70234+menu "Physical Protections"
70235+depends on GRKERNSEC
70236+
70237+config GRKERNSEC_DENYUSB
70238+ bool "Deny new USB connections after toggle"
70239+ default y if GRKERNSEC_CONFIG_AUTO
70240+ depends on SYSCTL && USB_SUPPORT
70241+ help
70242+ If you say Y here, a new sysctl option with name "deny_new_usb"
70243+ will be created. Setting its value to 1 will prevent any new
70244+ USB devices from being recognized by the OS. Any attempted USB
70245+ device insertion will be logged. This option is intended to be
70246+ used against custom USB devices designed to exploit vulnerabilities
70247+ in various USB device drivers.
70248+
70249+ For greatest effectiveness, this sysctl should be set after any
70250+ relevant init scripts. This option is safe to enable in distros
70251+ as each user can choose whether or not to toggle the sysctl.
70252+
70253+config GRKERNSEC_DENYUSB_FORCE
70254+ bool "Reject all USB devices not connected at boot"
70255+ select USB
70256+ depends on GRKERNSEC_DENYUSB
70257+ help
70258+ If you say Y here, a variant of GRKERNSEC_DENYUSB will be enabled
70259+ that doesn't involve a sysctl entry. This option should only be
70260+ enabled if you're sure you want to deny all new USB connections
70261+ at runtime and don't want to modify init scripts. This should not
70262+ be enabled by distros. It forces the core USB code to be built
70263+ into the kernel image so that all devices connected at boot time
70264+ can be recognized and new USB device connections can be prevented
70265+ prior to init running.
70266+
70267+endmenu
70268+
70269+menu "Sysctl Support"
70270+depends on GRKERNSEC && SYSCTL
70271+
70272+config GRKERNSEC_SYSCTL
70273+ bool "Sysctl support"
70274+ default y if GRKERNSEC_CONFIG_AUTO
70275+ help
70276+ If you say Y here, you will be able to change the options that
70277+ grsecurity runs with at bootup, without having to recompile your
70278+ kernel. You can echo values to files in /proc/sys/kernel/grsecurity
70279+ to enable (1) or disable (0) various features. All the sysctl entries
70280+ are mutable until the "grsec_lock" entry is set to a non-zero value.
70281+ All features enabled in the kernel configuration are disabled at boot
70282+ if you do not say Y to the "Turn on features by default" option.
70283+ All options should be set at startup, and the grsec_lock entry should
70284+ be set to a non-zero value after all the options are set.
70285+ *THIS IS EXTREMELY IMPORTANT*
70286+
70287+config GRKERNSEC_SYSCTL_DISTRO
70288+ bool "Extra sysctl support for distro makers (READ HELP)"
70289+ depends on GRKERNSEC_SYSCTL && GRKERNSEC_IO
70290+ help
70291+ If you say Y here, additional sysctl options will be created
70292+ for features that affect processes running as root. Therefore,
70293+ it is critical when using this option that the grsec_lock entry be
70294+ enabled after boot. Only distros with prebuilt kernel packages
70295+ with this option enabled that can ensure grsec_lock is enabled
70296+ after boot should use this option.
70297+ *Failure to set grsec_lock after boot makes all grsec features
70298+ this option covers useless*
70299+
70300+ Currently this option creates the following sysctl entries:
70301+ "Disable Privileged I/O": "disable_priv_io"
70302+
70303+config GRKERNSEC_SYSCTL_ON
70304+ bool "Turn on features by default"
70305+ default y if GRKERNSEC_CONFIG_AUTO
70306+ depends on GRKERNSEC_SYSCTL
70307+ help
70308+ If you say Y here, instead of having all features enabled in the
70309+ kernel configuration disabled at boot time, the features will be
70310+ enabled at boot time. It is recommended you say Y here unless
70311+ there is some reason you would want all sysctl-tunable features to
70312+ be disabled by default. As mentioned elsewhere, it is important
70313+ to enable the grsec_lock entry once you have finished modifying
70314+ the sysctl entries.
70315+
70316+endmenu
70317+menu "Logging Options"
70318+depends on GRKERNSEC
70319+
70320+config GRKERNSEC_FLOODTIME
70321+ int "Seconds in between log messages (minimum)"
70322+ default 10
70323+ help
70324+ This option allows you to enforce the number of seconds between
70325+ grsecurity log messages. The default should be suitable for most
70326+ people, however, if you choose to change it, choose a value small enough
70327+ to allow informative logs to be produced, but large enough to
70328+ prevent flooding.
70329+
70330+ Setting both this value and GRKERNSEC_FLOODBURST to 0 will disable
70331+ any rate limiting on grsecurity log messages.
70332+
70333+config GRKERNSEC_FLOODBURST
70334+ int "Number of messages in a burst (maximum)"
70335+ default 6
70336+ help
70337+ This option allows you to choose the maximum number of messages allowed
70338+ within the flood time interval you chose in a separate option. The
70339+ default should be suitable for most people, however if you find that
70340+ many of your logs are being interpreted as flooding, you may want to
70341+ raise this value.
70342+
70343+ Setting both this value and GRKERNSEC_FLOODTIME to 0 will disable
70344+ any rate limiting on grsecurity log messages.
70345+
70346+endmenu
70347diff --git a/grsecurity/Makefile b/grsecurity/Makefile
70348new file mode 100644
70349index 0000000..30ababb
70350--- /dev/null
70351+++ b/grsecurity/Makefile
70352@@ -0,0 +1,54 @@
70353+# grsecurity – access control and security hardening for Linux
70354+# All code in this directory and various hooks located throughout the Linux kernel are
70355+# Copyright (C) 2001-2014 Bradley Spengler, Open Source Security, Inc.
70356+# http://www.grsecurity.net spender@grsecurity.net
70357+#
70358+# This program is free software; you can redistribute it and/or
70359+# modify it under the terms of the GNU General Public License version 2
70360+# as published by the Free Software Foundation.
70361+#
70362+# This program is distributed in the hope that it will be useful,
70363+# but WITHOUT ANY WARRANTY; without even the implied warranty of
70364+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
70365+# GNU General Public License for more details.
70366+#
70367+# You should have received a copy of the GNU General Public License
70368+# along with this program; if not, write to the Free Software
70369+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
70370+
70371+KBUILD_CFLAGS += -Werror
70372+
70373+obj-y = grsec_chdir.o grsec_chroot.o grsec_exec.o grsec_fifo.o grsec_fork.o \
70374+ grsec_mount.o grsec_sig.o grsec_sysctl.o \
70375+ grsec_time.o grsec_tpe.o grsec_link.o grsec_pax.o grsec_ptrace.o \
70376+ grsec_usb.o grsec_ipc.o grsec_proc.o
70377+
70378+obj-$(CONFIG_GRKERNSEC) += grsec_init.o grsum.o gracl.o gracl_segv.o \
70379+ gracl_cap.o gracl_alloc.o gracl_shm.o grsec_mem.o gracl_fs.o \
70380+ gracl_learn.o grsec_log.o gracl_policy.o
70381+ifdef CONFIG_COMPAT
70382+obj-$(CONFIG_GRKERNSEC) += gracl_compat.o
70383+endif
70384+
70385+obj-$(CONFIG_GRKERNSEC_RESLOG) += gracl_res.o
70386+
70387+ifdef CONFIG_NET
70388+obj-y += grsec_sock.o
70389+obj-$(CONFIG_GRKERNSEC) += gracl_ip.o
70390+endif
70391+
70392+ifndef CONFIG_GRKERNSEC
70393+obj-y += grsec_disabled.o
70394+endif
70395+
70396+ifdef CONFIG_GRKERNSEC_HIDESYM
70397+extra-y := grsec_hidesym.o
70398+$(obj)/grsec_hidesym.o:
70399+ @-chmod -f 500 /boot
70400+ @-chmod -f 500 /lib/modules
70401+ @-chmod -f 500 /lib64/modules
70402+ @-chmod -f 500 /lib32/modules
70403+ @-chmod -f 700 .
70404+ @-chmod -f 700 $(objtree)
70405+ @echo ' grsec: protected kernel image paths'
70406+endif
70407diff --git a/grsecurity/gracl.c b/grsecurity/gracl.c
70408new file mode 100644
70409index 0000000..6c1e154
70410--- /dev/null
70411+++ b/grsecurity/gracl.c
70412@@ -0,0 +1,2749 @@
70413+#include <linux/kernel.h>
70414+#include <linux/module.h>
70415+#include <linux/sched.h>
70416+#include <linux/mm.h>
70417+#include <linux/file.h>
70418+#include <linux/fs.h>
70419+#include <linux/namei.h>
70420+#include <linux/mount.h>
70421+#include <linux/tty.h>
70422+#include <linux/proc_fs.h>
70423+#include <linux/lglock.h>
70424+#include <linux/slab.h>
70425+#include <linux/vmalloc.h>
70426+#include <linux/types.h>
70427+#include <linux/sysctl.h>
70428+#include <linux/netdevice.h>
70429+#include <linux/ptrace.h>
70430+#include <linux/gracl.h>
70431+#include <linux/gralloc.h>
70432+#include <linux/security.h>
70433+#include <linux/grinternal.h>
70434+#include <linux/pid_namespace.h>
70435+#include <linux/stop_machine.h>
70436+#include <linux/fdtable.h>
70437+#include <linux/percpu.h>
70438+#include <linux/lglock.h>
70439+#include <linux/hugetlb.h>
70440+#include <linux/posix-timers.h>
70441+#include <linux/prefetch.h>
70442+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
70443+#include <linux/magic.h>
70444+#include <linux/pagemap.h>
70445+#include "../fs/btrfs/async-thread.h"
70446+#include "../fs/btrfs/ctree.h"
70447+#include "../fs/btrfs/btrfs_inode.h"
70448+#endif
70449+#include "../fs/mount.h"
70450+
70451+#include <asm/uaccess.h>
70452+#include <asm/errno.h>
70453+#include <asm/mman.h>
70454+
70455+#define FOR_EACH_ROLE_START(role) \
70456+ role = running_polstate.role_list; \
70457+ while (role) {
70458+
70459+#define FOR_EACH_ROLE_END(role) \
70460+ role = role->prev; \
70461+ }
70462+
70463+extern struct path gr_real_root;
70464+
70465+static struct gr_policy_state running_polstate;
70466+struct gr_policy_state *polstate = &running_polstate;
70467+extern struct gr_alloc_state *current_alloc_state;
70468+
70469+extern char *gr_shared_page[4];
70470+DEFINE_RWLOCK(gr_inode_lock);
70471+
70472+static unsigned int gr_status __read_only = GR_STATUS_INIT;
70473+
70474+#ifdef CONFIG_NET
70475+extern struct vfsmount *sock_mnt;
70476+#endif
70477+
70478+extern struct vfsmount *pipe_mnt;
70479+extern struct vfsmount *shm_mnt;
70480+
70481+#ifdef CONFIG_HUGETLBFS
70482+extern struct vfsmount *hugetlbfs_vfsmount[HUGE_MAX_HSTATE];
70483+#endif
70484+
70485+extern u16 acl_sp_role_value;
70486+extern struct acl_object_label *fakefs_obj_rw;
70487+extern struct acl_object_label *fakefs_obj_rwx;
70488+
70489+int gr_acl_is_enabled(void)
70490+{
70491+ return (gr_status & GR_READY);
70492+}
70493+
70494+void gr_enable_rbac_system(void)
70495+{
70496+ pax_open_kernel();
70497+ gr_status |= GR_READY;
70498+ pax_close_kernel();
70499+}
70500+
70501+int gr_rbac_disable(void *unused)
70502+{
70503+ pax_open_kernel();
70504+ gr_status &= ~GR_READY;
70505+ pax_close_kernel();
70506+
70507+ return 0;
70508+}
70509+
70510+static inline dev_t __get_dev(const struct dentry *dentry)
70511+{
70512+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
70513+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
70514+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
70515+ else
70516+#endif
70517+ return dentry->d_sb->s_dev;
70518+}
70519+
70520+static inline u64 __get_ino(const struct dentry *dentry)
70521+{
70522+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
70523+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
70524+ return btrfs_ino(dentry->d_inode);
70525+ else
70526+#endif
70527+ return dentry->d_inode->i_ino;
70528+}
70529+
70530+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
70531+{
70532+ return __get_dev(dentry);
70533+}
70534+
70535+u64 gr_get_ino_from_dentry(struct dentry *dentry)
70536+{
70537+ return __get_ino(dentry);
70538+}
70539+
70540+static char gr_task_roletype_to_char(struct task_struct *task)
70541+{
70542+ switch (task->role->roletype &
70543+ (GR_ROLE_DEFAULT | GR_ROLE_USER | GR_ROLE_GROUP |
70544+ GR_ROLE_SPECIAL)) {
70545+ case GR_ROLE_DEFAULT:
70546+ return 'D';
70547+ case GR_ROLE_USER:
70548+ return 'U';
70549+ case GR_ROLE_GROUP:
70550+ return 'G';
70551+ case GR_ROLE_SPECIAL:
70552+ return 'S';
70553+ }
70554+
70555+ return 'X';
70556+}
70557+
70558+char gr_roletype_to_char(void)
70559+{
70560+ return gr_task_roletype_to_char(current);
70561+}
70562+
70563+__inline__ int
70564+gr_acl_tpe_check(void)
70565+{
70566+ if (unlikely(!(gr_status & GR_READY)))
70567+ return 0;
70568+ if (current->role->roletype & GR_ROLE_TPE)
70569+ return 1;
70570+ else
70571+ return 0;
70572+}
70573+
70574+int
70575+gr_handle_rawio(const struct inode *inode)
70576+{
70577+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
70578+ if (inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR)) &&
70579+ grsec_enable_chroot_caps && proc_is_chrooted(current) &&
70580+ !capable(CAP_SYS_RAWIO))
70581+ return 1;
70582+#endif
70583+ return 0;
70584+}
70585+
70586+int
70587+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
70588+{
70589+ if (likely(lena != lenb))
70590+ return 0;
70591+
70592+ return !memcmp(a, b, lena);
70593+}
70594+
70595+static int prepend(char **buffer, int *buflen, const char *str, int namelen)
70596+{
70597+ *buflen -= namelen;
70598+ if (*buflen < 0)
70599+ return -ENAMETOOLONG;
70600+ *buffer -= namelen;
70601+ memcpy(*buffer, str, namelen);
70602+ return 0;
70603+}
70604+
70605+static int prepend_name(char **buffer, int *buflen, struct qstr *name)
70606+{
70607+ return prepend(buffer, buflen, name->name, name->len);
70608+}
70609+
70610+static int prepend_path(const struct path *path, struct path *root,
70611+ char **buffer, int *buflen)
70612+{
70613+ struct dentry *dentry = path->dentry;
70614+ struct vfsmount *vfsmnt = path->mnt;
70615+ struct mount *mnt = real_mount(vfsmnt);
70616+ bool slash = false;
70617+ int error = 0;
70618+
70619+ while (dentry != root->dentry || vfsmnt != root->mnt) {
70620+ struct dentry * parent;
70621+
70622+ if (dentry == vfsmnt->mnt_root || IS_ROOT(dentry)) {
70623+ /* Global root? */
70624+ if (!mnt_has_parent(mnt)) {
70625+ goto out;
70626+ }
70627+ dentry = mnt->mnt_mountpoint;
70628+ mnt = mnt->mnt_parent;
70629+ vfsmnt = &mnt->mnt;
70630+ continue;
70631+ }
70632+ parent = dentry->d_parent;
70633+ prefetch(parent);
70634+ spin_lock(&dentry->d_lock);
70635+ error = prepend_name(buffer, buflen, &dentry->d_name);
70636+ spin_unlock(&dentry->d_lock);
70637+ if (!error)
70638+ error = prepend(buffer, buflen, "/", 1);
70639+ if (error)
70640+ break;
70641+
70642+ slash = true;
70643+ dentry = parent;
70644+ }
70645+
70646+out:
70647+ if (!error && !slash)
70648+ error = prepend(buffer, buflen, "/", 1);
70649+
70650+ return error;
70651+}
70652+
70653+/* this must be called with mount_lock and rename_lock held */
70654+
70655+static char *__our_d_path(const struct path *path, struct path *root,
70656+ char *buf, int buflen)
70657+{
70658+ char *res = buf + buflen;
70659+ int error;
70660+
70661+ prepend(&res, &buflen, "\0", 1);
70662+ error = prepend_path(path, root, &res, &buflen);
70663+ if (error)
70664+ return ERR_PTR(error);
70665+
70666+ return res;
70667+}
70668+
70669+static char *
70670+gen_full_path(struct path *path, struct path *root, char *buf, int buflen)
70671+{
70672+ char *retval;
70673+
70674+ retval = __our_d_path(path, root, buf, buflen);
70675+ if (unlikely(IS_ERR(retval)))
70676+ retval = strcpy(buf, "<path too long>");
70677+ else if (unlikely(retval[1] == '/' && retval[2] == '\0'))
70678+ retval[1] = '\0';
70679+
70680+ return retval;
70681+}
70682+
70683+static char *
70684+__d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
70685+ char *buf, int buflen)
70686+{
70687+ struct path path;
70688+ char *res;
70689+
70690+ path.dentry = (struct dentry *)dentry;
70691+ path.mnt = (struct vfsmount *)vfsmnt;
70692+
70693+ /* we can use gr_real_root.dentry, gr_real_root.mnt, because this is only called
70694+ by the RBAC system */
70695+ res = gen_full_path(&path, &gr_real_root, buf, buflen);
70696+
70697+ return res;
70698+}
70699+
70700+static char *
70701+d_real_path(const struct dentry *dentry, const struct vfsmount *vfsmnt,
70702+ char *buf, int buflen)
70703+{
70704+ char *res;
70705+ struct path path;
70706+ struct path root;
70707+ struct task_struct *reaper = init_pid_ns.child_reaper;
70708+
70709+ path.dentry = (struct dentry *)dentry;
70710+ path.mnt = (struct vfsmount *)vfsmnt;
70711+
70712+ /* we can't use gr_real_root.dentry, gr_real_root.mnt, because they belong only to the RBAC system */
70713+ get_fs_root(reaper->fs, &root);
70714+
70715+ read_seqlock_excl(&mount_lock);
70716+ write_seqlock(&rename_lock);
70717+ res = gen_full_path(&path, &root, buf, buflen);
70718+ write_sequnlock(&rename_lock);
70719+ read_sequnlock_excl(&mount_lock);
70720+
70721+ path_put(&root);
70722+ return res;
70723+}
70724+
70725+char *
70726+gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
70727+{
70728+ char *ret;
70729+ read_seqlock_excl(&mount_lock);
70730+ write_seqlock(&rename_lock);
70731+ ret = __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
70732+ PAGE_SIZE);
70733+ write_sequnlock(&rename_lock);
70734+ read_sequnlock_excl(&mount_lock);
70735+ return ret;
70736+}
70737+
70738+static char *
70739+gr_to_proc_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt)
70740+{
70741+ char *ret;
70742+ char *buf;
70743+ int buflen;
70744+
70745+ read_seqlock_excl(&mount_lock);
70746+ write_seqlock(&rename_lock);
70747+ buf = per_cpu_ptr(gr_shared_page[0], smp_processor_id());
70748+ ret = __d_real_path(dentry, mnt, buf, PAGE_SIZE - 6);
70749+ buflen = (int)(ret - buf);
70750+ if (buflen >= 5)
70751+ prepend(&ret, &buflen, "/proc", 5);
70752+ else
70753+ ret = strcpy(buf, "<path too long>");
70754+ write_sequnlock(&rename_lock);
70755+ read_sequnlock_excl(&mount_lock);
70756+ return ret;
70757+}
70758+
70759+char *
70760+gr_to_filename_nolock(const struct dentry *dentry, const struct vfsmount *mnt)
70761+{
70762+ return __d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0],smp_processor_id()),
70763+ PAGE_SIZE);
70764+}
70765+
70766+char *
70767+gr_to_filename(const struct dentry *dentry, const struct vfsmount *mnt)
70768+{
70769+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
70770+ PAGE_SIZE);
70771+}
70772+
70773+char *
70774+gr_to_filename1(const struct dentry *dentry, const struct vfsmount *mnt)
70775+{
70776+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[1], smp_processor_id()),
70777+ PAGE_SIZE);
70778+}
70779+
70780+char *
70781+gr_to_filename2(const struct dentry *dentry, const struct vfsmount *mnt)
70782+{
70783+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[2], smp_processor_id()),
70784+ PAGE_SIZE);
70785+}
70786+
70787+char *
70788+gr_to_filename3(const struct dentry *dentry, const struct vfsmount *mnt)
70789+{
70790+ return d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[3], smp_processor_id()),
70791+ PAGE_SIZE);
70792+}
70793+
70794+__inline__ __u32
70795+to_gr_audit(const __u32 reqmode)
70796+{
70797+ /* masks off auditable permission flags, then shifts them to create
70798+ auditing flags, and adds the special case of append auditing if
70799+ we're requesting write */
70800+ return (((reqmode & ~GR_AUDITS) << 10) | ((reqmode & GR_WRITE) ? GR_AUDIT_APPEND : 0));
70801+}
70802+
70803+struct acl_role_label *
70804+__lookup_acl_role_label(const struct gr_policy_state *state, const struct task_struct *task, const uid_t uid,
70805+ const gid_t gid)
70806+{
70807+ unsigned int index = gr_rhash(uid, GR_ROLE_USER, state->acl_role_set.r_size);
70808+ struct acl_role_label *match;
70809+ struct role_allowed_ip *ipp;
70810+ unsigned int x;
70811+ u32 curr_ip = task->signal->saved_ip;
70812+
70813+ match = state->acl_role_set.r_hash[index];
70814+
70815+ while (match) {
70816+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_USER)) == (GR_ROLE_DOMAIN | GR_ROLE_USER)) {
70817+ for (x = 0; x < match->domain_child_num; x++) {
70818+ if (match->domain_children[x] == uid)
70819+ goto found;
70820+ }
70821+ } else if (match->uidgid == uid && match->roletype & GR_ROLE_USER)
70822+ break;
70823+ match = match->next;
70824+ }
70825+found:
70826+ if (match == NULL) {
70827+ try_group:
70828+ index = gr_rhash(gid, GR_ROLE_GROUP, state->acl_role_set.r_size);
70829+ match = state->acl_role_set.r_hash[index];
70830+
70831+ while (match) {
70832+ if ((match->roletype & (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) == (GR_ROLE_DOMAIN | GR_ROLE_GROUP)) {
70833+ for (x = 0; x < match->domain_child_num; x++) {
70834+ if (match->domain_children[x] == gid)
70835+ goto found2;
70836+ }
70837+ } else if (match->uidgid == gid && match->roletype & GR_ROLE_GROUP)
70838+ break;
70839+ match = match->next;
70840+ }
70841+found2:
70842+ if (match == NULL)
70843+ match = state->default_role;
70844+ if (match->allowed_ips == NULL)
70845+ return match;
70846+ else {
70847+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
70848+ if (likely
70849+ ((ntohl(curr_ip) & ipp->netmask) ==
70850+ (ntohl(ipp->addr) & ipp->netmask)))
70851+ return match;
70852+ }
70853+ match = state->default_role;
70854+ }
70855+ } else if (match->allowed_ips == NULL) {
70856+ return match;
70857+ } else {
70858+ for (ipp = match->allowed_ips; ipp; ipp = ipp->next) {
70859+ if (likely
70860+ ((ntohl(curr_ip) & ipp->netmask) ==
70861+ (ntohl(ipp->addr) & ipp->netmask)))
70862+ return match;
70863+ }
70864+ goto try_group;
70865+ }
70866+
70867+ return match;
70868+}
70869+
70870+static struct acl_role_label *
70871+lookup_acl_role_label(const struct task_struct *task, const uid_t uid,
70872+ const gid_t gid)
70873+{
70874+ return __lookup_acl_role_label(&running_polstate, task, uid, gid);
70875+}
70876+
70877+struct acl_subject_label *
70878+lookup_acl_subj_label(const u64 ino, const dev_t dev,
70879+ const struct acl_role_label *role)
70880+{
70881+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
70882+ struct acl_subject_label *match;
70883+
70884+ match = role->subj_hash[index];
70885+
70886+ while (match && (match->inode != ino || match->device != dev ||
70887+ (match->mode & GR_DELETED))) {
70888+ match = match->next;
70889+ }
70890+
70891+ if (match && !(match->mode & GR_DELETED))
70892+ return match;
70893+ else
70894+ return NULL;
70895+}
70896+
70897+struct acl_subject_label *
70898+lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev,
70899+ const struct acl_role_label *role)
70900+{
70901+ unsigned int index = gr_fhash(ino, dev, role->subj_hash_size);
70902+ struct acl_subject_label *match;
70903+
70904+ match = role->subj_hash[index];
70905+
70906+ while (match && (match->inode != ino || match->device != dev ||
70907+ !(match->mode & GR_DELETED))) {
70908+ match = match->next;
70909+ }
70910+
70911+ if (match && (match->mode & GR_DELETED))
70912+ return match;
70913+ else
70914+ return NULL;
70915+}
70916+
70917+static struct acl_object_label *
70918+lookup_acl_obj_label(const u64 ino, const dev_t dev,
70919+ const struct acl_subject_label *subj)
70920+{
70921+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
70922+ struct acl_object_label *match;
70923+
70924+ match = subj->obj_hash[index];
70925+
70926+ while (match && (match->inode != ino || match->device != dev ||
70927+ (match->mode & GR_DELETED))) {
70928+ match = match->next;
70929+ }
70930+
70931+ if (match && !(match->mode & GR_DELETED))
70932+ return match;
70933+ else
70934+ return NULL;
70935+}
70936+
70937+static struct acl_object_label *
70938+lookup_acl_obj_label_create(const u64 ino, const dev_t dev,
70939+ const struct acl_subject_label *subj)
70940+{
70941+ unsigned int index = gr_fhash(ino, dev, subj->obj_hash_size);
70942+ struct acl_object_label *match;
70943+
70944+ match = subj->obj_hash[index];
70945+
70946+ while (match && (match->inode != ino || match->device != dev ||
70947+ !(match->mode & GR_DELETED))) {
70948+ match = match->next;
70949+ }
70950+
70951+ if (match && (match->mode & GR_DELETED))
70952+ return match;
70953+
70954+ match = subj->obj_hash[index];
70955+
70956+ while (match && (match->inode != ino || match->device != dev ||
70957+ (match->mode & GR_DELETED))) {
70958+ match = match->next;
70959+ }
70960+
70961+ if (match && !(match->mode & GR_DELETED))
70962+ return match;
70963+ else
70964+ return NULL;
70965+}
70966+
70967+struct name_entry *
70968+__lookup_name_entry(const struct gr_policy_state *state, const char *name)
70969+{
70970+ unsigned int len = strlen(name);
70971+ unsigned int key = full_name_hash(name, len);
70972+ unsigned int index = key % state->name_set.n_size;
70973+ struct name_entry *match;
70974+
70975+ match = state->name_set.n_hash[index];
70976+
70977+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len)))
70978+ match = match->next;
70979+
70980+ return match;
70981+}
70982+
70983+static struct name_entry *
70984+lookup_name_entry(const char *name)
70985+{
70986+ return __lookup_name_entry(&running_polstate, name);
70987+}
70988+
70989+static struct name_entry *
70990+lookup_name_entry_create(const char *name)
70991+{
70992+ unsigned int len = strlen(name);
70993+ unsigned int key = full_name_hash(name, len);
70994+ unsigned int index = key % running_polstate.name_set.n_size;
70995+ struct name_entry *match;
70996+
70997+ match = running_polstate.name_set.n_hash[index];
70998+
70999+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
71000+ !match->deleted))
71001+ match = match->next;
71002+
71003+ if (match && match->deleted)
71004+ return match;
71005+
71006+ match = running_polstate.name_set.n_hash[index];
71007+
71008+ while (match && (match->key != key || !gr_streq(match->name, name, match->len, len) ||
71009+ match->deleted))
71010+ match = match->next;
71011+
71012+ if (match && !match->deleted)
71013+ return match;
71014+ else
71015+ return NULL;
71016+}
71017+
71018+static struct inodev_entry *
71019+lookup_inodev_entry(const u64 ino, const dev_t dev)
71020+{
71021+ unsigned int index = gr_fhash(ino, dev, running_polstate.inodev_set.i_size);
71022+ struct inodev_entry *match;
71023+
71024+ match = running_polstate.inodev_set.i_hash[index];
71025+
71026+ while (match && (match->nentry->inode != ino || match->nentry->device != dev))
71027+ match = match->next;
71028+
71029+ return match;
71030+}
71031+
71032+void
71033+__insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry)
71034+{
71035+ unsigned int index = gr_fhash(entry->nentry->inode, entry->nentry->device,
71036+ state->inodev_set.i_size);
71037+ struct inodev_entry **curr;
71038+
71039+ entry->prev = NULL;
71040+
71041+ curr = &state->inodev_set.i_hash[index];
71042+ if (*curr != NULL)
71043+ (*curr)->prev = entry;
71044+
71045+ entry->next = *curr;
71046+ *curr = entry;
71047+
71048+ return;
71049+}
71050+
71051+static void
71052+insert_inodev_entry(struct inodev_entry *entry)
71053+{
71054+ __insert_inodev_entry(&running_polstate, entry);
71055+}
71056+
71057+void
71058+insert_acl_obj_label(struct acl_object_label *obj,
71059+ struct acl_subject_label *subj)
71060+{
71061+ unsigned int index =
71062+ gr_fhash(obj->inode, obj->device, subj->obj_hash_size);
71063+ struct acl_object_label **curr;
71064+
71065+ obj->prev = NULL;
71066+
71067+ curr = &subj->obj_hash[index];
71068+ if (*curr != NULL)
71069+ (*curr)->prev = obj;
71070+
71071+ obj->next = *curr;
71072+ *curr = obj;
71073+
71074+ return;
71075+}
71076+
71077+void
71078+insert_acl_subj_label(struct acl_subject_label *obj,
71079+ struct acl_role_label *role)
71080+{
71081+ unsigned int index = gr_fhash(obj->inode, obj->device, role->subj_hash_size);
71082+ struct acl_subject_label **curr;
71083+
71084+ obj->prev = NULL;
71085+
71086+ curr = &role->subj_hash[index];
71087+ if (*curr != NULL)
71088+ (*curr)->prev = obj;
71089+
71090+ obj->next = *curr;
71091+ *curr = obj;
71092+
71093+ return;
71094+}
71095+
71096+/* derived from glibc fnmatch() 0: match, 1: no match*/
71097+
71098+static int
71099+glob_match(const char *p, const char *n)
71100+{
71101+ char c;
71102+
71103+ while ((c = *p++) != '\0') {
71104+ switch (c) {
71105+ case '?':
71106+ if (*n == '\0')
71107+ return 1;
71108+ else if (*n == '/')
71109+ return 1;
71110+ break;
71111+ case '\\':
71112+ if (*n != c)
71113+ return 1;
71114+ break;
71115+ case '*':
71116+ for (c = *p++; c == '?' || c == '*'; c = *p++) {
71117+ if (*n == '/')
71118+ return 1;
71119+ else if (c == '?') {
71120+ if (*n == '\0')
71121+ return 1;
71122+ else
71123+ ++n;
71124+ }
71125+ }
71126+ if (c == '\0') {
71127+ return 0;
71128+ } else {
71129+ const char *endp;
71130+
71131+ if ((endp = strchr(n, '/')) == NULL)
71132+ endp = n + strlen(n);
71133+
71134+ if (c == '[') {
71135+ for (--p; n < endp; ++n)
71136+ if (!glob_match(p, n))
71137+ return 0;
71138+ } else if (c == '/') {
71139+ while (*n != '\0' && *n != '/')
71140+ ++n;
71141+ if (*n == '/' && !glob_match(p, n + 1))
71142+ return 0;
71143+ } else {
71144+ for (--p; n < endp; ++n)
71145+ if (*n == c && !glob_match(p, n))
71146+ return 0;
71147+ }
71148+
71149+ return 1;
71150+ }
71151+ case '[':
71152+ {
71153+ int not;
71154+ char cold;
71155+
71156+ if (*n == '\0' || *n == '/')
71157+ return 1;
71158+
71159+ not = (*p == '!' || *p == '^');
71160+ if (not)
71161+ ++p;
71162+
71163+ c = *p++;
71164+ for (;;) {
71165+ unsigned char fn = (unsigned char)*n;
71166+
71167+ if (c == '\0')
71168+ return 1;
71169+ else {
71170+ if (c == fn)
71171+ goto matched;
71172+ cold = c;
71173+ c = *p++;
71174+
71175+ if (c == '-' && *p != ']') {
71176+ unsigned char cend = *p++;
71177+
71178+ if (cend == '\0')
71179+ return 1;
71180+
71181+ if (cold <= fn && fn <= cend)
71182+ goto matched;
71183+
71184+ c = *p++;
71185+ }
71186+ }
71187+
71188+ if (c == ']')
71189+ break;
71190+ }
71191+ if (!not)
71192+ return 1;
71193+ break;
71194+ matched:
71195+ while (c != ']') {
71196+ if (c == '\0')
71197+ return 1;
71198+
71199+ c = *p++;
71200+ }
71201+ if (not)
71202+ return 1;
71203+ }
71204+ break;
71205+ default:
71206+ if (c != *n)
71207+ return 1;
71208+ }
71209+
71210+ ++n;
71211+ }
71212+
71213+ if (*n == '\0')
71214+ return 0;
71215+
71216+ if (*n == '/')
71217+ return 0;
71218+
71219+ return 1;
71220+}
71221+
71222+static struct acl_object_label *
71223+chk_glob_label(struct acl_object_label *globbed,
71224+ const struct dentry *dentry, const struct vfsmount *mnt, char **path)
71225+{
71226+ struct acl_object_label *tmp;
71227+
71228+ if (*path == NULL)
71229+ *path = gr_to_filename_nolock(dentry, mnt);
71230+
71231+ tmp = globbed;
71232+
71233+ while (tmp) {
71234+ if (!glob_match(tmp->filename, *path))
71235+ return tmp;
71236+ tmp = tmp->next;
71237+ }
71238+
71239+ return NULL;
71240+}
71241+
71242+static struct acl_object_label *
71243+__full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
71244+ const u64 curr_ino, const dev_t curr_dev,
71245+ const struct acl_subject_label *subj, char **path, const int checkglob)
71246+{
71247+ struct acl_subject_label *tmpsubj;
71248+ struct acl_object_label *retval;
71249+ struct acl_object_label *retval2;
71250+
71251+ tmpsubj = (struct acl_subject_label *) subj;
71252+ read_lock(&gr_inode_lock);
71253+ do {
71254+ retval = lookup_acl_obj_label(curr_ino, curr_dev, tmpsubj);
71255+ if (retval) {
71256+ if (checkglob && retval->globbed) {
71257+ retval2 = chk_glob_label(retval->globbed, orig_dentry, orig_mnt, path);
71258+ if (retval2)
71259+ retval = retval2;
71260+ }
71261+ break;
71262+ }
71263+ } while ((tmpsubj = tmpsubj->parent_subject));
71264+ read_unlock(&gr_inode_lock);
71265+
71266+ return retval;
71267+}
71268+
71269+static __inline__ struct acl_object_label *
71270+full_lookup(const struct dentry *orig_dentry, const struct vfsmount *orig_mnt,
71271+ struct dentry *curr_dentry,
71272+ const struct acl_subject_label *subj, char **path, const int checkglob)
71273+{
71274+ int newglob = checkglob;
71275+ u64 inode;
71276+ dev_t device;
71277+
71278+ /* if we aren't checking a subdirectory of the original path yet, don't do glob checking
71279+ as we don't want a / * rule to match instead of the / object
71280+ don't do this for create lookups that call this function though, since they're looking up
71281+ on the parent and thus need globbing checks on all paths
71282+ */
71283+ if (orig_dentry == curr_dentry && newglob != GR_CREATE_GLOB)
71284+ newglob = GR_NO_GLOB;
71285+
71286+ spin_lock(&curr_dentry->d_lock);
71287+ inode = __get_ino(curr_dentry);
71288+ device = __get_dev(curr_dentry);
71289+ spin_unlock(&curr_dentry->d_lock);
71290+
71291+ return __full_lookup(orig_dentry, orig_mnt, inode, device, subj, path, newglob);
71292+}
71293+
71294+#ifdef CONFIG_HUGETLBFS
71295+static inline bool
71296+is_hugetlbfs_mnt(const struct vfsmount *mnt)
71297+{
71298+ int i;
71299+ for (i = 0; i < HUGE_MAX_HSTATE; i++) {
71300+ if (unlikely(hugetlbfs_vfsmount[i] == mnt))
71301+ return true;
71302+ }
71303+
71304+ return false;
71305+}
71306+#endif
71307+
71308+static struct acl_object_label *
71309+__chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
71310+ const struct acl_subject_label *subj, char *path, const int checkglob)
71311+{
71312+ struct dentry *dentry = (struct dentry *) l_dentry;
71313+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
71314+ struct mount *real_mnt = real_mount(mnt);
71315+ struct acl_object_label *retval;
71316+ struct dentry *parent;
71317+
71318+ read_seqlock_excl(&mount_lock);
71319+ write_seqlock(&rename_lock);
71320+
71321+ if (unlikely((mnt == shm_mnt && dentry->d_inode->i_nlink == 0) || mnt == pipe_mnt ||
71322+#ifdef CONFIG_NET
71323+ mnt == sock_mnt ||
71324+#endif
71325+#ifdef CONFIG_HUGETLBFS
71326+ (is_hugetlbfs_mnt(mnt) && dentry->d_inode->i_nlink == 0) ||
71327+#endif
71328+ /* ignore Eric Biederman */
71329+ IS_PRIVATE(l_dentry->d_inode))) {
71330+ retval = (subj->mode & GR_SHMEXEC) ? fakefs_obj_rwx : fakefs_obj_rw;
71331+ goto out;
71332+ }
71333+
71334+ for (;;) {
71335+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
71336+ break;
71337+
71338+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
71339+ if (!mnt_has_parent(real_mnt))
71340+ break;
71341+
71342+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
71343+ if (retval != NULL)
71344+ goto out;
71345+
71346+ dentry = real_mnt->mnt_mountpoint;
71347+ real_mnt = real_mnt->mnt_parent;
71348+ mnt = &real_mnt->mnt;
71349+ continue;
71350+ }
71351+
71352+ parent = dentry->d_parent;
71353+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
71354+ if (retval != NULL)
71355+ goto out;
71356+
71357+ dentry = parent;
71358+ }
71359+
71360+ retval = full_lookup(l_dentry, l_mnt, dentry, subj, &path, checkglob);
71361+
71362+ /* gr_real_root is pinned so we don't have to hold a reference */
71363+ if (retval == NULL)
71364+ retval = full_lookup(l_dentry, l_mnt, gr_real_root.dentry, subj, &path, checkglob);
71365+out:
71366+ write_sequnlock(&rename_lock);
71367+ read_sequnlock_excl(&mount_lock);
71368+
71369+ BUG_ON(retval == NULL);
71370+
71371+ return retval;
71372+}
71373+
71374+static __inline__ struct acl_object_label *
71375+chk_obj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
71376+ const struct acl_subject_label *subj)
71377+{
71378+ char *path = NULL;
71379+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_REG_GLOB);
71380+}
71381+
71382+static __inline__ struct acl_object_label *
71383+chk_obj_label_noglob(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
71384+ const struct acl_subject_label *subj)
71385+{
71386+ char *path = NULL;
71387+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_NO_GLOB);
71388+}
71389+
71390+static __inline__ struct acl_object_label *
71391+chk_obj_create_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
71392+ const struct acl_subject_label *subj, char *path)
71393+{
71394+ return __chk_obj_label(l_dentry, l_mnt, subj, path, GR_CREATE_GLOB);
71395+}
71396+
71397+struct acl_subject_label *
71398+chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt,
71399+ const struct acl_role_label *role)
71400+{
71401+ struct dentry *dentry = (struct dentry *) l_dentry;
71402+ struct vfsmount *mnt = (struct vfsmount *) l_mnt;
71403+ struct mount *real_mnt = real_mount(mnt);
71404+ struct acl_subject_label *retval;
71405+ struct dentry *parent;
71406+
71407+ read_seqlock_excl(&mount_lock);
71408+ write_seqlock(&rename_lock);
71409+
71410+ for (;;) {
71411+ if (dentry == gr_real_root.dentry && mnt == gr_real_root.mnt)
71412+ break;
71413+ if (dentry == mnt->mnt_root || IS_ROOT(dentry)) {
71414+ if (!mnt_has_parent(real_mnt))
71415+ break;
71416+
71417+ spin_lock(&dentry->d_lock);
71418+ read_lock(&gr_inode_lock);
71419+ retval =
71420+ lookup_acl_subj_label(__get_ino(dentry),
71421+ __get_dev(dentry), role);
71422+ read_unlock(&gr_inode_lock);
71423+ spin_unlock(&dentry->d_lock);
71424+ if (retval != NULL)
71425+ goto out;
71426+
71427+ dentry = real_mnt->mnt_mountpoint;
71428+ real_mnt = real_mnt->mnt_parent;
71429+ mnt = &real_mnt->mnt;
71430+ continue;
71431+ }
71432+
71433+ spin_lock(&dentry->d_lock);
71434+ read_lock(&gr_inode_lock);
71435+ retval = lookup_acl_subj_label(__get_ino(dentry),
71436+ __get_dev(dentry), role);
71437+ read_unlock(&gr_inode_lock);
71438+ parent = dentry->d_parent;
71439+ spin_unlock(&dentry->d_lock);
71440+
71441+ if (retval != NULL)
71442+ goto out;
71443+
71444+ dentry = parent;
71445+ }
71446+
71447+ spin_lock(&dentry->d_lock);
71448+ read_lock(&gr_inode_lock);
71449+ retval = lookup_acl_subj_label(__get_ino(dentry),
71450+ __get_dev(dentry), role);
71451+ read_unlock(&gr_inode_lock);
71452+ spin_unlock(&dentry->d_lock);
71453+
71454+ if (unlikely(retval == NULL)) {
71455+ /* gr_real_root is pinned, we don't need to hold a reference */
71456+ read_lock(&gr_inode_lock);
71457+ retval = lookup_acl_subj_label(__get_ino(gr_real_root.dentry),
71458+ __get_dev(gr_real_root.dentry), role);
71459+ read_unlock(&gr_inode_lock);
71460+ }
71461+out:
71462+ write_sequnlock(&rename_lock);
71463+ read_sequnlock_excl(&mount_lock);
71464+
71465+ BUG_ON(retval == NULL);
71466+
71467+ return retval;
71468+}
71469+
71470+void
71471+assign_special_role(const char *rolename)
71472+{
71473+ struct acl_object_label *obj;
71474+ struct acl_role_label *r;
71475+ struct acl_role_label *assigned = NULL;
71476+ struct task_struct *tsk;
71477+ struct file *filp;
71478+
71479+ FOR_EACH_ROLE_START(r)
71480+ if (!strcmp(rolename, r->rolename) &&
71481+ (r->roletype & GR_ROLE_SPECIAL)) {
71482+ assigned = r;
71483+ break;
71484+ }
71485+ FOR_EACH_ROLE_END(r)
71486+
71487+ if (!assigned)
71488+ return;
71489+
71490+ read_lock(&tasklist_lock);
71491+ read_lock(&grsec_exec_file_lock);
71492+
71493+ tsk = current->real_parent;
71494+ if (tsk == NULL)
71495+ goto out_unlock;
71496+
71497+ filp = tsk->exec_file;
71498+ if (filp == NULL)
71499+ goto out_unlock;
71500+
71501+ tsk->is_writable = 0;
71502+ tsk->inherited = 0;
71503+
71504+ tsk->acl_sp_role = 1;
71505+ tsk->acl_role_id = ++acl_sp_role_value;
71506+ tsk->role = assigned;
71507+ tsk->acl = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role);
71508+
71509+ /* ignore additional mmap checks for processes that are writable
71510+ by the default ACL */
71511+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
71512+ if (unlikely(obj->mode & GR_WRITE))
71513+ tsk->is_writable = 1;
71514+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, tsk->role->root_label);
71515+ if (unlikely(obj->mode & GR_WRITE))
71516+ tsk->is_writable = 1;
71517+
71518+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71519+ printk(KERN_ALERT "Assigning special role:%s subject:%s to process (%s:%d)\n", tsk->role->rolename,
71520+ tsk->acl->filename, tsk->comm, task_pid_nr(tsk));
71521+#endif
71522+
71523+out_unlock:
71524+ read_unlock(&grsec_exec_file_lock);
71525+ read_unlock(&tasklist_lock);
71526+ return;
71527+}
71528+
71529+
71530+static void
71531+gr_log_learn(const struct dentry *dentry, const struct vfsmount *mnt, const __u32 mode)
71532+{
71533+ struct task_struct *task = current;
71534+ const struct cred *cred = current_cred();
71535+
71536+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename, task->role->roletype,
71537+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
71538+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
71539+ 1UL, 1UL, gr_to_filename(dentry, mnt), (unsigned long) mode, &task->signal->saved_ip);
71540+
71541+ return;
71542+}
71543+
71544+static void
71545+gr_log_learn_uid_change(const kuid_t real, const kuid_t effective, const kuid_t fs)
71546+{
71547+ struct task_struct *task = current;
71548+ const struct cred *cred = current_cred();
71549+
71550+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
71551+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
71552+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
71553+ 'u', GR_GLOBAL_UID(real), GR_GLOBAL_UID(effective), GR_GLOBAL_UID(fs), &task->signal->saved_ip);
71554+
71555+ return;
71556+}
71557+
71558+static void
71559+gr_log_learn_gid_change(const kgid_t real, const kgid_t effective, const kgid_t fs)
71560+{
71561+ struct task_struct *task = current;
71562+ const struct cred *cred = current_cred();
71563+
71564+ security_learn(GR_ID_LEARN_MSG, task->role->rolename, task->role->roletype,
71565+ GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), task->exec_file ? gr_to_filename1(task->exec_file->f_path.dentry,
71566+ task->exec_file->f_path.mnt) : task->acl->filename, task->acl->filename,
71567+ 'g', GR_GLOBAL_GID(real), GR_GLOBAL_GID(effective), GR_GLOBAL_GID(fs), &task->signal->saved_ip);
71568+
71569+ return;
71570+}
71571+
71572+static void
71573+gr_set_proc_res(struct task_struct *task)
71574+{
71575+ struct acl_subject_label *proc;
71576+ unsigned short i;
71577+
71578+ proc = task->acl;
71579+
71580+ if (proc->mode & (GR_LEARN | GR_INHERITLEARN))
71581+ return;
71582+
71583+ for (i = 0; i < RLIM_NLIMITS; i++) {
71584+ unsigned long rlim_cur, rlim_max;
71585+
71586+ if (!(proc->resmask & (1U << i)))
71587+ continue;
71588+
71589+ rlim_cur = proc->res[i].rlim_cur;
71590+ rlim_max = proc->res[i].rlim_max;
71591+
71592+ if (i == RLIMIT_NOFILE) {
71593+ unsigned long saved_sysctl_nr_open = sysctl_nr_open;
71594+ if (rlim_cur > saved_sysctl_nr_open)
71595+ rlim_cur = saved_sysctl_nr_open;
71596+ if (rlim_max > saved_sysctl_nr_open)
71597+ rlim_max = saved_sysctl_nr_open;
71598+ }
71599+
71600+ task->signal->rlim[i].rlim_cur = rlim_cur;
71601+ task->signal->rlim[i].rlim_max = rlim_max;
71602+
71603+ if (i == RLIMIT_CPU)
71604+ update_rlimit_cpu(task, rlim_cur);
71605+ }
71606+
71607+ return;
71608+}
71609+
71610+/* both of the below must be called with
71611+ rcu_read_lock();
71612+ read_lock(&tasklist_lock);
71613+ read_lock(&grsec_exec_file_lock);
71614+ except in the case of gr_set_role_label() (for __gr_get_subject_for_task)
71615+*/
71616+
71617+struct acl_subject_label *__gr_get_subject_for_task(const struct gr_policy_state *state, struct task_struct *task, const char *filename, int fallback)
71618+{
71619+ char *tmpname;
71620+ struct acl_subject_label *tmpsubj;
71621+ struct file *filp;
71622+ struct name_entry *nmatch;
71623+
71624+ filp = task->exec_file;
71625+ if (filp == NULL)
71626+ return NULL;
71627+
71628+ /* the following is to apply the correct subject
71629+ on binaries running when the RBAC system
71630+ is enabled, when the binaries have been
71631+ replaced or deleted since their execution
71632+ -----
71633+ when the RBAC system starts, the inode/dev
71634+ from exec_file will be one the RBAC system
71635+ is unaware of. It only knows the inode/dev
71636+ of the present file on disk, or the absence
71637+ of it.
71638+ */
71639+
71640+ if (filename)
71641+ nmatch = __lookup_name_entry(state, filename);
71642+ else {
71643+ preempt_disable();
71644+ tmpname = gr_to_filename_rbac(filp->f_path.dentry, filp->f_path.mnt);
71645+
71646+ nmatch = __lookup_name_entry(state, tmpname);
71647+ preempt_enable();
71648+ }
71649+ tmpsubj = NULL;
71650+ if (nmatch) {
71651+ if (nmatch->deleted)
71652+ tmpsubj = lookup_acl_subj_label_deleted(nmatch->inode, nmatch->device, task->role);
71653+ else
71654+ tmpsubj = lookup_acl_subj_label(nmatch->inode, nmatch->device, task->role);
71655+ }
71656+ /* this also works for the reload case -- if we don't match a potentially inherited subject
71657+ then we fall back to a normal lookup based on the binary's ino/dev
71658+ */
71659+ if (tmpsubj == NULL && fallback)
71660+ tmpsubj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, task->role);
71661+
71662+ return tmpsubj;
71663+}
71664+
71665+static struct acl_subject_label *gr_get_subject_for_task(struct task_struct *task, const char *filename, int fallback)
71666+{
71667+ return __gr_get_subject_for_task(&running_polstate, task, filename, fallback);
71668+}
71669+
71670+void __gr_apply_subject_to_task(const struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj)
71671+{
71672+ struct acl_object_label *obj;
71673+ struct file *filp;
71674+
71675+ filp = task->exec_file;
71676+
71677+ task->acl = subj;
71678+ task->is_writable = 0;
71679+ /* ignore additional mmap checks for processes that are writable
71680+ by the default ACL */
71681+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, state->default_role->root_label);
71682+ if (unlikely(obj->mode & GR_WRITE))
71683+ task->is_writable = 1;
71684+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
71685+ if (unlikely(obj->mode & GR_WRITE))
71686+ task->is_writable = 1;
71687+
71688+ gr_set_proc_res(task);
71689+
71690+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
71691+ 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);
71692+#endif
71693+}
71694+
71695+static void gr_apply_subject_to_task(struct task_struct *task, struct acl_subject_label *subj)
71696+{
71697+ __gr_apply_subject_to_task(&running_polstate, task, subj);
71698+}
71699+
71700+__u32
71701+gr_search_file(const struct dentry * dentry, const __u32 mode,
71702+ const struct vfsmount * mnt)
71703+{
71704+ __u32 retval = mode;
71705+ struct acl_subject_label *curracl;
71706+ struct acl_object_label *currobj;
71707+
71708+ if (unlikely(!(gr_status & GR_READY)))
71709+ return (mode & ~GR_AUDITS);
71710+
71711+ curracl = current->acl;
71712+
71713+ currobj = chk_obj_label(dentry, mnt, curracl);
71714+ retval = currobj->mode & mode;
71715+
71716+ /* if we're opening a specified transfer file for writing
71717+ (e.g. /dev/initctl), then transfer our role to init
71718+ */
71719+ if (unlikely(currobj->mode & GR_INIT_TRANSFER && retval & GR_WRITE &&
71720+ current->role->roletype & GR_ROLE_PERSIST)) {
71721+ struct task_struct *task = init_pid_ns.child_reaper;
71722+
71723+ if (task->role != current->role) {
71724+ struct acl_subject_label *subj;
71725+
71726+ task->acl_sp_role = 0;
71727+ task->acl_role_id = current->acl_role_id;
71728+ task->role = current->role;
71729+ rcu_read_lock();
71730+ read_lock(&grsec_exec_file_lock);
71731+ subj = gr_get_subject_for_task(task, NULL, 1);
71732+ gr_apply_subject_to_task(task, subj);
71733+ read_unlock(&grsec_exec_file_lock);
71734+ rcu_read_unlock();
71735+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_INIT_TRANSFER_MSG);
71736+ }
71737+ }
71738+
71739+ if (unlikely
71740+ ((curracl->mode & (GR_LEARN | GR_INHERITLEARN)) && !(mode & GR_NOPTRACE)
71741+ && (retval != (mode & ~(GR_AUDITS | GR_SUPPRESS))))) {
71742+ __u32 new_mode = mode;
71743+
71744+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
71745+
71746+ retval = new_mode;
71747+
71748+ if (new_mode & GR_EXEC && curracl->mode & GR_INHERITLEARN)
71749+ new_mode |= GR_INHERIT;
71750+
71751+ if (!(mode & GR_NOLEARN))
71752+ gr_log_learn(dentry, mnt, new_mode);
71753+ }
71754+
71755+ return retval;
71756+}
71757+
71758+struct acl_object_label *gr_get_create_object(const struct dentry *new_dentry,
71759+ const struct dentry *parent,
71760+ const struct vfsmount *mnt)
71761+{
71762+ struct name_entry *match;
71763+ struct acl_object_label *matchpo;
71764+ struct acl_subject_label *curracl;
71765+ char *path;
71766+
71767+ if (unlikely(!(gr_status & GR_READY)))
71768+ return NULL;
71769+
71770+ preempt_disable();
71771+ path = gr_to_filename_rbac(new_dentry, mnt);
71772+ match = lookup_name_entry_create(path);
71773+
71774+ curracl = current->acl;
71775+
71776+ if (match) {
71777+ read_lock(&gr_inode_lock);
71778+ matchpo = lookup_acl_obj_label_create(match->inode, match->device, curracl);
71779+ read_unlock(&gr_inode_lock);
71780+
71781+ if (matchpo) {
71782+ preempt_enable();
71783+ return matchpo;
71784+ }
71785+ }
71786+
71787+ // lookup parent
71788+
71789+ matchpo = chk_obj_create_label(parent, mnt, curracl, path);
71790+
71791+ preempt_enable();
71792+ return matchpo;
71793+}
71794+
71795+__u32
71796+gr_check_create(const struct dentry * new_dentry, const struct dentry * parent,
71797+ const struct vfsmount * mnt, const __u32 mode)
71798+{
71799+ struct acl_object_label *matchpo;
71800+ __u32 retval;
71801+
71802+ if (unlikely(!(gr_status & GR_READY)))
71803+ return (mode & ~GR_AUDITS);
71804+
71805+ matchpo = gr_get_create_object(new_dentry, parent, mnt);
71806+
71807+ retval = matchpo->mode & mode;
71808+
71809+ if ((retval != (mode & ~(GR_AUDITS | GR_SUPPRESS)))
71810+ && (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
71811+ __u32 new_mode = mode;
71812+
71813+ new_mode &= ~(GR_AUDITS | GR_SUPPRESS);
71814+
71815+ gr_log_learn(new_dentry, mnt, new_mode);
71816+ return new_mode;
71817+ }
71818+
71819+ return retval;
71820+}
71821+
71822+__u32
71823+gr_check_link(const struct dentry * new_dentry,
71824+ const struct dentry * parent_dentry,
71825+ const struct vfsmount * parent_mnt,
71826+ const struct dentry * old_dentry, const struct vfsmount * old_mnt)
71827+{
71828+ struct acl_object_label *obj;
71829+ __u32 oldmode, newmode;
71830+ __u32 needmode;
71831+ __u32 checkmodes = GR_FIND | GR_APPEND | GR_WRITE | GR_EXEC | GR_SETID | GR_READ |
71832+ GR_DELETE | GR_INHERIT;
71833+
71834+ if (unlikely(!(gr_status & GR_READY)))
71835+ return (GR_CREATE | GR_LINK);
71836+
71837+ obj = chk_obj_label(old_dentry, old_mnt, current->acl);
71838+ oldmode = obj->mode;
71839+
71840+ obj = gr_get_create_object(new_dentry, parent_dentry, parent_mnt);
71841+ newmode = obj->mode;
71842+
71843+ needmode = newmode & checkmodes;
71844+
71845+ // old name for hardlink must have at least the permissions of the new name
71846+ if ((oldmode & needmode) != needmode)
71847+ goto bad;
71848+
71849+ // if old name had restrictions/auditing, make sure the new name does as well
71850+ needmode = oldmode & (GR_NOPTRACE | GR_PTRACERD | GR_INHERIT | GR_AUDITS);
71851+
71852+ // don't allow hardlinking of suid/sgid/fcapped files without permission
71853+ if (is_privileged_binary(old_dentry))
71854+ needmode |= GR_SETID;
71855+
71856+ if ((newmode & needmode) != needmode)
71857+ goto bad;
71858+
71859+ // enforce minimum permissions
71860+ if ((newmode & (GR_CREATE | GR_LINK)) == (GR_CREATE | GR_LINK))
71861+ return newmode;
71862+bad:
71863+ needmode = oldmode;
71864+ if (is_privileged_binary(old_dentry))
71865+ needmode |= GR_SETID;
71866+
71867+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN)) {
71868+ gr_log_learn(old_dentry, old_mnt, needmode | GR_CREATE | GR_LINK);
71869+ return (GR_CREATE | GR_LINK);
71870+ } else if (newmode & GR_SUPPRESS)
71871+ return GR_SUPPRESS;
71872+ else
71873+ return 0;
71874+}
71875+
71876+int
71877+gr_check_hidden_task(const struct task_struct *task)
71878+{
71879+ if (unlikely(!(gr_status & GR_READY)))
71880+ return 0;
71881+
71882+ if (!(task->acl->mode & GR_PROCFIND) && !(current->acl->mode & GR_VIEW))
71883+ return 1;
71884+
71885+ return 0;
71886+}
71887+
71888+int
71889+gr_check_protected_task(const struct task_struct *task)
71890+{
71891+ if (unlikely(!(gr_status & GR_READY) || !task))
71892+ return 0;
71893+
71894+ if ((task->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
71895+ task->acl != current->acl)
71896+ return 1;
71897+
71898+ return 0;
71899+}
71900+
71901+int
71902+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
71903+{
71904+ struct task_struct *p;
71905+ int ret = 0;
71906+
71907+ if (unlikely(!(gr_status & GR_READY) || !pid))
71908+ return ret;
71909+
71910+ read_lock(&tasklist_lock);
71911+ do_each_pid_task(pid, type, p) {
71912+ if ((p->acl->mode & GR_PROTECTED) && !(current->acl->mode & GR_KILL) &&
71913+ p->acl != current->acl) {
71914+ ret = 1;
71915+ goto out;
71916+ }
71917+ } while_each_pid_task(pid, type, p);
71918+out:
71919+ read_unlock(&tasklist_lock);
71920+
71921+ return ret;
71922+}
71923+
71924+void
71925+gr_copy_label(struct task_struct *tsk)
71926+{
71927+ struct task_struct *p = current;
71928+
71929+ tsk->inherited = p->inherited;
71930+ tsk->acl_sp_role = 0;
71931+ tsk->acl_role_id = p->acl_role_id;
71932+ tsk->acl = p->acl;
71933+ tsk->role = p->role;
71934+ tsk->signal->used_accept = 0;
71935+ tsk->signal->curr_ip = p->signal->curr_ip;
71936+ tsk->signal->saved_ip = p->signal->saved_ip;
71937+ if (p->exec_file)
71938+ get_file(p->exec_file);
71939+ tsk->exec_file = p->exec_file;
71940+ tsk->is_writable = p->is_writable;
71941+ if (unlikely(p->signal->used_accept)) {
71942+ p->signal->curr_ip = 0;
71943+ p->signal->saved_ip = 0;
71944+ }
71945+
71946+ return;
71947+}
71948+
71949+extern int gr_process_kernel_setuid_ban(struct user_struct *user);
71950+
71951+int
71952+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
71953+{
71954+ unsigned int i;
71955+ __u16 num;
71956+ uid_t *uidlist;
71957+ uid_t curuid;
71958+ int realok = 0;
71959+ int effectiveok = 0;
71960+ int fsok = 0;
71961+ uid_t globalreal, globaleffective, globalfs;
71962+
71963+#if defined(CONFIG_GRKERNSEC_KERN_LOCKOUT)
71964+ struct user_struct *user;
71965+
71966+ if (!uid_valid(real))
71967+ goto skipit;
71968+
71969+ /* find user based on global namespace */
71970+
71971+ globalreal = GR_GLOBAL_UID(real);
71972+
71973+ user = find_user(make_kuid(&init_user_ns, globalreal));
71974+ if (user == NULL)
71975+ goto skipit;
71976+
71977+ if (gr_process_kernel_setuid_ban(user)) {
71978+ /* for find_user */
71979+ free_uid(user);
71980+ return 1;
71981+ }
71982+
71983+ /* for find_user */
71984+ free_uid(user);
71985+
71986+skipit:
71987+#endif
71988+
71989+ if (unlikely(!(gr_status & GR_READY)))
71990+ return 0;
71991+
71992+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
71993+ gr_log_learn_uid_change(real, effective, fs);
71994+
71995+ num = current->acl->user_trans_num;
71996+ uidlist = current->acl->user_transitions;
71997+
71998+ if (uidlist == NULL)
71999+ return 0;
72000+
72001+ if (!uid_valid(real)) {
72002+ realok = 1;
72003+ globalreal = (uid_t)-1;
72004+ } else {
72005+ globalreal = GR_GLOBAL_UID(real);
72006+ }
72007+ if (!uid_valid(effective)) {
72008+ effectiveok = 1;
72009+ globaleffective = (uid_t)-1;
72010+ } else {
72011+ globaleffective = GR_GLOBAL_UID(effective);
72012+ }
72013+ if (!uid_valid(fs)) {
72014+ fsok = 1;
72015+ globalfs = (uid_t)-1;
72016+ } else {
72017+ globalfs = GR_GLOBAL_UID(fs);
72018+ }
72019+
72020+ if (current->acl->user_trans_type & GR_ID_ALLOW) {
72021+ for (i = 0; i < num; i++) {
72022+ curuid = uidlist[i];
72023+ if (globalreal == curuid)
72024+ realok = 1;
72025+ if (globaleffective == curuid)
72026+ effectiveok = 1;
72027+ if (globalfs == curuid)
72028+ fsok = 1;
72029+ }
72030+ } else if (current->acl->user_trans_type & GR_ID_DENY) {
72031+ for (i = 0; i < num; i++) {
72032+ curuid = uidlist[i];
72033+ if (globalreal == curuid)
72034+ break;
72035+ if (globaleffective == curuid)
72036+ break;
72037+ if (globalfs == curuid)
72038+ break;
72039+ }
72040+ /* not in deny list */
72041+ if (i == num) {
72042+ realok = 1;
72043+ effectiveok = 1;
72044+ fsok = 1;
72045+ }
72046+ }
72047+
72048+ if (realok && effectiveok && fsok)
72049+ return 0;
72050+ else {
72051+ gr_log_int(GR_DONT_AUDIT, GR_USRCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
72052+ return 1;
72053+ }
72054+}
72055+
72056+int
72057+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
72058+{
72059+ unsigned int i;
72060+ __u16 num;
72061+ gid_t *gidlist;
72062+ gid_t curgid;
72063+ int realok = 0;
72064+ int effectiveok = 0;
72065+ int fsok = 0;
72066+ gid_t globalreal, globaleffective, globalfs;
72067+
72068+ if (unlikely(!(gr_status & GR_READY)))
72069+ return 0;
72070+
72071+ if (current->acl->mode & (GR_LEARN | GR_INHERITLEARN))
72072+ gr_log_learn_gid_change(real, effective, fs);
72073+
72074+ num = current->acl->group_trans_num;
72075+ gidlist = current->acl->group_transitions;
72076+
72077+ if (gidlist == NULL)
72078+ return 0;
72079+
72080+ if (!gid_valid(real)) {
72081+ realok = 1;
72082+ globalreal = (gid_t)-1;
72083+ } else {
72084+ globalreal = GR_GLOBAL_GID(real);
72085+ }
72086+ if (!gid_valid(effective)) {
72087+ effectiveok = 1;
72088+ globaleffective = (gid_t)-1;
72089+ } else {
72090+ globaleffective = GR_GLOBAL_GID(effective);
72091+ }
72092+ if (!gid_valid(fs)) {
72093+ fsok = 1;
72094+ globalfs = (gid_t)-1;
72095+ } else {
72096+ globalfs = GR_GLOBAL_GID(fs);
72097+ }
72098+
72099+ if (current->acl->group_trans_type & GR_ID_ALLOW) {
72100+ for (i = 0; i < num; i++) {
72101+ curgid = gidlist[i];
72102+ if (globalreal == curgid)
72103+ realok = 1;
72104+ if (globaleffective == curgid)
72105+ effectiveok = 1;
72106+ if (globalfs == curgid)
72107+ fsok = 1;
72108+ }
72109+ } else if (current->acl->group_trans_type & GR_ID_DENY) {
72110+ for (i = 0; i < num; i++) {
72111+ curgid = gidlist[i];
72112+ if (globalreal == curgid)
72113+ break;
72114+ if (globaleffective == curgid)
72115+ break;
72116+ if (globalfs == curgid)
72117+ break;
72118+ }
72119+ /* not in deny list */
72120+ if (i == num) {
72121+ realok = 1;
72122+ effectiveok = 1;
72123+ fsok = 1;
72124+ }
72125+ }
72126+
72127+ if (realok && effectiveok && fsok)
72128+ return 0;
72129+ else {
72130+ gr_log_int(GR_DONT_AUDIT, GR_GRPCHANGE_ACL_MSG, realok ? (effectiveok ? (fsok ? 0 : globalfs) : globaleffective) : globalreal);
72131+ return 1;
72132+ }
72133+}
72134+
72135+extern int gr_acl_is_capable(const int cap);
72136+
72137+void
72138+gr_set_role_label(struct task_struct *task, const kuid_t kuid, const kgid_t kgid)
72139+{
72140+ struct acl_role_label *role = task->role;
72141+ struct acl_role_label *origrole = role;
72142+ struct acl_subject_label *subj = NULL;
72143+ struct acl_object_label *obj;
72144+ struct file *filp;
72145+ uid_t uid;
72146+ gid_t gid;
72147+
72148+ if (unlikely(!(gr_status & GR_READY)))
72149+ return;
72150+
72151+ uid = GR_GLOBAL_UID(kuid);
72152+ gid = GR_GLOBAL_GID(kgid);
72153+
72154+ filp = task->exec_file;
72155+
72156+ /* kernel process, we'll give them the kernel role */
72157+ if (unlikely(!filp)) {
72158+ task->role = running_polstate.kernel_role;
72159+ task->acl = running_polstate.kernel_role->root_label;
72160+ return;
72161+ } else if (!task->role || !(task->role->roletype & GR_ROLE_SPECIAL)) {
72162+ /* save the current ip at time of role lookup so that the proper
72163+ IP will be learned for role_allowed_ip */
72164+ task->signal->saved_ip = task->signal->curr_ip;
72165+ role = lookup_acl_role_label(task, uid, gid);
72166+ }
72167+
72168+ /* don't change the role if we're not a privileged process */
72169+ if (role && task->role != role &&
72170+ (((role->roletype & GR_ROLE_USER) && !gr_acl_is_capable(CAP_SETUID)) ||
72171+ ((role->roletype & GR_ROLE_GROUP) && !gr_acl_is_capable(CAP_SETGID))))
72172+ return;
72173+
72174+ task->role = role;
72175+
72176+ if (task->inherited) {
72177+ /* if we reached our subject through inheritance, then first see
72178+ if there's a subject of the same name in the new role that has
72179+ an object that would result in the same inherited subject
72180+ */
72181+ subj = gr_get_subject_for_task(task, task->acl->filename, 0);
72182+ if (subj) {
72183+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, subj);
72184+ if (!(obj->mode & GR_INHERIT))
72185+ subj = NULL;
72186+ }
72187+
72188+ }
72189+ if (subj == NULL) {
72190+ /* otherwise:
72191+ perform subject lookup in possibly new role
72192+ we can use this result below in the case where role == task->role
72193+ */
72194+ subj = chk_subj_label(filp->f_path.dentry, filp->f_path.mnt, role);
72195+ }
72196+
72197+ /* if we changed uid/gid, but result in the same role
72198+ and are using inheritance, don't lose the inherited subject
72199+ if current subject is other than what normal lookup
72200+ would result in, we arrived via inheritance, don't
72201+ lose subject
72202+ */
72203+ if (role != origrole || (!(task->acl->mode & GR_INHERITLEARN) &&
72204+ (subj == task->acl)))
72205+ task->acl = subj;
72206+
72207+ /* leave task->inherited unaffected */
72208+
72209+ task->is_writable = 0;
72210+
72211+ /* ignore additional mmap checks for processes that are writable
72212+ by the default ACL */
72213+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
72214+ if (unlikely(obj->mode & GR_WRITE))
72215+ task->is_writable = 1;
72216+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, task->role->root_label);
72217+ if (unlikely(obj->mode & GR_WRITE))
72218+ task->is_writable = 1;
72219+
72220+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
72221+ 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);
72222+#endif
72223+
72224+ gr_set_proc_res(task);
72225+
72226+ return;
72227+}
72228+
72229+int
72230+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
72231+ const int unsafe_flags)
72232+{
72233+ struct task_struct *task = current;
72234+ struct acl_subject_label *newacl;
72235+ struct acl_object_label *obj;
72236+ __u32 retmode;
72237+
72238+ if (unlikely(!(gr_status & GR_READY)))
72239+ return 0;
72240+
72241+ newacl = chk_subj_label(dentry, mnt, task->role);
72242+
72243+ /* special handling for if we did an strace -f -p <pid> from an admin role, where pid then
72244+ did an exec
72245+ */
72246+ rcu_read_lock();
72247+ read_lock(&tasklist_lock);
72248+ if (task->ptrace && task->parent && ((task->parent->role->roletype & GR_ROLE_GOD) ||
72249+ (task->parent->acl->mode & GR_POVERRIDE))) {
72250+ read_unlock(&tasklist_lock);
72251+ rcu_read_unlock();
72252+ goto skip_check;
72253+ }
72254+ read_unlock(&tasklist_lock);
72255+ rcu_read_unlock();
72256+
72257+ if (unsafe_flags && !(task->acl->mode & GR_POVERRIDE) && (task->acl != newacl) &&
72258+ !(task->role->roletype & GR_ROLE_GOD) &&
72259+ !gr_search_file(dentry, GR_PTRACERD, mnt) &&
72260+ !(task->acl->mode & (GR_LEARN | GR_INHERITLEARN))) {
72261+ if (unsafe_flags & LSM_UNSAFE_SHARE)
72262+ gr_log_fs_generic(GR_DONT_AUDIT, GR_UNSAFESHARE_EXEC_ACL_MSG, dentry, mnt);
72263+ else
72264+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_EXEC_ACL_MSG, dentry, mnt);
72265+ return -EACCES;
72266+ }
72267+
72268+skip_check:
72269+
72270+ obj = chk_obj_label(dentry, mnt, task->acl);
72271+ retmode = obj->mode & (GR_INHERIT | GR_AUDIT_INHERIT);
72272+
72273+ if (!(task->acl->mode & GR_INHERITLEARN) &&
72274+ ((newacl->mode & GR_LEARN) || !(retmode & GR_INHERIT))) {
72275+ if (obj->nested)
72276+ task->acl = obj->nested;
72277+ else
72278+ task->acl = newacl;
72279+ task->inherited = 0;
72280+ } else {
72281+ task->inherited = 1;
72282+ if (retmode & GR_INHERIT && retmode & GR_AUDIT_INHERIT)
72283+ gr_log_str_fs(GR_DO_AUDIT, GR_INHERIT_ACL_MSG, task->acl->filename, dentry, mnt);
72284+ }
72285+
72286+ task->is_writable = 0;
72287+
72288+ /* ignore additional mmap checks for processes that are writable
72289+ by the default ACL */
72290+ obj = chk_obj_label(dentry, mnt, running_polstate.default_role->root_label);
72291+ if (unlikely(obj->mode & GR_WRITE))
72292+ task->is_writable = 1;
72293+ obj = chk_obj_label(dentry, mnt, task->role->root_label);
72294+ if (unlikely(obj->mode & GR_WRITE))
72295+ task->is_writable = 1;
72296+
72297+ gr_set_proc_res(task);
72298+
72299+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
72300+ 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);
72301+#endif
72302+ return 0;
72303+}
72304+
72305+/* always called with valid inodev ptr */
72306+static void
72307+do_handle_delete(struct inodev_entry *inodev, const u64 ino, const dev_t dev)
72308+{
72309+ struct acl_object_label *matchpo;
72310+ struct acl_subject_label *matchps;
72311+ struct acl_subject_label *subj;
72312+ struct acl_role_label *role;
72313+ unsigned int x;
72314+
72315+ FOR_EACH_ROLE_START(role)
72316+ FOR_EACH_SUBJECT_START(role, subj, x)
72317+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
72318+ matchpo->mode |= GR_DELETED;
72319+ FOR_EACH_SUBJECT_END(subj,x)
72320+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
72321+ /* nested subjects aren't in the role's subj_hash table */
72322+ if ((matchpo = lookup_acl_obj_label(ino, dev, subj)) != NULL)
72323+ matchpo->mode |= GR_DELETED;
72324+ FOR_EACH_NESTED_SUBJECT_END(subj)
72325+ if ((matchps = lookup_acl_subj_label(ino, dev, role)) != NULL)
72326+ matchps->mode |= GR_DELETED;
72327+ FOR_EACH_ROLE_END(role)
72328+
72329+ inodev->nentry->deleted = 1;
72330+
72331+ return;
72332+}
72333+
72334+void
72335+gr_handle_delete(const u64 ino, const dev_t dev)
72336+{
72337+ struct inodev_entry *inodev;
72338+
72339+ if (unlikely(!(gr_status & GR_READY)))
72340+ return;
72341+
72342+ write_lock(&gr_inode_lock);
72343+ inodev = lookup_inodev_entry(ino, dev);
72344+ if (inodev != NULL)
72345+ do_handle_delete(inodev, ino, dev);
72346+ write_unlock(&gr_inode_lock);
72347+
72348+ return;
72349+}
72350+
72351+static void
72352+update_acl_obj_label(const u64 oldinode, const dev_t olddevice,
72353+ const u64 newinode, const dev_t newdevice,
72354+ struct acl_subject_label *subj)
72355+{
72356+ unsigned int index = gr_fhash(oldinode, olddevice, subj->obj_hash_size);
72357+ struct acl_object_label *match;
72358+
72359+ match = subj->obj_hash[index];
72360+
72361+ while (match && (match->inode != oldinode ||
72362+ match->device != olddevice ||
72363+ !(match->mode & GR_DELETED)))
72364+ match = match->next;
72365+
72366+ if (match && (match->inode == oldinode)
72367+ && (match->device == olddevice)
72368+ && (match->mode & GR_DELETED)) {
72369+ if (match->prev == NULL) {
72370+ subj->obj_hash[index] = match->next;
72371+ if (match->next != NULL)
72372+ match->next->prev = NULL;
72373+ } else {
72374+ match->prev->next = match->next;
72375+ if (match->next != NULL)
72376+ match->next->prev = match->prev;
72377+ }
72378+ match->prev = NULL;
72379+ match->next = NULL;
72380+ match->inode = newinode;
72381+ match->device = newdevice;
72382+ match->mode &= ~GR_DELETED;
72383+
72384+ insert_acl_obj_label(match, subj);
72385+ }
72386+
72387+ return;
72388+}
72389+
72390+static void
72391+update_acl_subj_label(const u64 oldinode, const dev_t olddevice,
72392+ const u64 newinode, const dev_t newdevice,
72393+ struct acl_role_label *role)
72394+{
72395+ unsigned int index = gr_fhash(oldinode, olddevice, role->subj_hash_size);
72396+ struct acl_subject_label *match;
72397+
72398+ match = role->subj_hash[index];
72399+
72400+ while (match && (match->inode != oldinode ||
72401+ match->device != olddevice ||
72402+ !(match->mode & GR_DELETED)))
72403+ match = match->next;
72404+
72405+ if (match && (match->inode == oldinode)
72406+ && (match->device == olddevice)
72407+ && (match->mode & GR_DELETED)) {
72408+ if (match->prev == NULL) {
72409+ role->subj_hash[index] = match->next;
72410+ if (match->next != NULL)
72411+ match->next->prev = NULL;
72412+ } else {
72413+ match->prev->next = match->next;
72414+ if (match->next != NULL)
72415+ match->next->prev = match->prev;
72416+ }
72417+ match->prev = NULL;
72418+ match->next = NULL;
72419+ match->inode = newinode;
72420+ match->device = newdevice;
72421+ match->mode &= ~GR_DELETED;
72422+
72423+ insert_acl_subj_label(match, role);
72424+ }
72425+
72426+ return;
72427+}
72428+
72429+static void
72430+update_inodev_entry(const u64 oldinode, const dev_t olddevice,
72431+ const u64 newinode, const dev_t newdevice)
72432+{
72433+ unsigned int index = gr_fhash(oldinode, olddevice, running_polstate.inodev_set.i_size);
72434+ struct inodev_entry *match;
72435+
72436+ match = running_polstate.inodev_set.i_hash[index];
72437+
72438+ while (match && (match->nentry->inode != oldinode ||
72439+ match->nentry->device != olddevice || !match->nentry->deleted))
72440+ match = match->next;
72441+
72442+ if (match && (match->nentry->inode == oldinode)
72443+ && (match->nentry->device == olddevice) &&
72444+ match->nentry->deleted) {
72445+ if (match->prev == NULL) {
72446+ running_polstate.inodev_set.i_hash[index] = match->next;
72447+ if (match->next != NULL)
72448+ match->next->prev = NULL;
72449+ } else {
72450+ match->prev->next = match->next;
72451+ if (match->next != NULL)
72452+ match->next->prev = match->prev;
72453+ }
72454+ match->prev = NULL;
72455+ match->next = NULL;
72456+ match->nentry->inode = newinode;
72457+ match->nentry->device = newdevice;
72458+ match->nentry->deleted = 0;
72459+
72460+ insert_inodev_entry(match);
72461+ }
72462+
72463+ return;
72464+}
72465+
72466+static void
72467+__do_handle_create(const struct name_entry *matchn, u64 ino, dev_t dev)
72468+{
72469+ struct acl_subject_label *subj;
72470+ struct acl_role_label *role;
72471+ unsigned int x;
72472+
72473+ FOR_EACH_ROLE_START(role)
72474+ update_acl_subj_label(matchn->inode, matchn->device, ino, dev, role);
72475+
72476+ FOR_EACH_NESTED_SUBJECT_START(role, subj)
72477+ if ((subj->inode == ino) && (subj->device == dev)) {
72478+ subj->inode = ino;
72479+ subj->device = dev;
72480+ }
72481+ /* nested subjects aren't in the role's subj_hash table */
72482+ update_acl_obj_label(matchn->inode, matchn->device,
72483+ ino, dev, subj);
72484+ FOR_EACH_NESTED_SUBJECT_END(subj)
72485+ FOR_EACH_SUBJECT_START(role, subj, x)
72486+ update_acl_obj_label(matchn->inode, matchn->device,
72487+ ino, dev, subj);
72488+ FOR_EACH_SUBJECT_END(subj,x)
72489+ FOR_EACH_ROLE_END(role)
72490+
72491+ update_inodev_entry(matchn->inode, matchn->device, ino, dev);
72492+
72493+ return;
72494+}
72495+
72496+static void
72497+do_handle_create(const struct name_entry *matchn, const struct dentry *dentry,
72498+ const struct vfsmount *mnt)
72499+{
72500+ u64 ino = __get_ino(dentry);
72501+ dev_t dev = __get_dev(dentry);
72502+
72503+ __do_handle_create(matchn, ino, dev);
72504+
72505+ return;
72506+}
72507+
72508+void
72509+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
72510+{
72511+ struct name_entry *matchn;
72512+
72513+ if (unlikely(!(gr_status & GR_READY)))
72514+ return;
72515+
72516+ preempt_disable();
72517+ matchn = lookup_name_entry(gr_to_filename_rbac(dentry, mnt));
72518+
72519+ if (unlikely((unsigned long)matchn)) {
72520+ write_lock(&gr_inode_lock);
72521+ do_handle_create(matchn, dentry, mnt);
72522+ write_unlock(&gr_inode_lock);
72523+ }
72524+ preempt_enable();
72525+
72526+ return;
72527+}
72528+
72529+void
72530+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
72531+{
72532+ struct name_entry *matchn;
72533+
72534+ if (unlikely(!(gr_status & GR_READY)))
72535+ return;
72536+
72537+ preempt_disable();
72538+ matchn = lookup_name_entry(gr_to_proc_filename_rbac(dentry, init_pid_ns.proc_mnt));
72539+
72540+ if (unlikely((unsigned long)matchn)) {
72541+ write_lock(&gr_inode_lock);
72542+ __do_handle_create(matchn, inode->i_ino, inode->i_sb->s_dev);
72543+ write_unlock(&gr_inode_lock);
72544+ }
72545+ preempt_enable();
72546+
72547+ return;
72548+}
72549+
72550+void
72551+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
72552+ struct dentry *old_dentry,
72553+ struct dentry *new_dentry,
72554+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
72555+{
72556+ struct name_entry *matchn;
72557+ struct name_entry *matchn2 = NULL;
72558+ struct inodev_entry *inodev;
72559+ struct inode *inode = new_dentry->d_inode;
72560+ u64 old_ino = __get_ino(old_dentry);
72561+ dev_t old_dev = __get_dev(old_dentry);
72562+ unsigned int exchange = flags & RENAME_EXCHANGE;
72563+
72564+ /* vfs_rename swaps the name and parent link for old_dentry and
72565+ new_dentry
72566+ at this point, old_dentry has the new name, parent link, and inode
72567+ for the renamed file
72568+ if a file is being replaced by a rename, new_dentry has the inode
72569+ and name for the replaced file
72570+ */
72571+
72572+ if (unlikely(!(gr_status & GR_READY)))
72573+ return;
72574+
72575+ preempt_disable();
72576+ matchn = lookup_name_entry(gr_to_filename_rbac(old_dentry, mnt));
72577+
72578+ /* exchange cases:
72579+ a filename exists for the source, but not dest
72580+ do a recreate on source
72581+ a filename exists for the dest, but not source
72582+ do a recreate on dest
72583+ a filename exists for both source and dest
72584+ delete source and dest, then create source and dest
72585+ a filename exists for neither source nor dest
72586+ no updates needed
72587+
72588+ the name entry lookups get us the old inode/dev associated with
72589+ each name, so do the deletes first (if possible) so that when
72590+ we do the create, we pick up on the right entries
72591+ */
72592+
72593+ if (exchange)
72594+ matchn2 = lookup_name_entry(gr_to_filename_rbac(new_dentry, mnt));
72595+
72596+ /* we wouldn't have to check d_inode if it weren't for
72597+ NFS silly-renaming
72598+ */
72599+
72600+ write_lock(&gr_inode_lock);
72601+ if (unlikely((replace || exchange) && inode)) {
72602+ u64 new_ino = __get_ino(new_dentry);
72603+ dev_t new_dev = __get_dev(new_dentry);
72604+
72605+ inodev = lookup_inodev_entry(new_ino, new_dev);
72606+ if (inodev != NULL && ((inode->i_nlink <= 1) || S_ISDIR(inode->i_mode)))
72607+ do_handle_delete(inodev, new_ino, new_dev);
72608+ }
72609+
72610+ inodev = lookup_inodev_entry(old_ino, old_dev);
72611+ if (inodev != NULL && ((old_dentry->d_inode->i_nlink <= 1) || S_ISDIR(old_dentry->d_inode->i_mode)))
72612+ do_handle_delete(inodev, old_ino, old_dev);
72613+
72614+ if (unlikely(matchn != NULL))
72615+ do_handle_create(matchn, old_dentry, mnt);
72616+
72617+ if (unlikely(matchn2 != NULL))
72618+ do_handle_create(matchn2, new_dentry, mnt);
72619+
72620+ write_unlock(&gr_inode_lock);
72621+ preempt_enable();
72622+
72623+ return;
72624+}
72625+
72626+#if defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC)
72627+static const unsigned long res_learn_bumps[GR_NLIMITS] = {
72628+ [RLIMIT_CPU] = GR_RLIM_CPU_BUMP,
72629+ [RLIMIT_FSIZE] = GR_RLIM_FSIZE_BUMP,
72630+ [RLIMIT_DATA] = GR_RLIM_DATA_BUMP,
72631+ [RLIMIT_STACK] = GR_RLIM_STACK_BUMP,
72632+ [RLIMIT_CORE] = GR_RLIM_CORE_BUMP,
72633+ [RLIMIT_RSS] = GR_RLIM_RSS_BUMP,
72634+ [RLIMIT_NPROC] = GR_RLIM_NPROC_BUMP,
72635+ [RLIMIT_NOFILE] = GR_RLIM_NOFILE_BUMP,
72636+ [RLIMIT_MEMLOCK] = GR_RLIM_MEMLOCK_BUMP,
72637+ [RLIMIT_AS] = GR_RLIM_AS_BUMP,
72638+ [RLIMIT_LOCKS] = GR_RLIM_LOCKS_BUMP,
72639+ [RLIMIT_SIGPENDING] = GR_RLIM_SIGPENDING_BUMP,
72640+ [RLIMIT_MSGQUEUE] = GR_RLIM_MSGQUEUE_BUMP,
72641+ [RLIMIT_NICE] = GR_RLIM_NICE_BUMP,
72642+ [RLIMIT_RTPRIO] = GR_RLIM_RTPRIO_BUMP,
72643+ [RLIMIT_RTTIME] = GR_RLIM_RTTIME_BUMP
72644+};
72645+
72646+void
72647+gr_learn_resource(const struct task_struct *task,
72648+ const int res, const unsigned long wanted, const int gt)
72649+{
72650+ struct acl_subject_label *acl;
72651+ const struct cred *cred;
72652+
72653+ if (unlikely((gr_status & GR_READY) &&
72654+ task->acl && (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))))
72655+ goto skip_reslog;
72656+
72657+ gr_log_resource(task, res, wanted, gt);
72658+skip_reslog:
72659+
72660+ if (unlikely(!(gr_status & GR_READY) || !wanted || res >= GR_NLIMITS))
72661+ return;
72662+
72663+ acl = task->acl;
72664+
72665+ if (likely(!acl || !(acl->mode & (GR_LEARN | GR_INHERITLEARN)) ||
72666+ !(acl->resmask & (1U << (unsigned short) res))))
72667+ return;
72668+
72669+ if (wanted >= acl->res[res].rlim_cur) {
72670+ unsigned long res_add;
72671+
72672+ res_add = wanted + res_learn_bumps[res];
72673+
72674+ acl->res[res].rlim_cur = res_add;
72675+
72676+ if (wanted > acl->res[res].rlim_max)
72677+ acl->res[res].rlim_max = res_add;
72678+
72679+ /* only log the subject filename, since resource logging is supported for
72680+ single-subject learning only */
72681+ rcu_read_lock();
72682+ cred = __task_cred(task);
72683+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
72684+ task->role->roletype, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid), acl->filename,
72685+ acl->filename, acl->res[res].rlim_cur, acl->res[res].rlim_max,
72686+ "", (unsigned long) res, &task->signal->saved_ip);
72687+ rcu_read_unlock();
72688+ }
72689+
72690+ return;
72691+}
72692+EXPORT_SYMBOL_GPL(gr_learn_resource);
72693+#endif
72694+
72695+#if defined(CONFIG_PAX_HAVE_ACL_FLAGS) && (defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR))
72696+void
72697+pax_set_initial_flags(struct linux_binprm *bprm)
72698+{
72699+ struct task_struct *task = current;
72700+ struct acl_subject_label *proc;
72701+ unsigned long flags;
72702+
72703+ if (unlikely(!(gr_status & GR_READY)))
72704+ return;
72705+
72706+ flags = pax_get_flags(task);
72707+
72708+ proc = task->acl;
72709+
72710+ if (proc->pax_flags & GR_PAX_DISABLE_PAGEEXEC)
72711+ flags &= ~MF_PAX_PAGEEXEC;
72712+ if (proc->pax_flags & GR_PAX_DISABLE_SEGMEXEC)
72713+ flags &= ~MF_PAX_SEGMEXEC;
72714+ if (proc->pax_flags & GR_PAX_DISABLE_RANDMMAP)
72715+ flags &= ~MF_PAX_RANDMMAP;
72716+ if (proc->pax_flags & GR_PAX_DISABLE_EMUTRAMP)
72717+ flags &= ~MF_PAX_EMUTRAMP;
72718+ if (proc->pax_flags & GR_PAX_DISABLE_MPROTECT)
72719+ flags &= ~MF_PAX_MPROTECT;
72720+
72721+ if (proc->pax_flags & GR_PAX_ENABLE_PAGEEXEC)
72722+ flags |= MF_PAX_PAGEEXEC;
72723+ if (proc->pax_flags & GR_PAX_ENABLE_SEGMEXEC)
72724+ flags |= MF_PAX_SEGMEXEC;
72725+ if (proc->pax_flags & GR_PAX_ENABLE_RANDMMAP)
72726+ flags |= MF_PAX_RANDMMAP;
72727+ if (proc->pax_flags & GR_PAX_ENABLE_EMUTRAMP)
72728+ flags |= MF_PAX_EMUTRAMP;
72729+ if (proc->pax_flags & GR_PAX_ENABLE_MPROTECT)
72730+ flags |= MF_PAX_MPROTECT;
72731+
72732+ pax_set_flags(task, flags);
72733+
72734+ return;
72735+}
72736+#endif
72737+
72738+int
72739+gr_handle_proc_ptrace(struct task_struct *task)
72740+{
72741+ struct file *filp;
72742+ struct task_struct *tmp = task;
72743+ struct task_struct *curtemp = current;
72744+ __u32 retmode;
72745+
72746+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
72747+ if (unlikely(!(gr_status & GR_READY)))
72748+ return 0;
72749+#endif
72750+
72751+ read_lock(&tasklist_lock);
72752+ read_lock(&grsec_exec_file_lock);
72753+ filp = task->exec_file;
72754+
72755+ while (task_pid_nr(tmp) > 0) {
72756+ if (tmp == curtemp)
72757+ break;
72758+ tmp = tmp->real_parent;
72759+ }
72760+
72761+ if (!filp || (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
72762+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE))))) {
72763+ read_unlock(&grsec_exec_file_lock);
72764+ read_unlock(&tasklist_lock);
72765+ return 1;
72766+ }
72767+
72768+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
72769+ if (!(gr_status & GR_READY)) {
72770+ read_unlock(&grsec_exec_file_lock);
72771+ read_unlock(&tasklist_lock);
72772+ return 0;
72773+ }
72774+#endif
72775+
72776+ retmode = gr_search_file(filp->f_path.dentry, GR_NOPTRACE, filp->f_path.mnt);
72777+ read_unlock(&grsec_exec_file_lock);
72778+ read_unlock(&tasklist_lock);
72779+
72780+ if (retmode & GR_NOPTRACE)
72781+ return 1;
72782+
72783+ if (!(current->acl->mode & GR_POVERRIDE) && !(current->role->roletype & GR_ROLE_GOD)
72784+ && (current->acl != task->acl || (current->acl != current->role->root_label
72785+ && task_pid_nr(current) != task_pid_nr(task))))
72786+ return 1;
72787+
72788+ return 0;
72789+}
72790+
72791+void task_grsec_rbac(struct seq_file *m, struct task_struct *p)
72792+{
72793+ if (unlikely(!(gr_status & GR_READY)))
72794+ return;
72795+
72796+ if (!(current->role->roletype & GR_ROLE_GOD))
72797+ return;
72798+
72799+ seq_printf(m, "RBAC:\t%.64s:%c:%.950s\n",
72800+ p->role->rolename, gr_task_roletype_to_char(p),
72801+ p->acl->filename);
72802+}
72803+
72804+int
72805+gr_handle_ptrace(struct task_struct *task, const long request)
72806+{
72807+ struct task_struct *tmp = task;
72808+ struct task_struct *curtemp = current;
72809+ __u32 retmode;
72810+
72811+#ifndef CONFIG_GRKERNSEC_HARDEN_PTRACE
72812+ if (unlikely(!(gr_status & GR_READY)))
72813+ return 0;
72814+#endif
72815+ if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
72816+ read_lock(&tasklist_lock);
72817+ while (task_pid_nr(tmp) > 0) {
72818+ if (tmp == curtemp)
72819+ break;
72820+ tmp = tmp->real_parent;
72821+ }
72822+
72823+ if (task_pid_nr(tmp) == 0 && ((grsec_enable_harden_ptrace && gr_is_global_nonroot(current_uid()) && !(gr_status & GR_READY)) ||
72824+ ((gr_status & GR_READY) && !(current->acl->mode & GR_RELAXPTRACE)))) {
72825+ read_unlock(&tasklist_lock);
72826+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
72827+ return 1;
72828+ }
72829+ read_unlock(&tasklist_lock);
72830+ }
72831+
72832+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
72833+ if (!(gr_status & GR_READY))
72834+ return 0;
72835+#endif
72836+
72837+ read_lock(&grsec_exec_file_lock);
72838+ if (unlikely(!task->exec_file)) {
72839+ read_unlock(&grsec_exec_file_lock);
72840+ return 0;
72841+ }
72842+
72843+ retmode = gr_search_file(task->exec_file->f_path.dentry, GR_PTRACERD | GR_NOPTRACE, task->exec_file->f_path.mnt);
72844+ read_unlock(&grsec_exec_file_lock);
72845+
72846+ if (retmode & GR_NOPTRACE) {
72847+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
72848+ return 1;
72849+ }
72850+
72851+ if (retmode & GR_PTRACERD) {
72852+ switch (request) {
72853+ case PTRACE_SEIZE:
72854+ case PTRACE_POKETEXT:
72855+ case PTRACE_POKEDATA:
72856+ case PTRACE_POKEUSR:
72857+#if !defined(CONFIG_PPC32) && !defined(CONFIG_PPC64) && !defined(CONFIG_PARISC) && !defined(CONFIG_ALPHA) && !defined(CONFIG_IA64)
72858+ case PTRACE_SETREGS:
72859+ case PTRACE_SETFPREGS:
72860+#endif
72861+#ifdef CONFIG_X86
72862+ case PTRACE_SETFPXREGS:
72863+#endif
72864+#ifdef CONFIG_ALTIVEC
72865+ case PTRACE_SETVRREGS:
72866+#endif
72867+ return 1;
72868+ default:
72869+ return 0;
72870+ }
72871+ } else if (!(current->acl->mode & GR_POVERRIDE) &&
72872+ !(current->role->roletype & GR_ROLE_GOD) &&
72873+ (current->acl != task->acl)) {
72874+ gr_log_ptrace(GR_DONT_AUDIT, GR_PTRACE_ACL_MSG, task);
72875+ return 1;
72876+ }
72877+
72878+ return 0;
72879+}
72880+
72881+static int is_writable_mmap(const struct file *filp)
72882+{
72883+ struct task_struct *task = current;
72884+ struct acl_object_label *obj, *obj2;
72885+
72886+ if (gr_status & GR_READY && !(task->acl->mode & GR_OVERRIDE) &&
72887+ !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))) {
72888+ obj = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt, running_polstate.default_role->root_label);
72889+ obj2 = chk_obj_label(filp->f_path.dentry, filp->f_path.mnt,
72890+ task->role->root_label);
72891+ if (unlikely((obj->mode & GR_WRITE) || (obj2->mode & GR_WRITE))) {
72892+ gr_log_fs_generic(GR_DONT_AUDIT, GR_WRITLIB_ACL_MSG, filp->f_path.dentry, filp->f_path.mnt);
72893+ return 1;
72894+ }
72895+ }
72896+ return 0;
72897+}
72898+
72899+int
72900+gr_acl_handle_mmap(const struct file *file, const unsigned long prot)
72901+{
72902+ __u32 mode;
72903+
72904+ if (unlikely(!file || !(prot & PROT_EXEC)))
72905+ return 1;
72906+
72907+ if (is_writable_mmap(file))
72908+ return 0;
72909+
72910+ mode =
72911+ gr_search_file(file->f_path.dentry,
72912+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
72913+ file->f_path.mnt);
72914+
72915+ if (!gr_tpe_allow(file))
72916+ return 0;
72917+
72918+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
72919+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
72920+ return 0;
72921+ } else if (unlikely(!(mode & GR_EXEC))) {
72922+ return 0;
72923+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
72924+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MMAP_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
72925+ return 1;
72926+ }
72927+
72928+ return 1;
72929+}
72930+
72931+int
72932+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
72933+{
72934+ __u32 mode;
72935+
72936+ if (unlikely(!file || !(prot & PROT_EXEC)))
72937+ return 1;
72938+
72939+ if (is_writable_mmap(file))
72940+ return 0;
72941+
72942+ mode =
72943+ gr_search_file(file->f_path.dentry,
72944+ GR_EXEC | GR_AUDIT_EXEC | GR_SUPPRESS,
72945+ file->f_path.mnt);
72946+
72947+ if (!gr_tpe_allow(file))
72948+ return 0;
72949+
72950+ if (unlikely(!(mode & GR_EXEC) && !(mode & GR_SUPPRESS))) {
72951+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
72952+ return 0;
72953+ } else if (unlikely(!(mode & GR_EXEC))) {
72954+ return 0;
72955+ } else if (unlikely(mode & GR_EXEC && mode & GR_AUDIT_EXEC)) {
72956+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_MPROTECT_ACL_MSG, file->f_path.dentry, file->f_path.mnt);
72957+ return 1;
72958+ }
72959+
72960+ return 1;
72961+}
72962+
72963+void
72964+gr_acl_handle_psacct(struct task_struct *task, const long code)
72965+{
72966+ unsigned long runtime, cputime;
72967+ cputime_t utime, stime;
72968+ unsigned int wday, cday;
72969+ __u8 whr, chr;
72970+ __u8 wmin, cmin;
72971+ __u8 wsec, csec;
72972+ struct timespec curtime, starttime;
72973+
72974+ if (unlikely(!(gr_status & GR_READY) || !task->acl ||
72975+ !(task->acl->mode & GR_PROCACCT)))
72976+ return;
72977+
72978+ curtime = ns_to_timespec(ktime_get_ns());
72979+ starttime = ns_to_timespec(task->start_time);
72980+ runtime = curtime.tv_sec - starttime.tv_sec;
72981+ wday = runtime / (60 * 60 * 24);
72982+ runtime -= wday * (60 * 60 * 24);
72983+ whr = runtime / (60 * 60);
72984+ runtime -= whr * (60 * 60);
72985+ wmin = runtime / 60;
72986+ runtime -= wmin * 60;
72987+ wsec = runtime;
72988+
72989+ task_cputime(task, &utime, &stime);
72990+ cputime = cputime_to_secs(utime + stime);
72991+ cday = cputime / (60 * 60 * 24);
72992+ cputime -= cday * (60 * 60 * 24);
72993+ chr = cputime / (60 * 60);
72994+ cputime -= chr * (60 * 60);
72995+ cmin = cputime / 60;
72996+ cputime -= cmin * 60;
72997+ csec = cputime;
72998+
72999+ gr_log_procacct(GR_DO_AUDIT, GR_ACL_PROCACCT_MSG, task, wday, whr, wmin, wsec, cday, chr, cmin, csec, code);
73000+
73001+ return;
73002+}
73003+
73004+#ifdef CONFIG_TASKSTATS
73005+int gr_is_taskstats_denied(int pid)
73006+{
73007+ struct task_struct *task;
73008+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
73009+ const struct cred *cred;
73010+#endif
73011+ int ret = 0;
73012+
73013+ /* restrict taskstats viewing to un-chrooted root users
73014+ who have the 'view' subject flag if the RBAC system is enabled
73015+ */
73016+
73017+ rcu_read_lock();
73018+ read_lock(&tasklist_lock);
73019+ task = find_task_by_vpid(pid);
73020+ if (task) {
73021+#ifdef CONFIG_GRKERNSEC_CHROOT
73022+ if (proc_is_chrooted(task))
73023+ ret = -EACCES;
73024+#endif
73025+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
73026+ cred = __task_cred(task);
73027+#ifdef CONFIG_GRKERNSEC_PROC_USER
73028+ if (gr_is_global_nonroot(cred->uid))
73029+ ret = -EACCES;
73030+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
73031+ if (gr_is_global_nonroot(cred->uid) && !groups_search(cred->group_info, grsec_proc_gid))
73032+ ret = -EACCES;
73033+#endif
73034+#endif
73035+ if (gr_status & GR_READY) {
73036+ if (!(task->acl->mode & GR_VIEW))
73037+ ret = -EACCES;
73038+ }
73039+ } else
73040+ ret = -ENOENT;
73041+
73042+ read_unlock(&tasklist_lock);
73043+ rcu_read_unlock();
73044+
73045+ return ret;
73046+}
73047+#endif
73048+
73049+/* AUXV entries are filled via a descendant of search_binary_handler
73050+ after we've already applied the subject for the target
73051+*/
73052+int gr_acl_enable_at_secure(void)
73053+{
73054+ if (unlikely(!(gr_status & GR_READY)))
73055+ return 0;
73056+
73057+ if (current->acl->mode & GR_ATSECURE)
73058+ return 1;
73059+
73060+ return 0;
73061+}
73062+
73063+int gr_acl_handle_filldir(const struct file *file, const char *name, const unsigned int namelen, const u64 ino)
73064+{
73065+ struct task_struct *task = current;
73066+ struct dentry *dentry = file->f_path.dentry;
73067+ struct vfsmount *mnt = file->f_path.mnt;
73068+ struct acl_object_label *obj, *tmp;
73069+ struct acl_subject_label *subj;
73070+ unsigned int bufsize;
73071+ int is_not_root;
73072+ char *path;
73073+ dev_t dev = __get_dev(dentry);
73074+
73075+ if (unlikely(!(gr_status & GR_READY)))
73076+ return 1;
73077+
73078+ if (task->acl->mode & (GR_LEARN | GR_INHERITLEARN))
73079+ return 1;
73080+
73081+ /* ignore Eric Biederman */
73082+ if (IS_PRIVATE(dentry->d_inode))
73083+ return 1;
73084+
73085+ subj = task->acl;
73086+ read_lock(&gr_inode_lock);
73087+ do {
73088+ obj = lookup_acl_obj_label(ino, dev, subj);
73089+ if (obj != NULL) {
73090+ read_unlock(&gr_inode_lock);
73091+ return (obj->mode & GR_FIND) ? 1 : 0;
73092+ }
73093+ } while ((subj = subj->parent_subject));
73094+ read_unlock(&gr_inode_lock);
73095+
73096+ /* this is purely an optimization since we're looking for an object
73097+ for the directory we're doing a readdir on
73098+ if it's possible for any globbed object to match the entry we're
73099+ filling into the directory, then the object we find here will be
73100+ an anchor point with attached globbed objects
73101+ */
73102+ obj = chk_obj_label_noglob(dentry, mnt, task->acl);
73103+ if (obj->globbed == NULL)
73104+ return (obj->mode & GR_FIND) ? 1 : 0;
73105+
73106+ is_not_root = ((obj->filename[0] == '/') &&
73107+ (obj->filename[1] == '\0')) ? 0 : 1;
73108+ bufsize = PAGE_SIZE - namelen - is_not_root;
73109+
73110+ /* check bufsize > PAGE_SIZE || bufsize == 0 */
73111+ if (unlikely((bufsize - 1) > (PAGE_SIZE - 1)))
73112+ return 1;
73113+
73114+ preempt_disable();
73115+ path = d_real_path(dentry, mnt, per_cpu_ptr(gr_shared_page[0], smp_processor_id()),
73116+ bufsize);
73117+
73118+ bufsize = strlen(path);
73119+
73120+ /* if base is "/", don't append an additional slash */
73121+ if (is_not_root)
73122+ *(path + bufsize) = '/';
73123+ memcpy(path + bufsize + is_not_root, name, namelen);
73124+ *(path + bufsize + namelen + is_not_root) = '\0';
73125+
73126+ tmp = obj->globbed;
73127+ while (tmp) {
73128+ if (!glob_match(tmp->filename, path)) {
73129+ preempt_enable();
73130+ return (tmp->mode & GR_FIND) ? 1 : 0;
73131+ }
73132+ tmp = tmp->next;
73133+ }
73134+ preempt_enable();
73135+ return (obj->mode & GR_FIND) ? 1 : 0;
73136+}
73137+
73138+void gr_put_exec_file(struct task_struct *task)
73139+{
73140+ struct file *filp;
73141+
73142+ write_lock(&grsec_exec_file_lock);
73143+ filp = task->exec_file;
73144+ task->exec_file = NULL;
73145+ write_unlock(&grsec_exec_file_lock);
73146+
73147+ if (filp)
73148+ fput(filp);
73149+
73150+ return;
73151+}
73152+
73153+
73154+#ifdef CONFIG_NETFILTER_XT_MATCH_GRADM_MODULE
73155+EXPORT_SYMBOL_GPL(gr_acl_is_enabled);
73156+#endif
73157+#ifdef CONFIG_SECURITY
73158+EXPORT_SYMBOL_GPL(gr_check_user_change);
73159+EXPORT_SYMBOL_GPL(gr_check_group_change);
73160+#endif
73161+
73162diff --git a/grsecurity/gracl_alloc.c b/grsecurity/gracl_alloc.c
73163new file mode 100644
73164index 0000000..18ffbbd
73165--- /dev/null
73166+++ b/grsecurity/gracl_alloc.c
73167@@ -0,0 +1,105 @@
73168+#include <linux/kernel.h>
73169+#include <linux/mm.h>
73170+#include <linux/slab.h>
73171+#include <linux/vmalloc.h>
73172+#include <linux/gracl.h>
73173+#include <linux/grsecurity.h>
73174+
73175+static struct gr_alloc_state __current_alloc_state = { 1, 1, NULL };
73176+struct gr_alloc_state *current_alloc_state = &__current_alloc_state;
73177+
73178+static __inline__ int
73179+alloc_pop(void)
73180+{
73181+ if (current_alloc_state->alloc_stack_next == 1)
73182+ return 0;
73183+
73184+ kfree(current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 2]);
73185+
73186+ current_alloc_state->alloc_stack_next--;
73187+
73188+ return 1;
73189+}
73190+
73191+static __inline__ int
73192+alloc_push(void *buf)
73193+{
73194+ if (current_alloc_state->alloc_stack_next >= current_alloc_state->alloc_stack_size)
73195+ return 1;
73196+
73197+ current_alloc_state->alloc_stack[current_alloc_state->alloc_stack_next - 1] = buf;
73198+
73199+ current_alloc_state->alloc_stack_next++;
73200+
73201+ return 0;
73202+}
73203+
73204+void *
73205+acl_alloc(unsigned long len)
73206+{
73207+ void *ret = NULL;
73208+
73209+ if (!len || len > PAGE_SIZE)
73210+ goto out;
73211+
73212+ ret = kmalloc(len, GFP_KERNEL);
73213+
73214+ if (ret) {
73215+ if (alloc_push(ret)) {
73216+ kfree(ret);
73217+ ret = NULL;
73218+ }
73219+ }
73220+
73221+out:
73222+ return ret;
73223+}
73224+
73225+void *
73226+acl_alloc_num(unsigned long num, unsigned long len)
73227+{
73228+ if (!len || (num > (PAGE_SIZE / len)))
73229+ return NULL;
73230+
73231+ return acl_alloc(num * len);
73232+}
73233+
73234+void
73235+acl_free_all(void)
73236+{
73237+ if (!current_alloc_state->alloc_stack)
73238+ return;
73239+
73240+ while (alloc_pop()) ;
73241+
73242+ if (current_alloc_state->alloc_stack) {
73243+ if ((current_alloc_state->alloc_stack_size * sizeof (void *)) <= PAGE_SIZE)
73244+ kfree(current_alloc_state->alloc_stack);
73245+ else
73246+ vfree(current_alloc_state->alloc_stack);
73247+ }
73248+
73249+ current_alloc_state->alloc_stack = NULL;
73250+ current_alloc_state->alloc_stack_size = 1;
73251+ current_alloc_state->alloc_stack_next = 1;
73252+
73253+ return;
73254+}
73255+
73256+int
73257+acl_alloc_stack_init(unsigned long size)
73258+{
73259+ if ((size * sizeof (void *)) <= PAGE_SIZE)
73260+ current_alloc_state->alloc_stack =
73261+ (void **) kmalloc(size * sizeof (void *), GFP_KERNEL);
73262+ else
73263+ current_alloc_state->alloc_stack = (void **) vmalloc(size * sizeof (void *));
73264+
73265+ current_alloc_state->alloc_stack_size = size;
73266+ current_alloc_state->alloc_stack_next = 1;
73267+
73268+ if (!current_alloc_state->alloc_stack)
73269+ return 0;
73270+ else
73271+ return 1;
73272+}
73273diff --git a/grsecurity/gracl_cap.c b/grsecurity/gracl_cap.c
73274new file mode 100644
73275index 0000000..1a94c11
73276--- /dev/null
73277+++ b/grsecurity/gracl_cap.c
73278@@ -0,0 +1,127 @@
73279+#include <linux/kernel.h>
73280+#include <linux/module.h>
73281+#include <linux/sched.h>
73282+#include <linux/gracl.h>
73283+#include <linux/grsecurity.h>
73284+#include <linux/grinternal.h>
73285+
73286+extern const char *captab_log[];
73287+extern int captab_log_entries;
73288+
73289+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
73290+{
73291+ struct acl_subject_label *curracl;
73292+
73293+ if (!gr_acl_is_enabled())
73294+ return 1;
73295+
73296+ curracl = task->acl;
73297+
73298+ if (curracl->mode & (GR_LEARN | GR_INHERITLEARN)) {
73299+ security_learn(GR_LEARN_AUDIT_MSG, task->role->rolename,
73300+ task->role->roletype, GR_GLOBAL_UID(cred->uid),
73301+ GR_GLOBAL_GID(cred->gid), task->exec_file ?
73302+ gr_to_filename(task->exec_file->f_path.dentry,
73303+ task->exec_file->f_path.mnt) : curracl->filename,
73304+ curracl->filename, 0UL,
73305+ 0UL, "", (unsigned long) cap, &task->signal->saved_ip);
73306+ return 1;
73307+ }
73308+
73309+ return 0;
73310+}
73311+
73312+int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
73313+{
73314+ struct acl_subject_label *curracl;
73315+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
73316+ kernel_cap_t cap_audit = __cap_empty_set;
73317+
73318+ if (!gr_acl_is_enabled())
73319+ return 1;
73320+
73321+ curracl = task->acl;
73322+
73323+ cap_drop = curracl->cap_lower;
73324+ cap_mask = curracl->cap_mask;
73325+ cap_audit = curracl->cap_invert_audit;
73326+
73327+ while ((curracl = curracl->parent_subject)) {
73328+ /* if the cap isn't specified in the current computed mask but is specified in the
73329+ current level subject, and is lowered in the current level subject, then add
73330+ it to the set of dropped capabilities
73331+ otherwise, add the current level subject's mask to the current computed mask
73332+ */
73333+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
73334+ cap_raise(cap_mask, cap);
73335+ if (cap_raised(curracl->cap_lower, cap))
73336+ cap_raise(cap_drop, cap);
73337+ if (cap_raised(curracl->cap_invert_audit, cap))
73338+ cap_raise(cap_audit, cap);
73339+ }
73340+ }
73341+
73342+ if (!cap_raised(cap_drop, cap)) {
73343+ if (cap_raised(cap_audit, cap))
73344+ gr_log_cap(GR_DO_AUDIT, GR_CAP_ACL_MSG2, task, captab_log[cap]);
73345+ return 1;
73346+ }
73347+
73348+ /* only learn the capability use if the process has the capability in the
73349+ general case, the two uses in sys.c of gr_learn_cap are an exception
73350+ to this rule to ensure any role transition involves what the full-learned
73351+ policy believes in a privileged process
73352+ */
73353+ if (cap_raised(cred->cap_effective, cap) && gr_learn_cap(task, cred, cap))
73354+ return 1;
73355+
73356+ if ((cap >= 0) && (cap < captab_log_entries) && cap_raised(cred->cap_effective, cap) && !cap_raised(cap_audit, cap))
73357+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_ACL_MSG, task, captab_log[cap]);
73358+
73359+ return 0;
73360+}
73361+
73362+int
73363+gr_acl_is_capable(const int cap)
73364+{
73365+ return gr_task_acl_is_capable(current, current_cred(), cap);
73366+}
73367+
73368+int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap)
73369+{
73370+ struct acl_subject_label *curracl;
73371+ kernel_cap_t cap_drop = __cap_empty_set, cap_mask = __cap_empty_set;
73372+
73373+ if (!gr_acl_is_enabled())
73374+ return 1;
73375+
73376+ curracl = task->acl;
73377+
73378+ cap_drop = curracl->cap_lower;
73379+ cap_mask = curracl->cap_mask;
73380+
73381+ while ((curracl = curracl->parent_subject)) {
73382+ /* if the cap isn't specified in the current computed mask but is specified in the
73383+ current level subject, and is lowered in the current level subject, then add
73384+ it to the set of dropped capabilities
73385+ otherwise, add the current level subject's mask to the current computed mask
73386+ */
73387+ if (!cap_raised(cap_mask, cap) && cap_raised(curracl->cap_mask, cap)) {
73388+ cap_raise(cap_mask, cap);
73389+ if (cap_raised(curracl->cap_lower, cap))
73390+ cap_raise(cap_drop, cap);
73391+ }
73392+ }
73393+
73394+ if (!cap_raised(cap_drop, cap))
73395+ return 1;
73396+
73397+ return 0;
73398+}
73399+
73400+int
73401+gr_acl_is_capable_nolog(const int cap)
73402+{
73403+ return gr_task_acl_is_capable_nolog(current, cap);
73404+}
73405+
73406diff --git a/grsecurity/gracl_compat.c b/grsecurity/gracl_compat.c
73407new file mode 100644
73408index 0000000..a43dd06
73409--- /dev/null
73410+++ b/grsecurity/gracl_compat.c
73411@@ -0,0 +1,269 @@
73412+#include <linux/kernel.h>
73413+#include <linux/gracl.h>
73414+#include <linux/compat.h>
73415+#include <linux/gracl_compat.h>
73416+
73417+#include <asm/uaccess.h>
73418+
73419+int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap)
73420+{
73421+ struct gr_arg_wrapper_compat uwrapcompat;
73422+
73423+ if (copy_from_user(&uwrapcompat, buf, sizeof(uwrapcompat)))
73424+ return -EFAULT;
73425+
73426+ if ((uwrapcompat.version != GRSECURITY_VERSION) ||
73427+ (uwrapcompat.size != sizeof(struct gr_arg_compat)))
73428+ return -EINVAL;
73429+
73430+ uwrap->arg = compat_ptr(uwrapcompat.arg);
73431+ uwrap->version = uwrapcompat.version;
73432+ uwrap->size = sizeof(struct gr_arg);
73433+
73434+ return 0;
73435+}
73436+
73437+int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg)
73438+{
73439+ struct gr_arg_compat argcompat;
73440+
73441+ if (copy_from_user(&argcompat, buf, sizeof(argcompat)))
73442+ return -EFAULT;
73443+
73444+ arg->role_db.r_table = compat_ptr(argcompat.role_db.r_table);
73445+ arg->role_db.num_pointers = argcompat.role_db.num_pointers;
73446+ arg->role_db.num_roles = argcompat.role_db.num_roles;
73447+ arg->role_db.num_domain_children = argcompat.role_db.num_domain_children;
73448+ arg->role_db.num_subjects = argcompat.role_db.num_subjects;
73449+ arg->role_db.num_objects = argcompat.role_db.num_objects;
73450+
73451+ memcpy(&arg->pw, &argcompat.pw, sizeof(arg->pw));
73452+ memcpy(&arg->salt, &argcompat.salt, sizeof(arg->salt));
73453+ memcpy(&arg->sum, &argcompat.sum, sizeof(arg->sum));
73454+ memcpy(&arg->sp_role, &argcompat.sp_role, sizeof(arg->sp_role));
73455+ arg->sprole_pws = compat_ptr(argcompat.sprole_pws);
73456+ arg->segv_device = argcompat.segv_device;
73457+ arg->segv_inode = argcompat.segv_inode;
73458+ arg->segv_uid = argcompat.segv_uid;
73459+ arg->num_sprole_pws = argcompat.num_sprole_pws;
73460+ arg->mode = argcompat.mode;
73461+
73462+ return 0;
73463+}
73464+
73465+int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp)
73466+{
73467+ struct acl_object_label_compat objcompat;
73468+
73469+ if (copy_from_user(&objcompat, userp, sizeof(objcompat)))
73470+ return -EFAULT;
73471+
73472+ obj->filename = compat_ptr(objcompat.filename);
73473+ obj->inode = objcompat.inode;
73474+ obj->device = objcompat.device;
73475+ obj->mode = objcompat.mode;
73476+
73477+ obj->nested = compat_ptr(objcompat.nested);
73478+ obj->globbed = compat_ptr(objcompat.globbed);
73479+
73480+ obj->prev = compat_ptr(objcompat.prev);
73481+ obj->next = compat_ptr(objcompat.next);
73482+
73483+ return 0;
73484+}
73485+
73486+int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp)
73487+{
73488+ unsigned int i;
73489+ struct acl_subject_label_compat subjcompat;
73490+
73491+ if (copy_from_user(&subjcompat, userp, sizeof(subjcompat)))
73492+ return -EFAULT;
73493+
73494+ subj->filename = compat_ptr(subjcompat.filename);
73495+ subj->inode = subjcompat.inode;
73496+ subj->device = subjcompat.device;
73497+ subj->mode = subjcompat.mode;
73498+ subj->cap_mask = subjcompat.cap_mask;
73499+ subj->cap_lower = subjcompat.cap_lower;
73500+ subj->cap_invert_audit = subjcompat.cap_invert_audit;
73501+
73502+ for (i = 0; i < GR_NLIMITS; i++) {
73503+ if (subjcompat.res[i].rlim_cur == COMPAT_RLIM_INFINITY)
73504+ subj->res[i].rlim_cur = RLIM_INFINITY;
73505+ else
73506+ subj->res[i].rlim_cur = subjcompat.res[i].rlim_cur;
73507+ if (subjcompat.res[i].rlim_max == COMPAT_RLIM_INFINITY)
73508+ subj->res[i].rlim_max = RLIM_INFINITY;
73509+ else
73510+ subj->res[i].rlim_max = subjcompat.res[i].rlim_max;
73511+ }
73512+ subj->resmask = subjcompat.resmask;
73513+
73514+ subj->user_trans_type = subjcompat.user_trans_type;
73515+ subj->group_trans_type = subjcompat.group_trans_type;
73516+ subj->user_transitions = compat_ptr(subjcompat.user_transitions);
73517+ subj->group_transitions = compat_ptr(subjcompat.group_transitions);
73518+ subj->user_trans_num = subjcompat.user_trans_num;
73519+ subj->group_trans_num = subjcompat.group_trans_num;
73520+
73521+ memcpy(&subj->sock_families, &subjcompat.sock_families, sizeof(subj->sock_families));
73522+ memcpy(&subj->ip_proto, &subjcompat.ip_proto, sizeof(subj->ip_proto));
73523+ subj->ip_type = subjcompat.ip_type;
73524+ subj->ips = compat_ptr(subjcompat.ips);
73525+ subj->ip_num = subjcompat.ip_num;
73526+ subj->inaddr_any_override = subjcompat.inaddr_any_override;
73527+
73528+ subj->crashes = subjcompat.crashes;
73529+ subj->expires = subjcompat.expires;
73530+
73531+ subj->parent_subject = compat_ptr(subjcompat.parent_subject);
73532+ subj->hash = compat_ptr(subjcompat.hash);
73533+ subj->prev = compat_ptr(subjcompat.prev);
73534+ subj->next = compat_ptr(subjcompat.next);
73535+
73536+ subj->obj_hash = compat_ptr(subjcompat.obj_hash);
73537+ subj->obj_hash_size = subjcompat.obj_hash_size;
73538+ subj->pax_flags = subjcompat.pax_flags;
73539+
73540+ return 0;
73541+}
73542+
73543+int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp)
73544+{
73545+ struct acl_role_label_compat rolecompat;
73546+
73547+ if (copy_from_user(&rolecompat, userp, sizeof(rolecompat)))
73548+ return -EFAULT;
73549+
73550+ role->rolename = compat_ptr(rolecompat.rolename);
73551+ role->uidgid = rolecompat.uidgid;
73552+ role->roletype = rolecompat.roletype;
73553+
73554+ role->auth_attempts = rolecompat.auth_attempts;
73555+ role->expires = rolecompat.expires;
73556+
73557+ role->root_label = compat_ptr(rolecompat.root_label);
73558+ role->hash = compat_ptr(rolecompat.hash);
73559+
73560+ role->prev = compat_ptr(rolecompat.prev);
73561+ role->next = compat_ptr(rolecompat.next);
73562+
73563+ role->transitions = compat_ptr(rolecompat.transitions);
73564+ role->allowed_ips = compat_ptr(rolecompat.allowed_ips);
73565+ role->domain_children = compat_ptr(rolecompat.domain_children);
73566+ role->domain_child_num = rolecompat.domain_child_num;
73567+
73568+ role->umask = rolecompat.umask;
73569+
73570+ role->subj_hash = compat_ptr(rolecompat.subj_hash);
73571+ role->subj_hash_size = rolecompat.subj_hash_size;
73572+
73573+ return 0;
73574+}
73575+
73576+int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
73577+{
73578+ struct role_allowed_ip_compat roleip_compat;
73579+
73580+ if (copy_from_user(&roleip_compat, userp, sizeof(roleip_compat)))
73581+ return -EFAULT;
73582+
73583+ roleip->addr = roleip_compat.addr;
73584+ roleip->netmask = roleip_compat.netmask;
73585+
73586+ roleip->prev = compat_ptr(roleip_compat.prev);
73587+ roleip->next = compat_ptr(roleip_compat.next);
73588+
73589+ return 0;
73590+}
73591+
73592+int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp)
73593+{
73594+ struct role_transition_compat trans_compat;
73595+
73596+ if (copy_from_user(&trans_compat, userp, sizeof(trans_compat)))
73597+ return -EFAULT;
73598+
73599+ trans->rolename = compat_ptr(trans_compat.rolename);
73600+
73601+ trans->prev = compat_ptr(trans_compat.prev);
73602+ trans->next = compat_ptr(trans_compat.next);
73603+
73604+ return 0;
73605+
73606+}
73607+
73608+int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
73609+{
73610+ struct gr_hash_struct_compat hash_compat;
73611+
73612+ if (copy_from_user(&hash_compat, userp, sizeof(hash_compat)))
73613+ return -EFAULT;
73614+
73615+ hash->table = compat_ptr(hash_compat.table);
73616+ hash->nametable = compat_ptr(hash_compat.nametable);
73617+ hash->first = compat_ptr(hash_compat.first);
73618+
73619+ hash->table_size = hash_compat.table_size;
73620+ hash->used_size = hash_compat.used_size;
73621+
73622+ hash->type = hash_compat.type;
73623+
73624+ return 0;
73625+}
73626+
73627+int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp)
73628+{
73629+ compat_uptr_t ptrcompat;
73630+
73631+ if (copy_from_user(&ptrcompat, userp + (idx * sizeof(ptrcompat)), sizeof(ptrcompat)))
73632+ return -EFAULT;
73633+
73634+ *(void **)ptr = compat_ptr(ptrcompat);
73635+
73636+ return 0;
73637+}
73638+
73639+int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp)
73640+{
73641+ struct acl_ip_label_compat ip_compat;
73642+
73643+ if (copy_from_user(&ip_compat, userp, sizeof(ip_compat)))
73644+ return -EFAULT;
73645+
73646+ ip->iface = compat_ptr(ip_compat.iface);
73647+ ip->addr = ip_compat.addr;
73648+ ip->netmask = ip_compat.netmask;
73649+ ip->low = ip_compat.low;
73650+ ip->high = ip_compat.high;
73651+ ip->mode = ip_compat.mode;
73652+ ip->type = ip_compat.type;
73653+
73654+ memcpy(&ip->proto, &ip_compat.proto, sizeof(ip->proto));
73655+
73656+ ip->prev = compat_ptr(ip_compat.prev);
73657+ ip->next = compat_ptr(ip_compat.next);
73658+
73659+ return 0;
73660+}
73661+
73662+int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
73663+{
73664+ struct sprole_pw_compat pw_compat;
73665+
73666+ if (copy_from_user(&pw_compat, (const void *)userp + (sizeof(pw_compat) * idx), sizeof(pw_compat)))
73667+ return -EFAULT;
73668+
73669+ pw->rolename = compat_ptr(pw_compat.rolename);
73670+ memcpy(&pw->salt, pw_compat.salt, sizeof(pw->salt));
73671+ memcpy(&pw->sum, pw_compat.sum, sizeof(pw->sum));
73672+
73673+ return 0;
73674+}
73675+
73676+size_t get_gr_arg_wrapper_size_compat(void)
73677+{
73678+ return sizeof(struct gr_arg_wrapper_compat);
73679+}
73680+
73681diff --git a/grsecurity/gracl_fs.c b/grsecurity/gracl_fs.c
73682new file mode 100644
73683index 0000000..8ee8e4f
73684--- /dev/null
73685+++ b/grsecurity/gracl_fs.c
73686@@ -0,0 +1,447 @@
73687+#include <linux/kernel.h>
73688+#include <linux/sched.h>
73689+#include <linux/types.h>
73690+#include <linux/fs.h>
73691+#include <linux/file.h>
73692+#include <linux/stat.h>
73693+#include <linux/grsecurity.h>
73694+#include <linux/grinternal.h>
73695+#include <linux/gracl.h>
73696+
73697+umode_t
73698+gr_acl_umask(void)
73699+{
73700+ if (unlikely(!gr_acl_is_enabled()))
73701+ return 0;
73702+
73703+ return current->role->umask;
73704+}
73705+
73706+__u32
73707+gr_acl_handle_hidden_file(const struct dentry * dentry,
73708+ const struct vfsmount * mnt)
73709+{
73710+ __u32 mode;
73711+
73712+ if (unlikely(d_is_negative(dentry)))
73713+ return GR_FIND;
73714+
73715+ mode =
73716+ gr_search_file(dentry, GR_FIND | GR_AUDIT_FIND | GR_SUPPRESS, mnt);
73717+
73718+ if (unlikely(mode & GR_FIND && mode & GR_AUDIT_FIND)) {
73719+ gr_log_fs_rbac_generic(GR_DO_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
73720+ return mode;
73721+ } else if (unlikely(!(mode & GR_FIND) && !(mode & GR_SUPPRESS))) {
73722+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, GR_HIDDEN_ACL_MSG, dentry, mnt);
73723+ return 0;
73724+ } else if (unlikely(!(mode & GR_FIND)))
73725+ return 0;
73726+
73727+ return GR_FIND;
73728+}
73729+
73730+__u32
73731+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
73732+ int acc_mode)
73733+{
73734+ __u32 reqmode = GR_FIND;
73735+ __u32 mode;
73736+
73737+ if (unlikely(d_is_negative(dentry)))
73738+ return reqmode;
73739+
73740+ if (acc_mode & MAY_APPEND)
73741+ reqmode |= GR_APPEND;
73742+ else if (acc_mode & MAY_WRITE)
73743+ reqmode |= GR_WRITE;
73744+ if ((acc_mode & MAY_READ) && !S_ISDIR(dentry->d_inode->i_mode))
73745+ reqmode |= GR_READ;
73746+
73747+ mode =
73748+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
73749+ mnt);
73750+
73751+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
73752+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
73753+ reqmode & GR_READ ? " reading" : "",
73754+ reqmode & GR_WRITE ? " writing" : reqmode &
73755+ GR_APPEND ? " appending" : "");
73756+ return reqmode;
73757+ } else
73758+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
73759+ {
73760+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_OPEN_ACL_MSG, dentry, mnt,
73761+ reqmode & GR_READ ? " reading" : "",
73762+ reqmode & GR_WRITE ? " writing" : reqmode &
73763+ GR_APPEND ? " appending" : "");
73764+ return 0;
73765+ } else if (unlikely((mode & reqmode) != reqmode))
73766+ return 0;
73767+
73768+ return reqmode;
73769+}
73770+
73771+__u32
73772+gr_acl_handle_creat(const struct dentry * dentry,
73773+ const struct dentry * p_dentry,
73774+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
73775+ const int imode)
73776+{
73777+ __u32 reqmode = GR_WRITE | GR_CREATE;
73778+ __u32 mode;
73779+
73780+ if (acc_mode & MAY_APPEND)
73781+ reqmode |= GR_APPEND;
73782+ // if a directory was required or the directory already exists, then
73783+ // don't count this open as a read
73784+ if ((acc_mode & MAY_READ) &&
73785+ !((open_flags & O_DIRECTORY) || (dentry->d_inode && S_ISDIR(dentry->d_inode->i_mode))))
73786+ reqmode |= GR_READ;
73787+ if ((open_flags & O_CREAT) &&
73788+ ((imode & S_ISUID) || ((imode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
73789+ reqmode |= GR_SETID;
73790+
73791+ mode =
73792+ gr_check_create(dentry, p_dentry, p_mnt,
73793+ reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
73794+
73795+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
73796+ gr_log_fs_rbac_mode2(GR_DO_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
73797+ reqmode & GR_READ ? " reading" : "",
73798+ reqmode & GR_WRITE ? " writing" : reqmode &
73799+ GR_APPEND ? " appending" : "");
73800+ return reqmode;
73801+ } else
73802+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
73803+ {
73804+ gr_log_fs_rbac_mode2(GR_DONT_AUDIT, GR_CREATE_ACL_MSG, dentry, p_mnt,
73805+ reqmode & GR_READ ? " reading" : "",
73806+ reqmode & GR_WRITE ? " writing" : reqmode &
73807+ GR_APPEND ? " appending" : "");
73808+ return 0;
73809+ } else if (unlikely((mode & reqmode) != reqmode))
73810+ return 0;
73811+
73812+ return reqmode;
73813+}
73814+
73815+__u32
73816+gr_acl_handle_access(const struct dentry * dentry, const struct vfsmount * mnt,
73817+ const int fmode)
73818+{
73819+ __u32 mode, reqmode = GR_FIND;
73820+
73821+ if ((fmode & S_IXOTH) && !S_ISDIR(dentry->d_inode->i_mode))
73822+ reqmode |= GR_EXEC;
73823+ if (fmode & S_IWOTH)
73824+ reqmode |= GR_WRITE;
73825+ if (fmode & S_IROTH)
73826+ reqmode |= GR_READ;
73827+
73828+ mode =
73829+ gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS,
73830+ mnt);
73831+
73832+ if (unlikely(((mode & reqmode) == reqmode) && mode & GR_AUDITS)) {
73833+ gr_log_fs_rbac_mode3(GR_DO_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
73834+ reqmode & GR_READ ? " reading" : "",
73835+ reqmode & GR_WRITE ? " writing" : "",
73836+ reqmode & GR_EXEC ? " executing" : "");
73837+ return reqmode;
73838+ } else
73839+ if (unlikely((mode & reqmode) != reqmode && !(mode & GR_SUPPRESS)))
73840+ {
73841+ gr_log_fs_rbac_mode3(GR_DONT_AUDIT, GR_ACCESS_ACL_MSG, dentry, mnt,
73842+ reqmode & GR_READ ? " reading" : "",
73843+ reqmode & GR_WRITE ? " writing" : "",
73844+ reqmode & GR_EXEC ? " executing" : "");
73845+ return 0;
73846+ } else if (unlikely((mode & reqmode) != reqmode))
73847+ return 0;
73848+
73849+ return reqmode;
73850+}
73851+
73852+static __u32 generic_fs_handler(const struct dentry *dentry, const struct vfsmount *mnt, __u32 reqmode, const char *fmt)
73853+{
73854+ __u32 mode;
73855+
73856+ mode = gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, mnt);
73857+
73858+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
73859+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, dentry, mnt);
73860+ return mode;
73861+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
73862+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, dentry, mnt);
73863+ return 0;
73864+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
73865+ return 0;
73866+
73867+ return (reqmode);
73868+}
73869+
73870+__u32
73871+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
73872+{
73873+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_RMDIR_ACL_MSG);
73874+}
73875+
73876+__u32
73877+gr_acl_handle_unlink(const struct dentry *dentry, const struct vfsmount *mnt)
73878+{
73879+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_DELETE , GR_UNLINK_ACL_MSG);
73880+}
73881+
73882+__u32
73883+gr_acl_handle_truncate(const struct dentry *dentry, const struct vfsmount *mnt)
73884+{
73885+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_TRUNCATE_ACL_MSG);
73886+}
73887+
73888+__u32
73889+gr_acl_handle_utime(const struct dentry *dentry, const struct vfsmount *mnt)
73890+{
73891+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_ATIME_ACL_MSG);
73892+}
73893+
73894+__u32
73895+gr_acl_handle_chmod(const struct dentry *dentry, const struct vfsmount *mnt,
73896+ umode_t *modeptr)
73897+{
73898+ umode_t mode;
73899+
73900+ *modeptr &= ~gr_acl_umask();
73901+ mode = *modeptr;
73902+
73903+ if (unlikely(dentry->d_inode && S_ISSOCK(dentry->d_inode->i_mode)))
73904+ return 1;
73905+
73906+ if (unlikely(dentry->d_inode && !S_ISDIR(dentry->d_inode->i_mode) &&
73907+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))) {
73908+ return generic_fs_handler(dentry, mnt, GR_WRITE | GR_SETID,
73909+ GR_CHMOD_ACL_MSG);
73910+ } else {
73911+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHMOD_ACL_MSG);
73912+ }
73913+}
73914+
73915+__u32
73916+gr_acl_handle_chown(const struct dentry *dentry, const struct vfsmount *mnt)
73917+{
73918+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_CHOWN_ACL_MSG);
73919+}
73920+
73921+__u32
73922+gr_acl_handle_setxattr(const struct dentry *dentry, const struct vfsmount *mnt)
73923+{
73924+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_SETXATTR_ACL_MSG);
73925+}
73926+
73927+__u32
73928+gr_acl_handle_removexattr(const struct dentry *dentry, const struct vfsmount *mnt)
73929+{
73930+ return generic_fs_handler(dentry, mnt, GR_WRITE, GR_REMOVEXATTR_ACL_MSG);
73931+}
73932+
73933+__u32
73934+gr_acl_handle_execve(const struct dentry *dentry, const struct vfsmount *mnt)
73935+{
73936+ return generic_fs_handler(dentry, mnt, GR_EXEC, GR_EXEC_ACL_MSG);
73937+}
73938+
73939+__u32
73940+gr_acl_handle_unix(const struct dentry *dentry, const struct vfsmount *mnt)
73941+{
73942+ return generic_fs_handler(dentry, mnt, GR_READ | GR_WRITE,
73943+ GR_UNIXCONNECT_ACL_MSG);
73944+}
73945+
73946+/* hardlinks require at minimum create and link permission,
73947+ any additional privilege required is based on the
73948+ privilege of the file being linked to
73949+*/
73950+__u32
73951+gr_acl_handle_link(const struct dentry * new_dentry,
73952+ const struct dentry * parent_dentry,
73953+ const struct vfsmount * parent_mnt,
73954+ const struct dentry * old_dentry,
73955+ const struct vfsmount * old_mnt, const struct filename *to)
73956+{
73957+ __u32 mode;
73958+ __u32 needmode = GR_CREATE | GR_LINK;
73959+ __u32 needaudit = GR_AUDIT_CREATE | GR_AUDIT_LINK;
73960+
73961+ mode =
73962+ gr_check_link(new_dentry, parent_dentry, parent_mnt, old_dentry,
73963+ old_mnt);
73964+
73965+ if (unlikely(((mode & needmode) == needmode) && (mode & needaudit))) {
73966+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
73967+ return mode;
73968+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
73969+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_LINK_ACL_MSG, old_dentry, old_mnt, to->name);
73970+ return 0;
73971+ } else if (unlikely((mode & needmode) != needmode))
73972+ return 0;
73973+
73974+ return 1;
73975+}
73976+
73977+__u32
73978+gr_acl_handle_symlink(const struct dentry * new_dentry,
73979+ const struct dentry * parent_dentry,
73980+ const struct vfsmount * parent_mnt, const struct filename *from)
73981+{
73982+ __u32 needmode = GR_WRITE | GR_CREATE;
73983+ __u32 mode;
73984+
73985+ mode =
73986+ gr_check_create(new_dentry, parent_dentry, parent_mnt,
73987+ GR_CREATE | GR_AUDIT_CREATE |
73988+ GR_WRITE | GR_AUDIT_WRITE | GR_SUPPRESS);
73989+
73990+ if (unlikely(mode & GR_WRITE && mode & GR_AUDITS)) {
73991+ gr_log_fs_str_rbac(GR_DO_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
73992+ return mode;
73993+ } else if (unlikely(((mode & needmode) != needmode) && !(mode & GR_SUPPRESS))) {
73994+ gr_log_fs_str_rbac(GR_DONT_AUDIT, GR_SYMLINK_ACL_MSG, from->name, new_dentry, parent_mnt);
73995+ return 0;
73996+ } else if (unlikely((mode & needmode) != needmode))
73997+ return 0;
73998+
73999+ return (GR_WRITE | GR_CREATE);
74000+}
74001+
74002+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)
74003+{
74004+ __u32 mode;
74005+
74006+ mode = gr_check_create(new_dentry, parent_dentry, parent_mnt, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS);
74007+
74008+ if (unlikely(((mode & (reqmode)) == (reqmode)) && mode & GR_AUDITS)) {
74009+ gr_log_fs_rbac_generic(GR_DO_AUDIT, fmt, new_dentry, parent_mnt);
74010+ return mode;
74011+ } else if (unlikely((mode & (reqmode)) != (reqmode) && !(mode & GR_SUPPRESS))) {
74012+ gr_log_fs_rbac_generic(GR_DONT_AUDIT, fmt, new_dentry, parent_mnt);
74013+ return 0;
74014+ } else if (unlikely((mode & (reqmode)) != (reqmode)))
74015+ return 0;
74016+
74017+ return (reqmode);
74018+}
74019+
74020+__u32
74021+gr_acl_handle_mknod(const struct dentry * new_dentry,
74022+ const struct dentry * parent_dentry,
74023+ const struct vfsmount * parent_mnt,
74024+ const int mode)
74025+{
74026+ __u32 reqmode = GR_WRITE | GR_CREATE;
74027+ if (unlikely((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))))
74028+ reqmode |= GR_SETID;
74029+
74030+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
74031+ reqmode, GR_MKNOD_ACL_MSG);
74032+}
74033+
74034+__u32
74035+gr_acl_handle_mkdir(const struct dentry *new_dentry,
74036+ const struct dentry *parent_dentry,
74037+ const struct vfsmount *parent_mnt)
74038+{
74039+ return generic_fs_create_handler(new_dentry, parent_dentry, parent_mnt,
74040+ GR_WRITE | GR_CREATE, GR_MKDIR_ACL_MSG);
74041+}
74042+
74043+#define RENAME_CHECK_SUCCESS(old, new) \
74044+ (((old & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)) && \
74045+ ((new & (GR_WRITE | GR_READ)) == (GR_WRITE | GR_READ)))
74046+
74047+int
74048+gr_acl_handle_rename(struct dentry *new_dentry,
74049+ struct dentry *parent_dentry,
74050+ const struct vfsmount *parent_mnt,
74051+ struct dentry *old_dentry,
74052+ struct inode *old_parent_inode,
74053+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags)
74054+{
74055+ __u32 comp1, comp2;
74056+ int error = 0;
74057+
74058+ if (unlikely(!gr_acl_is_enabled()))
74059+ return 0;
74060+
74061+ if (flags & RENAME_EXCHANGE) {
74062+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
74063+ GR_AUDIT_READ | GR_AUDIT_WRITE |
74064+ GR_SUPPRESS, parent_mnt);
74065+ comp2 =
74066+ gr_search_file(old_dentry,
74067+ GR_READ | GR_WRITE | GR_AUDIT_READ |
74068+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
74069+ } else if (d_is_negative(new_dentry)) {
74070+ comp1 = gr_check_create(new_dentry, parent_dentry, parent_mnt,
74071+ GR_READ | GR_WRITE | GR_CREATE | GR_AUDIT_READ |
74072+ GR_AUDIT_WRITE | GR_AUDIT_CREATE | GR_SUPPRESS);
74073+ comp2 = gr_search_file(old_dentry, GR_READ | GR_WRITE |
74074+ GR_DELETE | GR_AUDIT_DELETE |
74075+ GR_AUDIT_READ | GR_AUDIT_WRITE |
74076+ GR_SUPPRESS, old_mnt);
74077+ } else {
74078+ comp1 = gr_search_file(new_dentry, GR_READ | GR_WRITE |
74079+ GR_CREATE | GR_DELETE |
74080+ GR_AUDIT_CREATE | GR_AUDIT_DELETE |
74081+ GR_AUDIT_READ | GR_AUDIT_WRITE |
74082+ GR_SUPPRESS, parent_mnt);
74083+ comp2 =
74084+ gr_search_file(old_dentry,
74085+ GR_READ | GR_WRITE | GR_AUDIT_READ |
74086+ GR_DELETE | GR_AUDIT_DELETE |
74087+ GR_AUDIT_WRITE | GR_SUPPRESS, old_mnt);
74088+ }
74089+
74090+ if (RENAME_CHECK_SUCCESS(comp1, comp2) &&
74091+ ((comp1 & GR_AUDITS) || (comp2 & GR_AUDITS)))
74092+ gr_log_fs_rbac_str(GR_DO_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
74093+ else if (!RENAME_CHECK_SUCCESS(comp1, comp2) && !(comp1 & GR_SUPPRESS)
74094+ && !(comp2 & GR_SUPPRESS)) {
74095+ gr_log_fs_rbac_str(GR_DONT_AUDIT, GR_RENAME_ACL_MSG, old_dentry, old_mnt, newname->name);
74096+ error = -EACCES;
74097+ } else if (unlikely(!RENAME_CHECK_SUCCESS(comp1, comp2)))
74098+ error = -EACCES;
74099+
74100+ return error;
74101+}
74102+
74103+void
74104+gr_acl_handle_exit(void)
74105+{
74106+ u16 id;
74107+ char *rolename;
74108+
74109+ if (unlikely(current->acl_sp_role && gr_acl_is_enabled() &&
74110+ !(current->role->roletype & GR_ROLE_PERSIST))) {
74111+ id = current->acl_role_id;
74112+ rolename = current->role->rolename;
74113+ gr_set_acls(1);
74114+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLEL_ACL_MSG, rolename, id);
74115+ }
74116+
74117+ gr_put_exec_file(current);
74118+ return;
74119+}
74120+
74121+int
74122+gr_acl_handle_procpidmem(const struct task_struct *task)
74123+{
74124+ if (unlikely(!gr_acl_is_enabled()))
74125+ return 0;
74126+
74127+ if (task != current && (task->acl->mode & GR_PROTPROCFD) &&
74128+ !(current->acl->mode & GR_POVERRIDE) &&
74129+ !(current->role->roletype & GR_ROLE_GOD))
74130+ return -EACCES;
74131+
74132+ return 0;
74133+}
74134diff --git a/grsecurity/gracl_ip.c b/grsecurity/gracl_ip.c
74135new file mode 100644
74136index 0000000..f056b81
74137--- /dev/null
74138+++ b/grsecurity/gracl_ip.c
74139@@ -0,0 +1,386 @@
74140+#include <linux/kernel.h>
74141+#include <asm/uaccess.h>
74142+#include <asm/errno.h>
74143+#include <net/sock.h>
74144+#include <linux/file.h>
74145+#include <linux/fs.h>
74146+#include <linux/net.h>
74147+#include <linux/in.h>
74148+#include <linux/skbuff.h>
74149+#include <linux/ip.h>
74150+#include <linux/udp.h>
74151+#include <linux/types.h>
74152+#include <linux/sched.h>
74153+#include <linux/netdevice.h>
74154+#include <linux/inetdevice.h>
74155+#include <linux/gracl.h>
74156+#include <linux/grsecurity.h>
74157+#include <linux/grinternal.h>
74158+
74159+#define GR_BIND 0x01
74160+#define GR_CONNECT 0x02
74161+#define GR_INVERT 0x04
74162+#define GR_BINDOVERRIDE 0x08
74163+#define GR_CONNECTOVERRIDE 0x10
74164+#define GR_SOCK_FAMILY 0x20
74165+
74166+static const char * gr_protocols[IPPROTO_MAX] = {
74167+ "ip", "icmp", "igmp", "ggp", "ipencap", "st", "tcp", "cbt",
74168+ "egp", "igp", "bbn-rcc", "nvp", "pup", "argus", "emcon", "xnet",
74169+ "chaos", "udp", "mux", "dcn", "hmp", "prm", "xns-idp", "trunk-1",
74170+ "trunk-2", "leaf-1", "leaf-2", "rdp", "irtp", "iso-tp4", "netblt", "mfe-nsp",
74171+ "merit-inp", "sep", "3pc", "idpr", "xtp", "ddp", "idpr-cmtp", "tp++",
74172+ "il", "ipv6", "sdrp", "ipv6-route", "ipv6-frag", "idrp", "rsvp", "gre",
74173+ "mhrp", "bna", "ipv6-crypt", "ipv6-auth", "i-nlsp", "swipe", "narp", "mobile",
74174+ "tlsp", "skip", "ipv6-icmp", "ipv6-nonxt", "ipv6-opts", "unknown:61", "cftp", "unknown:63",
74175+ "sat-expak", "kryptolan", "rvd", "ippc", "unknown:68", "sat-mon", "visa", "ipcv",
74176+ "cpnx", "cphb", "wsn", "pvp", "br-sat-mon", "sun-nd", "wb-mon", "wb-expak",
74177+ "iso-ip", "vmtp", "secure-vmtp", "vines", "ttp", "nfsnet-igp", "dgp", "tcf",
74178+ "eigrp", "ospf", "sprite-rpc", "larp", "mtp", "ax.25", "ipip", "micp",
74179+ "scc-sp", "etherip", "encap", "unknown:99", "gmtp", "ifmp", "pnni", "pim",
74180+ "aris", "scps", "qnx", "a/n", "ipcomp", "snp", "compaq-peer", "ipx-in-ip",
74181+ "vrrp", "pgm", "unknown:114", "l2tp", "ddx", "iatp", "stp", "srp",
74182+ "uti", "smp", "sm", "ptp", "isis", "fire", "crtp", "crdup",
74183+ "sscopmce", "iplt", "sps", "pipe", "sctp", "fc", "unkown:134", "unknown:135",
74184+ "unknown:136", "unknown:137", "unknown:138", "unknown:139", "unknown:140", "unknown:141", "unknown:142", "unknown:143",
74185+ "unknown:144", "unknown:145", "unknown:146", "unknown:147", "unknown:148", "unknown:149", "unknown:150", "unknown:151",
74186+ "unknown:152", "unknown:153", "unknown:154", "unknown:155", "unknown:156", "unknown:157", "unknown:158", "unknown:159",
74187+ "unknown:160", "unknown:161", "unknown:162", "unknown:163", "unknown:164", "unknown:165", "unknown:166", "unknown:167",
74188+ "unknown:168", "unknown:169", "unknown:170", "unknown:171", "unknown:172", "unknown:173", "unknown:174", "unknown:175",
74189+ "unknown:176", "unknown:177", "unknown:178", "unknown:179", "unknown:180", "unknown:181", "unknown:182", "unknown:183",
74190+ "unknown:184", "unknown:185", "unknown:186", "unknown:187", "unknown:188", "unknown:189", "unknown:190", "unknown:191",
74191+ "unknown:192", "unknown:193", "unknown:194", "unknown:195", "unknown:196", "unknown:197", "unknown:198", "unknown:199",
74192+ "unknown:200", "unknown:201", "unknown:202", "unknown:203", "unknown:204", "unknown:205", "unknown:206", "unknown:207",
74193+ "unknown:208", "unknown:209", "unknown:210", "unknown:211", "unknown:212", "unknown:213", "unknown:214", "unknown:215",
74194+ "unknown:216", "unknown:217", "unknown:218", "unknown:219", "unknown:220", "unknown:221", "unknown:222", "unknown:223",
74195+ "unknown:224", "unknown:225", "unknown:226", "unknown:227", "unknown:228", "unknown:229", "unknown:230", "unknown:231",
74196+ "unknown:232", "unknown:233", "unknown:234", "unknown:235", "unknown:236", "unknown:237", "unknown:238", "unknown:239",
74197+ "unknown:240", "unknown:241", "unknown:242", "unknown:243", "unknown:244", "unknown:245", "unknown:246", "unknown:247",
74198+ "unknown:248", "unknown:249", "unknown:250", "unknown:251", "unknown:252", "unknown:253", "unknown:254", "unknown:255",
74199+ };
74200+
74201+static const char * gr_socktypes[SOCK_MAX] = {
74202+ "unknown:0", "stream", "dgram", "raw", "rdm", "seqpacket", "unknown:6",
74203+ "unknown:7", "unknown:8", "unknown:9", "packet"
74204+ };
74205+
74206+static const char * gr_sockfamilies[AF_MAX+1] = {
74207+ "unspec", "unix", "inet", "ax25", "ipx", "appletalk", "netrom", "bridge", "atmpvc", "x25",
74208+ "inet6", "rose", "decnet", "netbeui", "security", "key", "netlink", "packet", "ash",
74209+ "econet", "atmsvc", "rds", "sna", "irda", "ppox", "wanpipe", "llc", "fam_27", "fam_28",
74210+ "tipc", "bluetooth", "iucv", "rxrpc", "isdn", "phonet", "ieee802154", "ciaf"
74211+ };
74212+
74213+const char *
74214+gr_proto_to_name(unsigned char proto)
74215+{
74216+ return gr_protocols[proto];
74217+}
74218+
74219+const char *
74220+gr_socktype_to_name(unsigned char type)
74221+{
74222+ return gr_socktypes[type];
74223+}
74224+
74225+const char *
74226+gr_sockfamily_to_name(unsigned char family)
74227+{
74228+ return gr_sockfamilies[family];
74229+}
74230+
74231+extern const struct net_proto_family __rcu *net_families[NPROTO] __read_mostly;
74232+
74233+int
74234+gr_search_socket(const int domain, const int type, const int protocol)
74235+{
74236+ struct acl_subject_label *curr;
74237+ const struct cred *cred = current_cred();
74238+
74239+ if (unlikely(!gr_acl_is_enabled()))
74240+ goto exit;
74241+
74242+ if ((domain < 0) || (type < 0) || (protocol < 0) ||
74243+ (domain >= AF_MAX) || (type >= SOCK_MAX) || (protocol >= IPPROTO_MAX))
74244+ goto exit; // let the kernel handle it
74245+
74246+ curr = current->acl;
74247+
74248+ if (curr->sock_families[domain / 32] & (1U << (domain % 32))) {
74249+ /* the family is allowed, if this is PF_INET allow it only if
74250+ the extra sock type/protocol checks pass */
74251+ if (domain == PF_INET)
74252+ goto inet_check;
74253+ goto exit;
74254+ } else {
74255+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
74256+ __u32 fakeip = 0;
74257+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
74258+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
74259+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
74260+ gr_to_filename(current->exec_file->f_path.dentry,
74261+ current->exec_file->f_path.mnt) :
74262+ curr->filename, curr->filename,
74263+ &fakeip, domain, 0, 0, GR_SOCK_FAMILY,
74264+ &current->signal->saved_ip);
74265+ goto exit;
74266+ }
74267+ goto exit_fail;
74268+ }
74269+
74270+inet_check:
74271+ /* the rest of this checking is for IPv4 only */
74272+ if (!curr->ips)
74273+ goto exit;
74274+
74275+ if ((curr->ip_type & (1U << type)) &&
74276+ (curr->ip_proto[protocol / 32] & (1U << (protocol % 32))))
74277+ goto exit;
74278+
74279+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
74280+ /* we don't place acls on raw sockets , and sometimes
74281+ dgram/ip sockets are opened for ioctl and not
74282+ bind/connect, so we'll fake a bind learn log */
74283+ if (type == SOCK_RAW || type == SOCK_PACKET) {
74284+ __u32 fakeip = 0;
74285+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
74286+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
74287+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
74288+ gr_to_filename(current->exec_file->f_path.dentry,
74289+ current->exec_file->f_path.mnt) :
74290+ curr->filename, curr->filename,
74291+ &fakeip, 0, type,
74292+ protocol, GR_CONNECT, &current->signal->saved_ip);
74293+ } else if ((type == SOCK_DGRAM) && (protocol == IPPROTO_IP)) {
74294+ __u32 fakeip = 0;
74295+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
74296+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
74297+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
74298+ gr_to_filename(current->exec_file->f_path.dentry,
74299+ current->exec_file->f_path.mnt) :
74300+ curr->filename, curr->filename,
74301+ &fakeip, 0, type,
74302+ protocol, GR_BIND, &current->signal->saved_ip);
74303+ }
74304+ /* we'll log when they use connect or bind */
74305+ goto exit;
74306+ }
74307+
74308+exit_fail:
74309+ if (domain == PF_INET)
74310+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(domain),
74311+ gr_socktype_to_name(type), gr_proto_to_name(protocol));
74312+ else if (rcu_access_pointer(net_families[domain]) != NULL)
74313+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(domain),
74314+ gr_socktype_to_name(type), protocol);
74315+
74316+ return 0;
74317+exit:
74318+ return 1;
74319+}
74320+
74321+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)
74322+{
74323+ if ((ip->mode & mode) &&
74324+ (ip_port >= ip->low) &&
74325+ (ip_port <= ip->high) &&
74326+ ((ntohl(ip_addr) & our_netmask) ==
74327+ (ntohl(our_addr) & our_netmask))
74328+ && (ip->proto[protocol / 32] & (1U << (protocol % 32)))
74329+ && (ip->type & (1U << type))) {
74330+ if (ip->mode & GR_INVERT)
74331+ return 2; // specifically denied
74332+ else
74333+ return 1; // allowed
74334+ }
74335+
74336+ return 0; // not specifically allowed, may continue parsing
74337+}
74338+
74339+static int
74340+gr_search_connectbind(const int full_mode, struct sock *sk,
74341+ struct sockaddr_in *addr, const int type)
74342+{
74343+ char iface[IFNAMSIZ] = {0};
74344+ struct acl_subject_label *curr;
74345+ struct acl_ip_label *ip;
74346+ struct inet_sock *isk;
74347+ struct net_device *dev;
74348+ struct in_device *idev;
74349+ unsigned long i;
74350+ int ret;
74351+ int mode = full_mode & (GR_BIND | GR_CONNECT);
74352+ __u32 ip_addr = 0;
74353+ __u32 our_addr;
74354+ __u32 our_netmask;
74355+ char *p;
74356+ __u16 ip_port = 0;
74357+ const struct cred *cred = current_cred();
74358+
74359+ if (unlikely(!gr_acl_is_enabled() || sk->sk_family != PF_INET))
74360+ return 0;
74361+
74362+ curr = current->acl;
74363+ isk = inet_sk(sk);
74364+
74365+ /* INADDR_ANY overriding for binds, inaddr_any_override is already in network order */
74366+ if ((full_mode & GR_BINDOVERRIDE) && addr->sin_addr.s_addr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0)
74367+ addr->sin_addr.s_addr = curr->inaddr_any_override;
74368+ if ((full_mode & GR_CONNECT) && isk->inet_saddr == htonl(INADDR_ANY) && curr->inaddr_any_override != 0) {
74369+ struct sockaddr_in saddr;
74370+ int err;
74371+
74372+ saddr.sin_family = AF_INET;
74373+ saddr.sin_addr.s_addr = curr->inaddr_any_override;
74374+ saddr.sin_port = isk->inet_sport;
74375+
74376+ err = security_socket_bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
74377+ if (err)
74378+ return err;
74379+
74380+ err = sk->sk_socket->ops->bind(sk->sk_socket, (struct sockaddr *)&saddr, sizeof(struct sockaddr_in));
74381+ if (err)
74382+ return err;
74383+ }
74384+
74385+ if (!curr->ips)
74386+ return 0;
74387+
74388+ ip_addr = addr->sin_addr.s_addr;
74389+ ip_port = ntohs(addr->sin_port);
74390+
74391+ if (curr->mode & (GR_LEARN | GR_INHERITLEARN)) {
74392+ security_learn(GR_IP_LEARN_MSG, current->role->rolename,
74393+ current->role->roletype, GR_GLOBAL_UID(cred->uid),
74394+ GR_GLOBAL_GID(cred->gid), current->exec_file ?
74395+ gr_to_filename(current->exec_file->f_path.dentry,
74396+ current->exec_file->f_path.mnt) :
74397+ curr->filename, curr->filename,
74398+ &ip_addr, ip_port, type,
74399+ sk->sk_protocol, mode, &current->signal->saved_ip);
74400+ return 0;
74401+ }
74402+
74403+ for (i = 0; i < curr->ip_num; i++) {
74404+ ip = *(curr->ips + i);
74405+ if (ip->iface != NULL) {
74406+ strncpy(iface, ip->iface, IFNAMSIZ - 1);
74407+ p = strchr(iface, ':');
74408+ if (p != NULL)
74409+ *p = '\0';
74410+ dev = dev_get_by_name(sock_net(sk), iface);
74411+ if (dev == NULL)
74412+ continue;
74413+ idev = in_dev_get(dev);
74414+ if (idev == NULL) {
74415+ dev_put(dev);
74416+ continue;
74417+ }
74418+ rcu_read_lock();
74419+ for_ifa(idev) {
74420+ if (!strcmp(ip->iface, ifa->ifa_label)) {
74421+ our_addr = ifa->ifa_address;
74422+ our_netmask = 0xffffffff;
74423+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
74424+ if (ret == 1) {
74425+ rcu_read_unlock();
74426+ in_dev_put(idev);
74427+ dev_put(dev);
74428+ return 0;
74429+ } else if (ret == 2) {
74430+ rcu_read_unlock();
74431+ in_dev_put(idev);
74432+ dev_put(dev);
74433+ goto denied;
74434+ }
74435+ }
74436+ } endfor_ifa(idev);
74437+ rcu_read_unlock();
74438+ in_dev_put(idev);
74439+ dev_put(dev);
74440+ } else {
74441+ our_addr = ip->addr;
74442+ our_netmask = ip->netmask;
74443+ ret = check_ip_policy(ip, ip_addr, ip_port, sk->sk_protocol, mode, type, our_addr, our_netmask);
74444+ if (ret == 1)
74445+ return 0;
74446+ else if (ret == 2)
74447+ goto denied;
74448+ }
74449+ }
74450+
74451+denied:
74452+ if (mode == GR_BIND)
74453+ 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));
74454+ else if (mode == GR_CONNECT)
74455+ 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));
74456+
74457+ return -EACCES;
74458+}
74459+
74460+int
74461+gr_search_connect(struct socket *sock, struct sockaddr_in *addr)
74462+{
74463+ /* always allow disconnection of dgram sockets with connect */
74464+ if (addr->sin_family == AF_UNSPEC)
74465+ return 0;
74466+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sock->sk, addr, sock->type);
74467+}
74468+
74469+int
74470+gr_search_bind(struct socket *sock, struct sockaddr_in *addr)
74471+{
74472+ return gr_search_connectbind(GR_BIND | GR_BINDOVERRIDE, sock->sk, addr, sock->type);
74473+}
74474+
74475+int gr_search_listen(struct socket *sock)
74476+{
74477+ struct sock *sk = sock->sk;
74478+ struct sockaddr_in addr;
74479+
74480+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
74481+ addr.sin_port = inet_sk(sk)->inet_sport;
74482+
74483+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
74484+}
74485+
74486+int gr_search_accept(struct socket *sock)
74487+{
74488+ struct sock *sk = sock->sk;
74489+ struct sockaddr_in addr;
74490+
74491+ addr.sin_addr.s_addr = inet_sk(sk)->inet_saddr;
74492+ addr.sin_port = inet_sk(sk)->inet_sport;
74493+
74494+ return gr_search_connectbind(GR_BIND | GR_CONNECTOVERRIDE, sock->sk, &addr, sock->type);
74495+}
74496+
74497+int
74498+gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr)
74499+{
74500+ if (addr)
74501+ return gr_search_connectbind(GR_CONNECT, sk, addr, SOCK_DGRAM);
74502+ else {
74503+ struct sockaddr_in sin;
74504+ const struct inet_sock *inet = inet_sk(sk);
74505+
74506+ sin.sin_addr.s_addr = inet->inet_daddr;
74507+ sin.sin_port = inet->inet_dport;
74508+
74509+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
74510+ }
74511+}
74512+
74513+int
74514+gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb)
74515+{
74516+ struct sockaddr_in sin;
74517+
74518+ if (unlikely(skb->len < sizeof (struct udphdr)))
74519+ return 0; // skip this packet
74520+
74521+ sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
74522+ sin.sin_port = udp_hdr(skb)->source;
74523+
74524+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
74525+}
74526diff --git a/grsecurity/gracl_learn.c b/grsecurity/gracl_learn.c
74527new file mode 100644
74528index 0000000..25f54ef
74529--- /dev/null
74530+++ b/grsecurity/gracl_learn.c
74531@@ -0,0 +1,207 @@
74532+#include <linux/kernel.h>
74533+#include <linux/mm.h>
74534+#include <linux/sched.h>
74535+#include <linux/poll.h>
74536+#include <linux/string.h>
74537+#include <linux/file.h>
74538+#include <linux/types.h>
74539+#include <linux/vmalloc.h>
74540+#include <linux/grinternal.h>
74541+
74542+extern ssize_t write_grsec_handler(struct file * file, const char __user * buf,
74543+ size_t count, loff_t *ppos);
74544+extern int gr_acl_is_enabled(void);
74545+
74546+static DECLARE_WAIT_QUEUE_HEAD(learn_wait);
74547+static int gr_learn_attached;
74548+
74549+/* use a 512k buffer */
74550+#define LEARN_BUFFER_SIZE (512 * 1024)
74551+
74552+static DEFINE_SPINLOCK(gr_learn_lock);
74553+static DEFINE_MUTEX(gr_learn_user_mutex);
74554+
74555+/* we need to maintain two buffers, so that the kernel context of grlearn
74556+ uses a semaphore around the userspace copying, and the other kernel contexts
74557+ use a spinlock when copying into the buffer, since they cannot sleep
74558+*/
74559+static char *learn_buffer;
74560+static char *learn_buffer_user;
74561+static int learn_buffer_len;
74562+static int learn_buffer_user_len;
74563+
74564+static ssize_t
74565+read_learn(struct file *file, char __user * buf, size_t count, loff_t * ppos)
74566+{
74567+ DECLARE_WAITQUEUE(wait, current);
74568+ ssize_t retval = 0;
74569+
74570+ add_wait_queue(&learn_wait, &wait);
74571+ set_current_state(TASK_INTERRUPTIBLE);
74572+ do {
74573+ mutex_lock(&gr_learn_user_mutex);
74574+ spin_lock(&gr_learn_lock);
74575+ if (learn_buffer_len)
74576+ break;
74577+ spin_unlock(&gr_learn_lock);
74578+ mutex_unlock(&gr_learn_user_mutex);
74579+ if (file->f_flags & O_NONBLOCK) {
74580+ retval = -EAGAIN;
74581+ goto out;
74582+ }
74583+ if (signal_pending(current)) {
74584+ retval = -ERESTARTSYS;
74585+ goto out;
74586+ }
74587+
74588+ schedule();
74589+ } while (1);
74590+
74591+ memcpy(learn_buffer_user, learn_buffer, learn_buffer_len);
74592+ learn_buffer_user_len = learn_buffer_len;
74593+ retval = learn_buffer_len;
74594+ learn_buffer_len = 0;
74595+
74596+ spin_unlock(&gr_learn_lock);
74597+
74598+ if (copy_to_user(buf, learn_buffer_user, learn_buffer_user_len))
74599+ retval = -EFAULT;
74600+
74601+ mutex_unlock(&gr_learn_user_mutex);
74602+out:
74603+ set_current_state(TASK_RUNNING);
74604+ remove_wait_queue(&learn_wait, &wait);
74605+ return retval;
74606+}
74607+
74608+static unsigned int
74609+poll_learn(struct file * file, poll_table * wait)
74610+{
74611+ poll_wait(file, &learn_wait, wait);
74612+
74613+ if (learn_buffer_len)
74614+ return (POLLIN | POLLRDNORM);
74615+
74616+ return 0;
74617+}
74618+
74619+void
74620+gr_clear_learn_entries(void)
74621+{
74622+ char *tmp;
74623+
74624+ mutex_lock(&gr_learn_user_mutex);
74625+ spin_lock(&gr_learn_lock);
74626+ tmp = learn_buffer;
74627+ learn_buffer = NULL;
74628+ spin_unlock(&gr_learn_lock);
74629+ if (tmp)
74630+ vfree(tmp);
74631+ if (learn_buffer_user != NULL) {
74632+ vfree(learn_buffer_user);
74633+ learn_buffer_user = NULL;
74634+ }
74635+ learn_buffer_len = 0;
74636+ mutex_unlock(&gr_learn_user_mutex);
74637+
74638+ return;
74639+}
74640+
74641+void
74642+gr_add_learn_entry(const char *fmt, ...)
74643+{
74644+ va_list args;
74645+ unsigned int len;
74646+
74647+ if (!gr_learn_attached)
74648+ return;
74649+
74650+ spin_lock(&gr_learn_lock);
74651+
74652+ /* leave a gap at the end so we know when it's "full" but don't have to
74653+ compute the exact length of the string we're trying to append
74654+ */
74655+ if (learn_buffer_len > LEARN_BUFFER_SIZE - 16384) {
74656+ spin_unlock(&gr_learn_lock);
74657+ wake_up_interruptible(&learn_wait);
74658+ return;
74659+ }
74660+ if (learn_buffer == NULL) {
74661+ spin_unlock(&gr_learn_lock);
74662+ return;
74663+ }
74664+
74665+ va_start(args, fmt);
74666+ len = vsnprintf(learn_buffer + learn_buffer_len, LEARN_BUFFER_SIZE - learn_buffer_len, fmt, args);
74667+ va_end(args);
74668+
74669+ learn_buffer_len += len + 1;
74670+
74671+ spin_unlock(&gr_learn_lock);
74672+ wake_up_interruptible(&learn_wait);
74673+
74674+ return;
74675+}
74676+
74677+static int
74678+open_learn(struct inode *inode, struct file *file)
74679+{
74680+ if (file->f_mode & FMODE_READ && gr_learn_attached)
74681+ return -EBUSY;
74682+ if (file->f_mode & FMODE_READ) {
74683+ int retval = 0;
74684+ mutex_lock(&gr_learn_user_mutex);
74685+ if (learn_buffer == NULL)
74686+ learn_buffer = vmalloc(LEARN_BUFFER_SIZE);
74687+ if (learn_buffer_user == NULL)
74688+ learn_buffer_user = vmalloc(LEARN_BUFFER_SIZE);
74689+ if (learn_buffer == NULL) {
74690+ retval = -ENOMEM;
74691+ goto out_error;
74692+ }
74693+ if (learn_buffer_user == NULL) {
74694+ retval = -ENOMEM;
74695+ goto out_error;
74696+ }
74697+ learn_buffer_len = 0;
74698+ learn_buffer_user_len = 0;
74699+ gr_learn_attached = 1;
74700+out_error:
74701+ mutex_unlock(&gr_learn_user_mutex);
74702+ return retval;
74703+ }
74704+ return 0;
74705+}
74706+
74707+static int
74708+close_learn(struct inode *inode, struct file *file)
74709+{
74710+ if (file->f_mode & FMODE_READ) {
74711+ char *tmp = NULL;
74712+ mutex_lock(&gr_learn_user_mutex);
74713+ spin_lock(&gr_learn_lock);
74714+ tmp = learn_buffer;
74715+ learn_buffer = NULL;
74716+ spin_unlock(&gr_learn_lock);
74717+ if (tmp)
74718+ vfree(tmp);
74719+ if (learn_buffer_user != NULL) {
74720+ vfree(learn_buffer_user);
74721+ learn_buffer_user = NULL;
74722+ }
74723+ learn_buffer_len = 0;
74724+ learn_buffer_user_len = 0;
74725+ gr_learn_attached = 0;
74726+ mutex_unlock(&gr_learn_user_mutex);
74727+ }
74728+
74729+ return 0;
74730+}
74731+
74732+const struct file_operations grsec_fops = {
74733+ .read = read_learn,
74734+ .write = write_grsec_handler,
74735+ .open = open_learn,
74736+ .release = close_learn,
74737+ .poll = poll_learn,
74738+};
74739diff --git a/grsecurity/gracl_policy.c b/grsecurity/gracl_policy.c
74740new file mode 100644
74741index 0000000..fd26052
74742--- /dev/null
74743+++ b/grsecurity/gracl_policy.c
74744@@ -0,0 +1,1781 @@
74745+#include <linux/kernel.h>
74746+#include <linux/module.h>
74747+#include <linux/sched.h>
74748+#include <linux/mm.h>
74749+#include <linux/file.h>
74750+#include <linux/fs.h>
74751+#include <linux/namei.h>
74752+#include <linux/mount.h>
74753+#include <linux/tty.h>
74754+#include <linux/proc_fs.h>
74755+#include <linux/lglock.h>
74756+#include <linux/slab.h>
74757+#include <linux/vmalloc.h>
74758+#include <linux/types.h>
74759+#include <linux/sysctl.h>
74760+#include <linux/netdevice.h>
74761+#include <linux/ptrace.h>
74762+#include <linux/gracl.h>
74763+#include <linux/gralloc.h>
74764+#include <linux/security.h>
74765+#include <linux/grinternal.h>
74766+#include <linux/pid_namespace.h>
74767+#include <linux/stop_machine.h>
74768+#include <linux/fdtable.h>
74769+#include <linux/percpu.h>
74770+#include <linux/lglock.h>
74771+#include <linux/hugetlb.h>
74772+#include <linux/posix-timers.h>
74773+#include "../fs/mount.h"
74774+
74775+#include <asm/uaccess.h>
74776+#include <asm/errno.h>
74777+#include <asm/mman.h>
74778+
74779+extern struct gr_policy_state *polstate;
74780+
74781+#define FOR_EACH_ROLE_START(role) \
74782+ role = polstate->role_list; \
74783+ while (role) {
74784+
74785+#define FOR_EACH_ROLE_END(role) \
74786+ role = role->prev; \
74787+ }
74788+
74789+struct path gr_real_root;
74790+
74791+extern struct gr_alloc_state *current_alloc_state;
74792+
74793+u16 acl_sp_role_value;
74794+
74795+static DEFINE_MUTEX(gr_dev_mutex);
74796+
74797+extern int chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum);
74798+extern void gr_clear_learn_entries(void);
74799+
74800+struct gr_arg *gr_usermode __read_only;
74801+unsigned char *gr_system_salt __read_only;
74802+unsigned char *gr_system_sum __read_only;
74803+
74804+static unsigned int gr_auth_attempts = 0;
74805+static unsigned long gr_auth_expires = 0UL;
74806+
74807+struct acl_object_label *fakefs_obj_rw;
74808+struct acl_object_label *fakefs_obj_rwx;
74809+
74810+extern int gr_init_uidset(void);
74811+extern void gr_free_uidset(void);
74812+extern void gr_remove_uid(uid_t uid);
74813+extern int gr_find_uid(uid_t uid);
74814+
74815+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);
74816+extern void __gr_apply_subject_to_task(struct gr_policy_state *state, struct task_struct *task, struct acl_subject_label *subj);
74817+extern int gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb);
74818+extern void __insert_inodev_entry(const struct gr_policy_state *state, struct inodev_entry *entry);
74819+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);
74820+extern void insert_acl_obj_label(struct acl_object_label *obj, struct acl_subject_label *subj);
74821+extern void insert_acl_subj_label(struct acl_subject_label *obj, struct acl_role_label *role);
74822+extern struct name_entry * __lookup_name_entry(const struct gr_policy_state *state, const char *name);
74823+extern char *gr_to_filename_rbac(const struct dentry *dentry, const struct vfsmount *mnt);
74824+extern struct acl_subject_label *lookup_acl_subj_label(const u64 ino, const dev_t dev, const struct acl_role_label *role);
74825+extern struct acl_subject_label *lookup_acl_subj_label_deleted(const u64 ino, const dev_t dev, const struct acl_role_label *role);
74826+extern void assign_special_role(const char *rolename);
74827+extern struct acl_subject_label *chk_subj_label(const struct dentry *l_dentry, const struct vfsmount *l_mnt, const struct acl_role_label *role);
74828+extern int gr_rbac_disable(void *unused);
74829+extern void gr_enable_rbac_system(void);
74830+
74831+static int copy_acl_object_label_normal(struct acl_object_label *obj, const struct acl_object_label *userp)
74832+{
74833+ if (copy_from_user(obj, userp, sizeof(struct acl_object_label)))
74834+ return -EFAULT;
74835+
74836+ return 0;
74837+}
74838+
74839+static int copy_acl_ip_label_normal(struct acl_ip_label *ip, const struct acl_ip_label *userp)
74840+{
74841+ if (copy_from_user(ip, userp, sizeof(struct acl_ip_label)))
74842+ return -EFAULT;
74843+
74844+ return 0;
74845+}
74846+
74847+static int copy_acl_subject_label_normal(struct acl_subject_label *subj, const struct acl_subject_label *userp)
74848+{
74849+ if (copy_from_user(subj, userp, sizeof(struct acl_subject_label)))
74850+ return -EFAULT;
74851+
74852+ return 0;
74853+}
74854+
74855+static int copy_acl_role_label_normal(struct acl_role_label *role, const struct acl_role_label *userp)
74856+{
74857+ if (copy_from_user(role, userp, sizeof(struct acl_role_label)))
74858+ return -EFAULT;
74859+
74860+ return 0;
74861+}
74862+
74863+static int copy_role_allowed_ip_normal(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp)
74864+{
74865+ if (copy_from_user(roleip, userp, sizeof(struct role_allowed_ip)))
74866+ return -EFAULT;
74867+
74868+ return 0;
74869+}
74870+
74871+static int copy_sprole_pw_normal(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp)
74872+{
74873+ if (copy_from_user(pw, userp + idx, sizeof(struct sprole_pw)))
74874+ return -EFAULT;
74875+
74876+ return 0;
74877+}
74878+
74879+static int copy_gr_hash_struct_normal(struct gr_hash_struct *hash, const struct gr_hash_struct *userp)
74880+{
74881+ if (copy_from_user(hash, userp, sizeof(struct gr_hash_struct)))
74882+ return -EFAULT;
74883+
74884+ return 0;
74885+}
74886+
74887+static int copy_role_transition_normal(struct role_transition *trans, const struct role_transition *userp)
74888+{
74889+ if (copy_from_user(trans, userp, sizeof(struct role_transition)))
74890+ return -EFAULT;
74891+
74892+ return 0;
74893+}
74894+
74895+int copy_pointer_from_array_normal(void *ptr, unsigned long idx, const void *userp)
74896+{
74897+ if (copy_from_user(ptr, userp + (idx * sizeof(void *)), sizeof(void *)))
74898+ return -EFAULT;
74899+
74900+ return 0;
74901+}
74902+
74903+static int copy_gr_arg_wrapper_normal(const char __user *buf, struct gr_arg_wrapper *uwrap)
74904+{
74905+ if (copy_from_user(uwrap, buf, sizeof (struct gr_arg_wrapper)))
74906+ return -EFAULT;
74907+
74908+ if ((uwrap->version != GRSECURITY_VERSION) ||
74909+ (uwrap->size != sizeof(struct gr_arg)))
74910+ return -EINVAL;
74911+
74912+ return 0;
74913+}
74914+
74915+static int copy_gr_arg_normal(const struct gr_arg __user *buf, struct gr_arg *arg)
74916+{
74917+ if (copy_from_user(arg, buf, sizeof (struct gr_arg)))
74918+ return -EFAULT;
74919+
74920+ return 0;
74921+}
74922+
74923+static size_t get_gr_arg_wrapper_size_normal(void)
74924+{
74925+ return sizeof(struct gr_arg_wrapper);
74926+}
74927+
74928+#ifdef CONFIG_COMPAT
74929+extern int copy_gr_arg_wrapper_compat(const char *buf, struct gr_arg_wrapper *uwrap);
74930+extern int copy_gr_arg_compat(const struct gr_arg __user *buf, struct gr_arg *arg);
74931+extern int copy_acl_object_label_compat(struct acl_object_label *obj, const struct acl_object_label *userp);
74932+extern int copy_acl_subject_label_compat(struct acl_subject_label *subj, const struct acl_subject_label *userp);
74933+extern int copy_acl_role_label_compat(struct acl_role_label *role, const struct acl_role_label *userp);
74934+extern int copy_role_allowed_ip_compat(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp);
74935+extern int copy_role_transition_compat(struct role_transition *trans, const struct role_transition *userp);
74936+extern int copy_gr_hash_struct_compat(struct gr_hash_struct *hash, const struct gr_hash_struct *userp);
74937+extern int copy_pointer_from_array_compat(void *ptr, unsigned long idx, const void *userp);
74938+extern int copy_acl_ip_label_compat(struct acl_ip_label *ip, const struct acl_ip_label *userp);
74939+extern int copy_sprole_pw_compat(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp);
74940+extern size_t get_gr_arg_wrapper_size_compat(void);
74941+
74942+int (* copy_gr_arg_wrapper)(const char *buf, struct gr_arg_wrapper *uwrap) __read_only;
74943+int (* copy_gr_arg)(const struct gr_arg *buf, struct gr_arg *arg) __read_only;
74944+int (* copy_acl_object_label)(struct acl_object_label *obj, const struct acl_object_label *userp) __read_only;
74945+int (* copy_acl_subject_label)(struct acl_subject_label *subj, const struct acl_subject_label *userp) __read_only;
74946+int (* copy_acl_role_label)(struct acl_role_label *role, const struct acl_role_label *userp) __read_only;
74947+int (* copy_acl_ip_label)(struct acl_ip_label *ip, const struct acl_ip_label *userp) __read_only;
74948+int (* copy_pointer_from_array)(void *ptr, unsigned long idx, const void *userp) __read_only;
74949+int (* copy_sprole_pw)(struct sprole_pw *pw, unsigned long idx, const struct sprole_pw *userp) __read_only;
74950+int (* copy_gr_hash_struct)(struct gr_hash_struct *hash, const struct gr_hash_struct *userp) __read_only;
74951+int (* copy_role_transition)(struct role_transition *trans, const struct role_transition *userp) __read_only;
74952+int (* copy_role_allowed_ip)(struct role_allowed_ip *roleip, const struct role_allowed_ip *userp) __read_only;
74953+size_t (* get_gr_arg_wrapper_size)(void) __read_only;
74954+
74955+#else
74956+#define copy_gr_arg_wrapper copy_gr_arg_wrapper_normal
74957+#define copy_gr_arg copy_gr_arg_normal
74958+#define copy_gr_hash_struct copy_gr_hash_struct_normal
74959+#define copy_acl_object_label copy_acl_object_label_normal
74960+#define copy_acl_subject_label copy_acl_subject_label_normal
74961+#define copy_acl_role_label copy_acl_role_label_normal
74962+#define copy_acl_ip_label copy_acl_ip_label_normal
74963+#define copy_pointer_from_array copy_pointer_from_array_normal
74964+#define copy_sprole_pw copy_sprole_pw_normal
74965+#define copy_role_transition copy_role_transition_normal
74966+#define copy_role_allowed_ip copy_role_allowed_ip_normal
74967+#define get_gr_arg_wrapper_size get_gr_arg_wrapper_size_normal
74968+#endif
74969+
74970+static struct acl_subject_label *
74971+lookup_subject_map(const struct acl_subject_label *userp)
74972+{
74973+ unsigned int index = gr_shash(userp, polstate->subj_map_set.s_size);
74974+ struct subject_map *match;
74975+
74976+ match = polstate->subj_map_set.s_hash[index];
74977+
74978+ while (match && match->user != userp)
74979+ match = match->next;
74980+
74981+ if (match != NULL)
74982+ return match->kernel;
74983+ else
74984+ return NULL;
74985+}
74986+
74987+static void
74988+insert_subj_map_entry(struct subject_map *subjmap)
74989+{
74990+ unsigned int index = gr_shash(subjmap->user, polstate->subj_map_set.s_size);
74991+ struct subject_map **curr;
74992+
74993+ subjmap->prev = NULL;
74994+
74995+ curr = &polstate->subj_map_set.s_hash[index];
74996+ if (*curr != NULL)
74997+ (*curr)->prev = subjmap;
74998+
74999+ subjmap->next = *curr;
75000+ *curr = subjmap;
75001+
75002+ return;
75003+}
75004+
75005+static void
75006+__insert_acl_role_label(struct acl_role_label *role, uid_t uidgid)
75007+{
75008+ unsigned int index =
75009+ gr_rhash(uidgid, role->roletype & (GR_ROLE_USER | GR_ROLE_GROUP), polstate->acl_role_set.r_size);
75010+ struct acl_role_label **curr;
75011+ struct acl_role_label *tmp, *tmp2;
75012+
75013+ curr = &polstate->acl_role_set.r_hash[index];
75014+
75015+ /* simple case, slot is empty, just set it to our role */
75016+ if (*curr == NULL) {
75017+ *curr = role;
75018+ } else {
75019+ /* example:
75020+ 1 -> 2 -> 3 (adding 2 -> 3 to here)
75021+ 2 -> 3
75022+ */
75023+ /* first check to see if we can already be reached via this slot */
75024+ tmp = *curr;
75025+ while (tmp && tmp != role)
75026+ tmp = tmp->next;
75027+ if (tmp == role) {
75028+ /* we don't need to add ourselves to this slot's chain */
75029+ return;
75030+ }
75031+ /* we need to add ourselves to this chain, two cases */
75032+ if (role->next == NULL) {
75033+ /* simple case, append the current chain to our role */
75034+ role->next = *curr;
75035+ *curr = role;
75036+ } else {
75037+ /* 1 -> 2 -> 3 -> 4
75038+ 2 -> 3 -> 4
75039+ 3 -> 4 (adding 1 -> 2 -> 3 -> 4 to here)
75040+ */
75041+ /* trickier case: walk our role's chain until we find
75042+ the role for the start of the current slot's chain */
75043+ tmp = role;
75044+ tmp2 = *curr;
75045+ while (tmp->next && tmp->next != tmp2)
75046+ tmp = tmp->next;
75047+ if (tmp->next == tmp2) {
75048+ /* from example above, we found 3, so just
75049+ replace this slot's chain with ours */
75050+ *curr = role;
75051+ } else {
75052+ /* we didn't find a subset of our role's chain
75053+ in the current slot's chain, so append their
75054+ chain to ours, and set us as the first role in
75055+ the slot's chain
75056+
75057+ we could fold this case with the case above,
75058+ but making it explicit for clarity
75059+ */
75060+ tmp->next = tmp2;
75061+ *curr = role;
75062+ }
75063+ }
75064+ }
75065+
75066+ return;
75067+}
75068+
75069+static void
75070+insert_acl_role_label(struct acl_role_label *role)
75071+{
75072+ int i;
75073+
75074+ if (polstate->role_list == NULL) {
75075+ polstate->role_list = role;
75076+ role->prev = NULL;
75077+ } else {
75078+ role->prev = polstate->role_list;
75079+ polstate->role_list = role;
75080+ }
75081+
75082+ /* used for hash chains */
75083+ role->next = NULL;
75084+
75085+ if (role->roletype & GR_ROLE_DOMAIN) {
75086+ for (i = 0; i < role->domain_child_num; i++)
75087+ __insert_acl_role_label(role, role->domain_children[i]);
75088+ } else
75089+ __insert_acl_role_label(role, role->uidgid);
75090+}
75091+
75092+static int
75093+insert_name_entry(char *name, const u64 inode, const dev_t device, __u8 deleted)
75094+{
75095+ struct name_entry **curr, *nentry;
75096+ struct inodev_entry *ientry;
75097+ unsigned int len = strlen(name);
75098+ unsigned int key = full_name_hash(name, len);
75099+ unsigned int index = key % polstate->name_set.n_size;
75100+
75101+ curr = &polstate->name_set.n_hash[index];
75102+
75103+ while (*curr && ((*curr)->key != key || !gr_streq((*curr)->name, name, (*curr)->len, len)))
75104+ curr = &((*curr)->next);
75105+
75106+ if (*curr != NULL)
75107+ return 1;
75108+
75109+ nentry = acl_alloc(sizeof (struct name_entry));
75110+ if (nentry == NULL)
75111+ return 0;
75112+ ientry = acl_alloc(sizeof (struct inodev_entry));
75113+ if (ientry == NULL)
75114+ return 0;
75115+ ientry->nentry = nentry;
75116+
75117+ nentry->key = key;
75118+ nentry->name = name;
75119+ nentry->inode = inode;
75120+ nentry->device = device;
75121+ nentry->len = len;
75122+ nentry->deleted = deleted;
75123+
75124+ nentry->prev = NULL;
75125+ curr = &polstate->name_set.n_hash[index];
75126+ if (*curr != NULL)
75127+ (*curr)->prev = nentry;
75128+ nentry->next = *curr;
75129+ *curr = nentry;
75130+
75131+ /* insert us into the table searchable by inode/dev */
75132+ __insert_inodev_entry(polstate, ientry);
75133+
75134+ return 1;
75135+}
75136+
75137+/* allocating chained hash tables, so optimal size is where lambda ~ 1 */
75138+
75139+static void *
75140+create_table(__u32 * len, int elementsize)
75141+{
75142+ unsigned int table_sizes[] = {
75143+ 7, 13, 31, 61, 127, 251, 509, 1021, 2039, 4093, 8191, 16381,
75144+ 32749, 65521, 131071, 262139, 524287, 1048573, 2097143,
75145+ 4194301, 8388593, 16777213, 33554393, 67108859
75146+ };
75147+ void *newtable = NULL;
75148+ unsigned int pwr = 0;
75149+
75150+ while ((pwr < ((sizeof (table_sizes) / sizeof (table_sizes[0])) - 1)) &&
75151+ table_sizes[pwr] <= *len)
75152+ pwr++;
75153+
75154+ if (table_sizes[pwr] <= *len || (table_sizes[pwr] > ULONG_MAX / elementsize))
75155+ return newtable;
75156+
75157+ if ((table_sizes[pwr] * elementsize) <= PAGE_SIZE)
75158+ newtable =
75159+ kmalloc(table_sizes[pwr] * elementsize, GFP_KERNEL);
75160+ else
75161+ newtable = vmalloc(table_sizes[pwr] * elementsize);
75162+
75163+ *len = table_sizes[pwr];
75164+
75165+ return newtable;
75166+}
75167+
75168+static int
75169+init_variables(const struct gr_arg *arg, bool reload)
75170+{
75171+ struct task_struct *reaper = init_pid_ns.child_reaper;
75172+ unsigned int stacksize;
75173+
75174+ polstate->subj_map_set.s_size = arg->role_db.num_subjects;
75175+ polstate->acl_role_set.r_size = arg->role_db.num_roles + arg->role_db.num_domain_children;
75176+ polstate->name_set.n_size = arg->role_db.num_objects;
75177+ polstate->inodev_set.i_size = arg->role_db.num_objects;
75178+
75179+ if (!polstate->subj_map_set.s_size || !polstate->acl_role_set.r_size ||
75180+ !polstate->name_set.n_size || !polstate->inodev_set.i_size)
75181+ return 1;
75182+
75183+ if (!reload) {
75184+ if (!gr_init_uidset())
75185+ return 1;
75186+ }
75187+
75188+ /* set up the stack that holds allocation info */
75189+
75190+ stacksize = arg->role_db.num_pointers + 5;
75191+
75192+ if (!acl_alloc_stack_init(stacksize))
75193+ return 1;
75194+
75195+ if (!reload) {
75196+ /* grab reference for the real root dentry and vfsmount */
75197+ get_fs_root(reaper->fs, &gr_real_root);
75198+
75199+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
75200+ 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);
75201+#endif
75202+
75203+ fakefs_obj_rw = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
75204+ if (fakefs_obj_rw == NULL)
75205+ return 1;
75206+ fakefs_obj_rw->mode = GR_FIND | GR_READ | GR_WRITE;
75207+
75208+ fakefs_obj_rwx = kzalloc(sizeof(struct acl_object_label), GFP_KERNEL);
75209+ if (fakefs_obj_rwx == NULL)
75210+ return 1;
75211+ fakefs_obj_rwx->mode = GR_FIND | GR_READ | GR_WRITE | GR_EXEC;
75212+ }
75213+
75214+ polstate->subj_map_set.s_hash =
75215+ (struct subject_map **) create_table(&polstate->subj_map_set.s_size, sizeof(void *));
75216+ polstate->acl_role_set.r_hash =
75217+ (struct acl_role_label **) create_table(&polstate->acl_role_set.r_size, sizeof(void *));
75218+ polstate->name_set.n_hash = (struct name_entry **) create_table(&polstate->name_set.n_size, sizeof(void *));
75219+ polstate->inodev_set.i_hash =
75220+ (struct inodev_entry **) create_table(&polstate->inodev_set.i_size, sizeof(void *));
75221+
75222+ if (!polstate->subj_map_set.s_hash || !polstate->acl_role_set.r_hash ||
75223+ !polstate->name_set.n_hash || !polstate->inodev_set.i_hash)
75224+ return 1;
75225+
75226+ memset(polstate->subj_map_set.s_hash, 0,
75227+ sizeof(struct subject_map *) * polstate->subj_map_set.s_size);
75228+ memset(polstate->acl_role_set.r_hash, 0,
75229+ sizeof (struct acl_role_label *) * polstate->acl_role_set.r_size);
75230+ memset(polstate->name_set.n_hash, 0,
75231+ sizeof (struct name_entry *) * polstate->name_set.n_size);
75232+ memset(polstate->inodev_set.i_hash, 0,
75233+ sizeof (struct inodev_entry *) * polstate->inodev_set.i_size);
75234+
75235+ return 0;
75236+}
75237+
75238+/* free information not needed after startup
75239+ currently contains user->kernel pointer mappings for subjects
75240+*/
75241+
75242+static void
75243+free_init_variables(void)
75244+{
75245+ __u32 i;
75246+
75247+ if (polstate->subj_map_set.s_hash) {
75248+ for (i = 0; i < polstate->subj_map_set.s_size; i++) {
75249+ if (polstate->subj_map_set.s_hash[i]) {
75250+ kfree(polstate->subj_map_set.s_hash[i]);
75251+ polstate->subj_map_set.s_hash[i] = NULL;
75252+ }
75253+ }
75254+
75255+ if ((polstate->subj_map_set.s_size * sizeof (struct subject_map *)) <=
75256+ PAGE_SIZE)
75257+ kfree(polstate->subj_map_set.s_hash);
75258+ else
75259+ vfree(polstate->subj_map_set.s_hash);
75260+ }
75261+
75262+ return;
75263+}
75264+
75265+static void
75266+free_variables(bool reload)
75267+{
75268+ struct acl_subject_label *s;
75269+ struct acl_role_label *r;
75270+ struct task_struct *task, *task2;
75271+ unsigned int x;
75272+
75273+ if (!reload) {
75274+ gr_clear_learn_entries();
75275+
75276+ read_lock(&tasklist_lock);
75277+ do_each_thread(task2, task) {
75278+ task->acl_sp_role = 0;
75279+ task->acl_role_id = 0;
75280+ task->inherited = 0;
75281+ task->acl = NULL;
75282+ task->role = NULL;
75283+ } while_each_thread(task2, task);
75284+ read_unlock(&tasklist_lock);
75285+
75286+ kfree(fakefs_obj_rw);
75287+ fakefs_obj_rw = NULL;
75288+ kfree(fakefs_obj_rwx);
75289+ fakefs_obj_rwx = NULL;
75290+
75291+ /* release the reference to the real root dentry and vfsmount */
75292+ path_put(&gr_real_root);
75293+ memset(&gr_real_root, 0, sizeof(gr_real_root));
75294+ }
75295+
75296+ /* free all object hash tables */
75297+
75298+ FOR_EACH_ROLE_START(r)
75299+ if (r->subj_hash == NULL)
75300+ goto next_role;
75301+ FOR_EACH_SUBJECT_START(r, s, x)
75302+ if (s->obj_hash == NULL)
75303+ break;
75304+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
75305+ kfree(s->obj_hash);
75306+ else
75307+ vfree(s->obj_hash);
75308+ FOR_EACH_SUBJECT_END(s, x)
75309+ FOR_EACH_NESTED_SUBJECT_START(r, s)
75310+ if (s->obj_hash == NULL)
75311+ break;
75312+ if ((s->obj_hash_size * sizeof (struct acl_object_label *)) <= PAGE_SIZE)
75313+ kfree(s->obj_hash);
75314+ else
75315+ vfree(s->obj_hash);
75316+ FOR_EACH_NESTED_SUBJECT_END(s)
75317+ if ((r->subj_hash_size * sizeof (struct acl_subject_label *)) <= PAGE_SIZE)
75318+ kfree(r->subj_hash);
75319+ else
75320+ vfree(r->subj_hash);
75321+ r->subj_hash = NULL;
75322+next_role:
75323+ FOR_EACH_ROLE_END(r)
75324+
75325+ acl_free_all();
75326+
75327+ if (polstate->acl_role_set.r_hash) {
75328+ if ((polstate->acl_role_set.r_size * sizeof (struct acl_role_label *)) <=
75329+ PAGE_SIZE)
75330+ kfree(polstate->acl_role_set.r_hash);
75331+ else
75332+ vfree(polstate->acl_role_set.r_hash);
75333+ }
75334+ if (polstate->name_set.n_hash) {
75335+ if ((polstate->name_set.n_size * sizeof (struct name_entry *)) <=
75336+ PAGE_SIZE)
75337+ kfree(polstate->name_set.n_hash);
75338+ else
75339+ vfree(polstate->name_set.n_hash);
75340+ }
75341+
75342+ if (polstate->inodev_set.i_hash) {
75343+ if ((polstate->inodev_set.i_size * sizeof (struct inodev_entry *)) <=
75344+ PAGE_SIZE)
75345+ kfree(polstate->inodev_set.i_hash);
75346+ else
75347+ vfree(polstate->inodev_set.i_hash);
75348+ }
75349+
75350+ if (!reload)
75351+ gr_free_uidset();
75352+
75353+ memset(&polstate->name_set, 0, sizeof (struct name_db));
75354+ memset(&polstate->inodev_set, 0, sizeof (struct inodev_db));
75355+ memset(&polstate->acl_role_set, 0, sizeof (struct acl_role_db));
75356+ memset(&polstate->subj_map_set, 0, sizeof (struct acl_subj_map_db));
75357+
75358+ polstate->default_role = NULL;
75359+ polstate->kernel_role = NULL;
75360+ polstate->role_list = NULL;
75361+
75362+ return;
75363+}
75364+
75365+static struct acl_subject_label *
75366+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied);
75367+
75368+static int alloc_and_copy_string(char **name, unsigned int maxlen)
75369+{
75370+ unsigned int len = strnlen_user(*name, maxlen);
75371+ char *tmp;
75372+
75373+ if (!len || len >= maxlen)
75374+ return -EINVAL;
75375+
75376+ if ((tmp = (char *) acl_alloc(len)) == NULL)
75377+ return -ENOMEM;
75378+
75379+ if (copy_from_user(tmp, *name, len))
75380+ return -EFAULT;
75381+
75382+ tmp[len-1] = '\0';
75383+ *name = tmp;
75384+
75385+ return 0;
75386+}
75387+
75388+static int
75389+copy_user_glob(struct acl_object_label *obj)
75390+{
75391+ struct acl_object_label *g_tmp, **guser;
75392+ int error;
75393+
75394+ if (obj->globbed == NULL)
75395+ return 0;
75396+
75397+ guser = &obj->globbed;
75398+ while (*guser) {
75399+ g_tmp = (struct acl_object_label *)
75400+ acl_alloc(sizeof (struct acl_object_label));
75401+ if (g_tmp == NULL)
75402+ return -ENOMEM;
75403+
75404+ if (copy_acl_object_label(g_tmp, *guser))
75405+ return -EFAULT;
75406+
75407+ error = alloc_and_copy_string(&g_tmp->filename, PATH_MAX);
75408+ if (error)
75409+ return error;
75410+
75411+ *guser = g_tmp;
75412+ guser = &(g_tmp->next);
75413+ }
75414+
75415+ return 0;
75416+}
75417+
75418+static int
75419+copy_user_objs(struct acl_object_label *userp, struct acl_subject_label *subj,
75420+ struct acl_role_label *role)
75421+{
75422+ struct acl_object_label *o_tmp;
75423+ int ret;
75424+
75425+ while (userp) {
75426+ if ((o_tmp = (struct acl_object_label *)
75427+ acl_alloc(sizeof (struct acl_object_label))) == NULL)
75428+ return -ENOMEM;
75429+
75430+ if (copy_acl_object_label(o_tmp, userp))
75431+ return -EFAULT;
75432+
75433+ userp = o_tmp->prev;
75434+
75435+ ret = alloc_and_copy_string(&o_tmp->filename, PATH_MAX);
75436+ if (ret)
75437+ return ret;
75438+
75439+ insert_acl_obj_label(o_tmp, subj);
75440+ if (!insert_name_entry(o_tmp->filename, o_tmp->inode,
75441+ o_tmp->device, (o_tmp->mode & GR_DELETED) ? 1 : 0))
75442+ return -ENOMEM;
75443+
75444+ ret = copy_user_glob(o_tmp);
75445+ if (ret)
75446+ return ret;
75447+
75448+ if (o_tmp->nested) {
75449+ int already_copied;
75450+
75451+ o_tmp->nested = do_copy_user_subj(o_tmp->nested, role, &already_copied);
75452+ if (IS_ERR(o_tmp->nested))
75453+ return PTR_ERR(o_tmp->nested);
75454+
75455+ /* insert into nested subject list if we haven't copied this one yet
75456+ to prevent duplicate entries */
75457+ if (!already_copied) {
75458+ o_tmp->nested->next = role->hash->first;
75459+ role->hash->first = o_tmp->nested;
75460+ }
75461+ }
75462+ }
75463+
75464+ return 0;
75465+}
75466+
75467+static __u32
75468+count_user_subjs(struct acl_subject_label *userp)
75469+{
75470+ struct acl_subject_label s_tmp;
75471+ __u32 num = 0;
75472+
75473+ while (userp) {
75474+ if (copy_acl_subject_label(&s_tmp, userp))
75475+ break;
75476+
75477+ userp = s_tmp.prev;
75478+ }
75479+
75480+ return num;
75481+}
75482+
75483+static int
75484+copy_user_allowedips(struct acl_role_label *rolep)
75485+{
75486+ struct role_allowed_ip *ruserip, *rtmp = NULL, *rlast;
75487+
75488+ ruserip = rolep->allowed_ips;
75489+
75490+ while (ruserip) {
75491+ rlast = rtmp;
75492+
75493+ if ((rtmp = (struct role_allowed_ip *)
75494+ acl_alloc(sizeof (struct role_allowed_ip))) == NULL)
75495+ return -ENOMEM;
75496+
75497+ if (copy_role_allowed_ip(rtmp, ruserip))
75498+ return -EFAULT;
75499+
75500+ ruserip = rtmp->prev;
75501+
75502+ if (!rlast) {
75503+ rtmp->prev = NULL;
75504+ rolep->allowed_ips = rtmp;
75505+ } else {
75506+ rlast->next = rtmp;
75507+ rtmp->prev = rlast;
75508+ }
75509+
75510+ if (!ruserip)
75511+ rtmp->next = NULL;
75512+ }
75513+
75514+ return 0;
75515+}
75516+
75517+static int
75518+copy_user_transitions(struct acl_role_label *rolep)
75519+{
75520+ struct role_transition *rusertp, *rtmp = NULL, *rlast;
75521+ int error;
75522+
75523+ rusertp = rolep->transitions;
75524+
75525+ while (rusertp) {
75526+ rlast = rtmp;
75527+
75528+ if ((rtmp = (struct role_transition *)
75529+ acl_alloc(sizeof (struct role_transition))) == NULL)
75530+ return -ENOMEM;
75531+
75532+ if (copy_role_transition(rtmp, rusertp))
75533+ return -EFAULT;
75534+
75535+ rusertp = rtmp->prev;
75536+
75537+ error = alloc_and_copy_string(&rtmp->rolename, GR_SPROLE_LEN);
75538+ if (error)
75539+ return error;
75540+
75541+ if (!rlast) {
75542+ rtmp->prev = NULL;
75543+ rolep->transitions = rtmp;
75544+ } else {
75545+ rlast->next = rtmp;
75546+ rtmp->prev = rlast;
75547+ }
75548+
75549+ if (!rusertp)
75550+ rtmp->next = NULL;
75551+ }
75552+
75553+ return 0;
75554+}
75555+
75556+static __u32 count_user_objs(const struct acl_object_label __user *userp)
75557+{
75558+ struct acl_object_label o_tmp;
75559+ __u32 num = 0;
75560+
75561+ while (userp) {
75562+ if (copy_acl_object_label(&o_tmp, userp))
75563+ break;
75564+
75565+ userp = o_tmp.prev;
75566+ num++;
75567+ }
75568+
75569+ return num;
75570+}
75571+
75572+static struct acl_subject_label *
75573+do_copy_user_subj(struct acl_subject_label *userp, struct acl_role_label *role, int *already_copied)
75574+{
75575+ struct acl_subject_label *s_tmp = NULL, *s_tmp2;
75576+ __u32 num_objs;
75577+ struct acl_ip_label **i_tmp, *i_utmp2;
75578+ struct gr_hash_struct ghash;
75579+ struct subject_map *subjmap;
75580+ unsigned int i_num;
75581+ int err;
75582+
75583+ if (already_copied != NULL)
75584+ *already_copied = 0;
75585+
75586+ s_tmp = lookup_subject_map(userp);
75587+
75588+ /* we've already copied this subject into the kernel, just return
75589+ the reference to it, and don't copy it over again
75590+ */
75591+ if (s_tmp) {
75592+ if (already_copied != NULL)
75593+ *already_copied = 1;
75594+ return(s_tmp);
75595+ }
75596+
75597+ if ((s_tmp = (struct acl_subject_label *)
75598+ acl_alloc(sizeof (struct acl_subject_label))) == NULL)
75599+ return ERR_PTR(-ENOMEM);
75600+
75601+ subjmap = (struct subject_map *)kmalloc(sizeof (struct subject_map), GFP_KERNEL);
75602+ if (subjmap == NULL)
75603+ return ERR_PTR(-ENOMEM);
75604+
75605+ subjmap->user = userp;
75606+ subjmap->kernel = s_tmp;
75607+ insert_subj_map_entry(subjmap);
75608+
75609+ if (copy_acl_subject_label(s_tmp, userp))
75610+ return ERR_PTR(-EFAULT);
75611+
75612+ err = alloc_and_copy_string(&s_tmp->filename, PATH_MAX);
75613+ if (err)
75614+ return ERR_PTR(err);
75615+
75616+ if (!strcmp(s_tmp->filename, "/"))
75617+ role->root_label = s_tmp;
75618+
75619+ if (copy_gr_hash_struct(&ghash, s_tmp->hash))
75620+ return ERR_PTR(-EFAULT);
75621+
75622+ /* copy user and group transition tables */
75623+
75624+ if (s_tmp->user_trans_num) {
75625+ uid_t *uidlist;
75626+
75627+ uidlist = (uid_t *)acl_alloc_num(s_tmp->user_trans_num, sizeof(uid_t));
75628+ if (uidlist == NULL)
75629+ return ERR_PTR(-ENOMEM);
75630+ if (copy_from_user(uidlist, s_tmp->user_transitions, s_tmp->user_trans_num * sizeof(uid_t)))
75631+ return ERR_PTR(-EFAULT);
75632+
75633+ s_tmp->user_transitions = uidlist;
75634+ }
75635+
75636+ if (s_tmp->group_trans_num) {
75637+ gid_t *gidlist;
75638+
75639+ gidlist = (gid_t *)acl_alloc_num(s_tmp->group_trans_num, sizeof(gid_t));
75640+ if (gidlist == NULL)
75641+ return ERR_PTR(-ENOMEM);
75642+ if (copy_from_user(gidlist, s_tmp->group_transitions, s_tmp->group_trans_num * sizeof(gid_t)))
75643+ return ERR_PTR(-EFAULT);
75644+
75645+ s_tmp->group_transitions = gidlist;
75646+ }
75647+
75648+ /* set up object hash table */
75649+ num_objs = count_user_objs(ghash.first);
75650+
75651+ s_tmp->obj_hash_size = num_objs;
75652+ s_tmp->obj_hash =
75653+ (struct acl_object_label **)
75654+ create_table(&(s_tmp->obj_hash_size), sizeof(void *));
75655+
75656+ if (!s_tmp->obj_hash)
75657+ return ERR_PTR(-ENOMEM);
75658+
75659+ memset(s_tmp->obj_hash, 0,
75660+ s_tmp->obj_hash_size *
75661+ sizeof (struct acl_object_label *));
75662+
75663+ /* add in objects */
75664+ err = copy_user_objs(ghash.first, s_tmp, role);
75665+
75666+ if (err)
75667+ return ERR_PTR(err);
75668+
75669+ /* set pointer for parent subject */
75670+ if (s_tmp->parent_subject) {
75671+ s_tmp2 = do_copy_user_subj(s_tmp->parent_subject, role, NULL);
75672+
75673+ if (IS_ERR(s_tmp2))
75674+ return s_tmp2;
75675+
75676+ s_tmp->parent_subject = s_tmp2;
75677+ }
75678+
75679+ /* add in ip acls */
75680+
75681+ if (!s_tmp->ip_num) {
75682+ s_tmp->ips = NULL;
75683+ goto insert;
75684+ }
75685+
75686+ i_tmp =
75687+ (struct acl_ip_label **) acl_alloc_num(s_tmp->ip_num,
75688+ sizeof (struct acl_ip_label *));
75689+
75690+ if (!i_tmp)
75691+ return ERR_PTR(-ENOMEM);
75692+
75693+ for (i_num = 0; i_num < s_tmp->ip_num; i_num++) {
75694+ *(i_tmp + i_num) =
75695+ (struct acl_ip_label *)
75696+ acl_alloc(sizeof (struct acl_ip_label));
75697+ if (!*(i_tmp + i_num))
75698+ return ERR_PTR(-ENOMEM);
75699+
75700+ if (copy_pointer_from_array(&i_utmp2, i_num, s_tmp->ips))
75701+ return ERR_PTR(-EFAULT);
75702+
75703+ if (copy_acl_ip_label(*(i_tmp + i_num), i_utmp2))
75704+ return ERR_PTR(-EFAULT);
75705+
75706+ if ((*(i_tmp + i_num))->iface == NULL)
75707+ continue;
75708+
75709+ err = alloc_and_copy_string(&(*(i_tmp + i_num))->iface, IFNAMSIZ);
75710+ if (err)
75711+ return ERR_PTR(err);
75712+ }
75713+
75714+ s_tmp->ips = i_tmp;
75715+
75716+insert:
75717+ if (!insert_name_entry(s_tmp->filename, s_tmp->inode,
75718+ s_tmp->device, (s_tmp->mode & GR_DELETED) ? 1 : 0))
75719+ return ERR_PTR(-ENOMEM);
75720+
75721+ return s_tmp;
75722+}
75723+
75724+static int
75725+copy_user_subjs(struct acl_subject_label *userp, struct acl_role_label *role)
75726+{
75727+ struct acl_subject_label s_pre;
75728+ struct acl_subject_label * ret;
75729+ int err;
75730+
75731+ while (userp) {
75732+ if (copy_acl_subject_label(&s_pre, userp))
75733+ return -EFAULT;
75734+
75735+ ret = do_copy_user_subj(userp, role, NULL);
75736+
75737+ err = PTR_ERR(ret);
75738+ if (IS_ERR(ret))
75739+ return err;
75740+
75741+ insert_acl_subj_label(ret, role);
75742+
75743+ userp = s_pre.prev;
75744+ }
75745+
75746+ return 0;
75747+}
75748+
75749+static int
75750+copy_user_acl(struct gr_arg *arg)
75751+{
75752+ struct acl_role_label *r_tmp = NULL, **r_utmp, *r_utmp2;
75753+ struct acl_subject_label *subj_list;
75754+ struct sprole_pw *sptmp;
75755+ struct gr_hash_struct *ghash;
75756+ uid_t *domainlist;
75757+ unsigned int r_num;
75758+ int err = 0;
75759+ __u16 i;
75760+ __u32 num_subjs;
75761+
75762+ /* we need a default and kernel role */
75763+ if (arg->role_db.num_roles < 2)
75764+ return -EINVAL;
75765+
75766+ /* copy special role authentication info from userspace */
75767+
75768+ polstate->num_sprole_pws = arg->num_sprole_pws;
75769+ polstate->acl_special_roles = (struct sprole_pw **) acl_alloc_num(polstate->num_sprole_pws, sizeof(struct sprole_pw *));
75770+
75771+ if (!polstate->acl_special_roles && polstate->num_sprole_pws)
75772+ return -ENOMEM;
75773+
75774+ for (i = 0; i < polstate->num_sprole_pws; i++) {
75775+ sptmp = (struct sprole_pw *) acl_alloc(sizeof(struct sprole_pw));
75776+ if (!sptmp)
75777+ return -ENOMEM;
75778+ if (copy_sprole_pw(sptmp, i, arg->sprole_pws))
75779+ return -EFAULT;
75780+
75781+ err = alloc_and_copy_string((char **)&sptmp->rolename, GR_SPROLE_LEN);
75782+ if (err)
75783+ return err;
75784+
75785+#ifdef CONFIG_GRKERNSEC_RBAC_DEBUG
75786+ printk(KERN_ALERT "Copying special role %s\n", sptmp->rolename);
75787+#endif
75788+
75789+ polstate->acl_special_roles[i] = sptmp;
75790+ }
75791+
75792+ r_utmp = (struct acl_role_label **) arg->role_db.r_table;
75793+
75794+ for (r_num = 0; r_num < arg->role_db.num_roles; r_num++) {
75795+ r_tmp = acl_alloc(sizeof (struct acl_role_label));
75796+
75797+ if (!r_tmp)
75798+ return -ENOMEM;
75799+
75800+ if (copy_pointer_from_array(&r_utmp2, r_num, r_utmp))
75801+ return -EFAULT;
75802+
75803+ if (copy_acl_role_label(r_tmp, r_utmp2))
75804+ return -EFAULT;
75805+
75806+ err = alloc_and_copy_string(&r_tmp->rolename, GR_SPROLE_LEN);
75807+ if (err)
75808+ return err;
75809+
75810+ if (!strcmp(r_tmp->rolename, "default")
75811+ && (r_tmp->roletype & GR_ROLE_DEFAULT)) {
75812+ polstate->default_role = r_tmp;
75813+ } else if (!strcmp(r_tmp->rolename, ":::kernel:::")) {
75814+ polstate->kernel_role = r_tmp;
75815+ }
75816+
75817+ if ((ghash = (struct gr_hash_struct *) acl_alloc(sizeof(struct gr_hash_struct))) == NULL)
75818+ return -ENOMEM;
75819+
75820+ if (copy_gr_hash_struct(ghash, r_tmp->hash))
75821+ return -EFAULT;
75822+
75823+ r_tmp->hash = ghash;
75824+
75825+ num_subjs = count_user_subjs(r_tmp->hash->first);
75826+
75827+ r_tmp->subj_hash_size = num_subjs;
75828+ r_tmp->subj_hash =
75829+ (struct acl_subject_label **)
75830+ create_table(&(r_tmp->subj_hash_size), sizeof(void *));
75831+
75832+ if (!r_tmp->subj_hash)
75833+ return -ENOMEM;
75834+
75835+ err = copy_user_allowedips(r_tmp);
75836+ if (err)
75837+ return err;
75838+
75839+ /* copy domain info */
75840+ if (r_tmp->domain_children != NULL) {
75841+ domainlist = acl_alloc_num(r_tmp->domain_child_num, sizeof(uid_t));
75842+ if (domainlist == NULL)
75843+ return -ENOMEM;
75844+
75845+ if (copy_from_user(domainlist, r_tmp->domain_children, r_tmp->domain_child_num * sizeof(uid_t)))
75846+ return -EFAULT;
75847+
75848+ r_tmp->domain_children = domainlist;
75849+ }
75850+
75851+ err = copy_user_transitions(r_tmp);
75852+ if (err)
75853+ return err;
75854+
75855+ memset(r_tmp->subj_hash, 0,
75856+ r_tmp->subj_hash_size *
75857+ sizeof (struct acl_subject_label *));
75858+
75859+ /* acquire the list of subjects, then NULL out
75860+ the list prior to parsing the subjects for this role,
75861+ as during this parsing the list is replaced with a list
75862+ of *nested* subjects for the role
75863+ */
75864+ subj_list = r_tmp->hash->first;
75865+
75866+ /* set nested subject list to null */
75867+ r_tmp->hash->first = NULL;
75868+
75869+ err = copy_user_subjs(subj_list, r_tmp);
75870+
75871+ if (err)
75872+ return err;
75873+
75874+ insert_acl_role_label(r_tmp);
75875+ }
75876+
75877+ if (polstate->default_role == NULL || polstate->kernel_role == NULL)
75878+ return -EINVAL;
75879+
75880+ return err;
75881+}
75882+
75883+static int gracl_reload_apply_policies(void *reload)
75884+{
75885+ struct gr_reload_state *reload_state = (struct gr_reload_state *)reload;
75886+ struct task_struct *task, *task2;
75887+ struct acl_role_label *role, *rtmp;
75888+ struct acl_subject_label *subj;
75889+ const struct cred *cred;
75890+ int role_applied;
75891+ int ret = 0;
75892+
75893+ memcpy(&reload_state->oldpolicy, reload_state->oldpolicy_ptr, sizeof(struct gr_policy_state));
75894+ memcpy(&reload_state->oldalloc, reload_state->oldalloc_ptr, sizeof(struct gr_alloc_state));
75895+
75896+ /* first make sure we'll be able to apply the new policy cleanly */
75897+ do_each_thread(task2, task) {
75898+ if (task->exec_file == NULL)
75899+ continue;
75900+ role_applied = 0;
75901+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
75902+ /* preserve special roles */
75903+ FOR_EACH_ROLE_START(role)
75904+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
75905+ rtmp = task->role;
75906+ task->role = role;
75907+ role_applied = 1;
75908+ break;
75909+ }
75910+ FOR_EACH_ROLE_END(role)
75911+ }
75912+ if (!role_applied) {
75913+ cred = __task_cred(task);
75914+ rtmp = task->role;
75915+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
75916+ }
75917+ /* this handles non-nested inherited subjects, nested subjects will still
75918+ be dropped currently */
75919+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
75920+ task->tmpacl = __gr_get_subject_for_task(polstate, task, NULL, 1);
75921+ /* change the role back so that we've made no modifications to the policy */
75922+ task->role = rtmp;
75923+
75924+ if (subj == NULL || task->tmpacl == NULL) {
75925+ ret = -EINVAL;
75926+ goto out;
75927+ }
75928+ } while_each_thread(task2, task);
75929+
75930+ /* now actually apply the policy */
75931+
75932+ do_each_thread(task2, task) {
75933+ if (task->exec_file) {
75934+ role_applied = 0;
75935+ if (!reload_state->oldmode && task->role->roletype & GR_ROLE_SPECIAL) {
75936+ /* preserve special roles */
75937+ FOR_EACH_ROLE_START(role)
75938+ if ((role->roletype & GR_ROLE_SPECIAL) && !strcmp(task->role->rolename, role->rolename)) {
75939+ task->role = role;
75940+ role_applied = 1;
75941+ break;
75942+ }
75943+ FOR_EACH_ROLE_END(role)
75944+ }
75945+ if (!role_applied) {
75946+ cred = __task_cred(task);
75947+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
75948+ }
75949+ /* this handles non-nested inherited subjects, nested subjects will still
75950+ be dropped currently */
75951+ if (!reload_state->oldmode && task->inherited)
75952+ subj = __gr_get_subject_for_task(polstate, task, task->acl->filename, 1);
75953+ else {
75954+ /* looked up and tagged to the task previously */
75955+ subj = task->tmpacl;
75956+ }
75957+ /* subj will be non-null */
75958+ __gr_apply_subject_to_task(polstate, task, subj);
75959+ if (reload_state->oldmode) {
75960+ task->acl_role_id = 0;
75961+ task->acl_sp_role = 0;
75962+ task->inherited = 0;
75963+ }
75964+ } else {
75965+ // it's a kernel process
75966+ task->role = polstate->kernel_role;
75967+ task->acl = polstate->kernel_role->root_label;
75968+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
75969+ task->acl->mode &= ~GR_PROCFIND;
75970+#endif
75971+ }
75972+ } while_each_thread(task2, task);
75973+
75974+ memcpy(reload_state->oldpolicy_ptr, &reload_state->newpolicy, sizeof(struct gr_policy_state));
75975+ memcpy(reload_state->oldalloc_ptr, &reload_state->newalloc, sizeof(struct gr_alloc_state));
75976+
75977+out:
75978+
75979+ return ret;
75980+}
75981+
75982+static int gracl_reload(struct gr_arg *args, unsigned char oldmode)
75983+{
75984+ struct gr_reload_state new_reload_state = { };
75985+ int err;
75986+
75987+ new_reload_state.oldpolicy_ptr = polstate;
75988+ new_reload_state.oldalloc_ptr = current_alloc_state;
75989+ new_reload_state.oldmode = oldmode;
75990+
75991+ current_alloc_state = &new_reload_state.newalloc;
75992+ polstate = &new_reload_state.newpolicy;
75993+
75994+ /* everything relevant is now saved off, copy in the new policy */
75995+ if (init_variables(args, true)) {
75996+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
75997+ err = -ENOMEM;
75998+ goto error;
75999+ }
76000+
76001+ err = copy_user_acl(args);
76002+ free_init_variables();
76003+ if (err)
76004+ goto error;
76005+ /* the new policy is copied in, with the old policy available via saved_state
76006+ first go through applying roles, making sure to preserve special roles
76007+ then apply new subjects, making sure to preserve inherited and nested subjects,
76008+ though currently only inherited subjects will be preserved
76009+ */
76010+ err = stop_machine(gracl_reload_apply_policies, &new_reload_state, NULL);
76011+ if (err)
76012+ goto error;
76013+
76014+ /* we've now applied the new policy, so restore the old policy state to free it */
76015+ polstate = &new_reload_state.oldpolicy;
76016+ current_alloc_state = &new_reload_state.oldalloc;
76017+ free_variables(true);
76018+
76019+ /* oldpolicy/oldalloc_ptr point to the new policy/alloc states as they were copied
76020+ to running_polstate/current_alloc_state inside stop_machine
76021+ */
76022+ err = 0;
76023+ goto out;
76024+error:
76025+ /* on error of loading the new policy, we'll just keep the previous
76026+ policy set around
76027+ */
76028+ free_variables(true);
76029+
76030+ /* doesn't affect runtime, but maintains consistent state */
76031+out:
76032+ polstate = new_reload_state.oldpolicy_ptr;
76033+ current_alloc_state = new_reload_state.oldalloc_ptr;
76034+
76035+ return err;
76036+}
76037+
76038+static int
76039+gracl_init(struct gr_arg *args)
76040+{
76041+ int error = 0;
76042+
76043+ memcpy(gr_system_salt, args->salt, GR_SALT_LEN);
76044+ memcpy(gr_system_sum, args->sum, GR_SHA_LEN);
76045+
76046+ if (init_variables(args, false)) {
76047+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_INITF_ACL_MSG, GR_VERSION);
76048+ error = -ENOMEM;
76049+ goto out;
76050+ }
76051+
76052+ error = copy_user_acl(args);
76053+ free_init_variables();
76054+ if (error)
76055+ goto out;
76056+
76057+ error = gr_set_acls(0);
76058+ if (error)
76059+ goto out;
76060+
76061+ gr_enable_rbac_system();
76062+
76063+ return 0;
76064+
76065+out:
76066+ free_variables(false);
76067+ return error;
76068+}
76069+
76070+static int
76071+lookup_special_role_auth(__u16 mode, const char *rolename, unsigned char **salt,
76072+ unsigned char **sum)
76073+{
76074+ struct acl_role_label *r;
76075+ struct role_allowed_ip *ipp;
76076+ struct role_transition *trans;
76077+ unsigned int i;
76078+ int found = 0;
76079+ u32 curr_ip = current->signal->curr_ip;
76080+
76081+ current->signal->saved_ip = curr_ip;
76082+
76083+ /* check transition table */
76084+
76085+ for (trans = current->role->transitions; trans; trans = trans->next) {
76086+ if (!strcmp(rolename, trans->rolename)) {
76087+ found = 1;
76088+ break;
76089+ }
76090+ }
76091+
76092+ if (!found)
76093+ return 0;
76094+
76095+ /* handle special roles that do not require authentication
76096+ and check ip */
76097+
76098+ FOR_EACH_ROLE_START(r)
76099+ if (!strcmp(rolename, r->rolename) &&
76100+ (r->roletype & GR_ROLE_SPECIAL)) {
76101+ found = 0;
76102+ if (r->allowed_ips != NULL) {
76103+ for (ipp = r->allowed_ips; ipp; ipp = ipp->next) {
76104+ if ((ntohl(curr_ip) & ipp->netmask) ==
76105+ (ntohl(ipp->addr) & ipp->netmask))
76106+ found = 1;
76107+ }
76108+ } else
76109+ found = 2;
76110+ if (!found)
76111+ return 0;
76112+
76113+ if (((mode == GR_SPROLE) && (r->roletype & GR_ROLE_NOPW)) ||
76114+ ((mode == GR_SPROLEPAM) && (r->roletype & GR_ROLE_PAM))) {
76115+ *salt = NULL;
76116+ *sum = NULL;
76117+ return 1;
76118+ }
76119+ }
76120+ FOR_EACH_ROLE_END(r)
76121+
76122+ for (i = 0; i < polstate->num_sprole_pws; i++) {
76123+ if (!strcmp(rolename, polstate->acl_special_roles[i]->rolename)) {
76124+ *salt = polstate->acl_special_roles[i]->salt;
76125+ *sum = polstate->acl_special_roles[i]->sum;
76126+ return 1;
76127+ }
76128+ }
76129+
76130+ return 0;
76131+}
76132+
76133+int gr_check_secure_terminal(struct task_struct *task)
76134+{
76135+ struct task_struct *p, *p2, *p3;
76136+ struct files_struct *files;
76137+ struct fdtable *fdt;
76138+ struct file *our_file = NULL, *file;
76139+ int i;
76140+
76141+ if (task->signal->tty == NULL)
76142+ return 1;
76143+
76144+ files = get_files_struct(task);
76145+ if (files != NULL) {
76146+ rcu_read_lock();
76147+ fdt = files_fdtable(files);
76148+ for (i=0; i < fdt->max_fds; i++) {
76149+ file = fcheck_files(files, i);
76150+ if (file && (our_file == NULL) && (file->private_data == task->signal->tty)) {
76151+ get_file(file);
76152+ our_file = file;
76153+ }
76154+ }
76155+ rcu_read_unlock();
76156+ put_files_struct(files);
76157+ }
76158+
76159+ if (our_file == NULL)
76160+ return 1;
76161+
76162+ read_lock(&tasklist_lock);
76163+ do_each_thread(p2, p) {
76164+ files = get_files_struct(p);
76165+ if (files == NULL ||
76166+ (p->signal && p->signal->tty == task->signal->tty)) {
76167+ if (files != NULL)
76168+ put_files_struct(files);
76169+ continue;
76170+ }
76171+ rcu_read_lock();
76172+ fdt = files_fdtable(files);
76173+ for (i=0; i < fdt->max_fds; i++) {
76174+ file = fcheck_files(files, i);
76175+ if (file && S_ISCHR(file->f_path.dentry->d_inode->i_mode) &&
76176+ file->f_path.dentry->d_inode->i_rdev == our_file->f_path.dentry->d_inode->i_rdev) {
76177+ p3 = task;
76178+ while (task_pid_nr(p3) > 0) {
76179+ if (p3 == p)
76180+ break;
76181+ p3 = p3->real_parent;
76182+ }
76183+ if (p3 == p)
76184+ break;
76185+ gr_log_ttysniff(GR_DONT_AUDIT_GOOD, GR_TTYSNIFF_ACL_MSG, p);
76186+ gr_handle_alertkill(p);
76187+ rcu_read_unlock();
76188+ put_files_struct(files);
76189+ read_unlock(&tasklist_lock);
76190+ fput(our_file);
76191+ return 0;
76192+ }
76193+ }
76194+ rcu_read_unlock();
76195+ put_files_struct(files);
76196+ } while_each_thread(p2, p);
76197+ read_unlock(&tasklist_lock);
76198+
76199+ fput(our_file);
76200+ return 1;
76201+}
76202+
76203+ssize_t
76204+write_grsec_handler(struct file *file, const char __user * buf, size_t count, loff_t *ppos)
76205+{
76206+ struct gr_arg_wrapper uwrap;
76207+ unsigned char *sprole_salt = NULL;
76208+ unsigned char *sprole_sum = NULL;
76209+ int error = 0;
76210+ int error2 = 0;
76211+ size_t req_count = 0;
76212+ unsigned char oldmode = 0;
76213+
76214+ mutex_lock(&gr_dev_mutex);
76215+
76216+ if (gr_acl_is_enabled() && !(current->acl->mode & GR_KERNELAUTH)) {
76217+ error = -EPERM;
76218+ goto out;
76219+ }
76220+
76221+#ifdef CONFIG_COMPAT
76222+ pax_open_kernel();
76223+ if (is_compat_task()) {
76224+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_compat;
76225+ copy_gr_arg = &copy_gr_arg_compat;
76226+ copy_acl_object_label = &copy_acl_object_label_compat;
76227+ copy_acl_subject_label = &copy_acl_subject_label_compat;
76228+ copy_acl_role_label = &copy_acl_role_label_compat;
76229+ copy_acl_ip_label = &copy_acl_ip_label_compat;
76230+ copy_role_allowed_ip = &copy_role_allowed_ip_compat;
76231+ copy_role_transition = &copy_role_transition_compat;
76232+ copy_sprole_pw = &copy_sprole_pw_compat;
76233+ copy_gr_hash_struct = &copy_gr_hash_struct_compat;
76234+ copy_pointer_from_array = &copy_pointer_from_array_compat;
76235+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_compat;
76236+ } else {
76237+ copy_gr_arg_wrapper = &copy_gr_arg_wrapper_normal;
76238+ copy_gr_arg = &copy_gr_arg_normal;
76239+ copy_acl_object_label = &copy_acl_object_label_normal;
76240+ copy_acl_subject_label = &copy_acl_subject_label_normal;
76241+ copy_acl_role_label = &copy_acl_role_label_normal;
76242+ copy_acl_ip_label = &copy_acl_ip_label_normal;
76243+ copy_role_allowed_ip = &copy_role_allowed_ip_normal;
76244+ copy_role_transition = &copy_role_transition_normal;
76245+ copy_sprole_pw = &copy_sprole_pw_normal;
76246+ copy_gr_hash_struct = &copy_gr_hash_struct_normal;
76247+ copy_pointer_from_array = &copy_pointer_from_array_normal;
76248+ get_gr_arg_wrapper_size = &get_gr_arg_wrapper_size_normal;
76249+ }
76250+ pax_close_kernel();
76251+#endif
76252+
76253+ req_count = get_gr_arg_wrapper_size();
76254+
76255+ if (count != req_count) {
76256+ gr_log_int_int(GR_DONT_AUDIT_GOOD, GR_DEV_ACL_MSG, (int)count, (int)req_count);
76257+ error = -EINVAL;
76258+ goto out;
76259+ }
76260+
76261+
76262+ if (gr_auth_expires && time_after_eq(get_seconds(), gr_auth_expires)) {
76263+ gr_auth_expires = 0;
76264+ gr_auth_attempts = 0;
76265+ }
76266+
76267+ error = copy_gr_arg_wrapper(buf, &uwrap);
76268+ if (error)
76269+ goto out;
76270+
76271+ error = copy_gr_arg(uwrap.arg, gr_usermode);
76272+ if (error)
76273+ goto out;
76274+
76275+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_SPROLEPAM &&
76276+ gr_auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
76277+ time_after(gr_auth_expires, get_seconds())) {
76278+ error = -EBUSY;
76279+ goto out;
76280+ }
76281+
76282+ /* if non-root trying to do anything other than use a special role,
76283+ do not attempt authentication, do not count towards authentication
76284+ locking
76285+ */
76286+
76287+ if (gr_usermode->mode != GR_SPROLE && gr_usermode->mode != GR_STATUS &&
76288+ gr_usermode->mode != GR_UNSPROLE && gr_usermode->mode != GR_SPROLEPAM &&
76289+ gr_is_global_nonroot(current_uid())) {
76290+ error = -EPERM;
76291+ goto out;
76292+ }
76293+
76294+ /* ensure pw and special role name are null terminated */
76295+
76296+ gr_usermode->pw[GR_PW_LEN - 1] = '\0';
76297+ gr_usermode->sp_role[GR_SPROLE_LEN - 1] = '\0';
76298+
76299+ /* Okay.
76300+ * We have our enough of the argument structure..(we have yet
76301+ * to copy_from_user the tables themselves) . Copy the tables
76302+ * only if we need them, i.e. for loading operations. */
76303+
76304+ switch (gr_usermode->mode) {
76305+ case GR_STATUS:
76306+ if (gr_acl_is_enabled()) {
76307+ error = 1;
76308+ if (!gr_check_secure_terminal(current))
76309+ error = 3;
76310+ } else
76311+ error = 2;
76312+ goto out;
76313+ case GR_SHUTDOWN:
76314+ if (gr_acl_is_enabled() && !(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
76315+ stop_machine(gr_rbac_disable, NULL, NULL);
76316+ free_variables(false);
76317+ memset(gr_usermode, 0, sizeof(struct gr_arg));
76318+ memset(gr_system_salt, 0, GR_SALT_LEN);
76319+ memset(gr_system_sum, 0, GR_SHA_LEN);
76320+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTS_ACL_MSG);
76321+ } else if (gr_acl_is_enabled()) {
76322+ gr_log_noargs(GR_DONT_AUDIT, GR_SHUTF_ACL_MSG);
76323+ error = -EPERM;
76324+ } else {
76325+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SHUTI_ACL_MSG);
76326+ error = -EAGAIN;
76327+ }
76328+ break;
76329+ case GR_ENABLE:
76330+ if (!gr_acl_is_enabled() && !(error2 = gracl_init(gr_usermode)))
76331+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_ENABLE_ACL_MSG, GR_VERSION);
76332+ else {
76333+ if (gr_acl_is_enabled())
76334+ error = -EAGAIN;
76335+ else
76336+ error = error2;
76337+ gr_log_str(GR_DONT_AUDIT, GR_ENABLEF_ACL_MSG, GR_VERSION);
76338+ }
76339+ break;
76340+ case GR_OLDRELOAD:
76341+ oldmode = 1;
76342+ case GR_RELOAD:
76343+ if (!gr_acl_is_enabled()) {
76344+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOADI_ACL_MSG, GR_VERSION);
76345+ error = -EAGAIN;
76346+ } else if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
76347+ error2 = gracl_reload(gr_usermode, oldmode);
76348+ if (!error2)
76349+ gr_log_str(GR_DONT_AUDIT_GOOD, GR_RELOAD_ACL_MSG, GR_VERSION);
76350+ else {
76351+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
76352+ error = error2;
76353+ }
76354+ } else {
76355+ gr_log_str(GR_DONT_AUDIT, GR_RELOADF_ACL_MSG, GR_VERSION);
76356+ error = -EPERM;
76357+ }
76358+ break;
76359+ case GR_SEGVMOD:
76360+ if (unlikely(!gr_acl_is_enabled())) {
76361+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODI_ACL_MSG);
76362+ error = -EAGAIN;
76363+ break;
76364+ }
76365+
76366+ if (!(chkpw(gr_usermode, gr_system_salt, gr_system_sum))) {
76367+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SEGVMODS_ACL_MSG);
76368+ if (gr_usermode->segv_device && gr_usermode->segv_inode) {
76369+ struct acl_subject_label *segvacl;
76370+ segvacl =
76371+ lookup_acl_subj_label(gr_usermode->segv_inode,
76372+ gr_usermode->segv_device,
76373+ current->role);
76374+ if (segvacl) {
76375+ segvacl->crashes = 0;
76376+ segvacl->expires = 0;
76377+ }
76378+ } else if (gr_find_uid(gr_usermode->segv_uid) >= 0) {
76379+ gr_remove_uid(gr_usermode->segv_uid);
76380+ }
76381+ } else {
76382+ gr_log_noargs(GR_DONT_AUDIT, GR_SEGVMODF_ACL_MSG);
76383+ error = -EPERM;
76384+ }
76385+ break;
76386+ case GR_SPROLE:
76387+ case GR_SPROLEPAM:
76388+ if (unlikely(!gr_acl_is_enabled())) {
76389+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_SPROLEI_ACL_MSG);
76390+ error = -EAGAIN;
76391+ break;
76392+ }
76393+
76394+ if (current->role->expires && time_after_eq(get_seconds(), current->role->expires)) {
76395+ current->role->expires = 0;
76396+ current->role->auth_attempts = 0;
76397+ }
76398+
76399+ if (current->role->auth_attempts >= CONFIG_GRKERNSEC_ACL_MAXTRIES &&
76400+ time_after(current->role->expires, get_seconds())) {
76401+ error = -EBUSY;
76402+ goto out;
76403+ }
76404+
76405+ if (lookup_special_role_auth
76406+ (gr_usermode->mode, gr_usermode->sp_role, &sprole_salt, &sprole_sum)
76407+ && ((!sprole_salt && !sprole_sum)
76408+ || !(chkpw(gr_usermode, sprole_salt, sprole_sum)))) {
76409+ char *p = "";
76410+ assign_special_role(gr_usermode->sp_role);
76411+ read_lock(&tasklist_lock);
76412+ if (current->real_parent)
76413+ p = current->real_parent->role->rolename;
76414+ read_unlock(&tasklist_lock);
76415+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_SPROLES_ACL_MSG,
76416+ p, acl_sp_role_value);
76417+ } else {
76418+ gr_log_str(GR_DONT_AUDIT, GR_SPROLEF_ACL_MSG, gr_usermode->sp_role);
76419+ error = -EPERM;
76420+ if(!(current->role->auth_attempts++))
76421+ current->role->expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
76422+
76423+ goto out;
76424+ }
76425+ break;
76426+ case GR_UNSPROLE:
76427+ if (unlikely(!gr_acl_is_enabled())) {
76428+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_UNSPROLEI_ACL_MSG);
76429+ error = -EAGAIN;
76430+ break;
76431+ }
76432+
76433+ if (current->role->roletype & GR_ROLE_SPECIAL) {
76434+ char *p = "";
76435+ int i = 0;
76436+
76437+ read_lock(&tasklist_lock);
76438+ if (current->real_parent) {
76439+ p = current->real_parent->role->rolename;
76440+ i = current->real_parent->acl_role_id;
76441+ }
76442+ read_unlock(&tasklist_lock);
76443+
76444+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_UNSPROLES_ACL_MSG, p, i);
76445+ gr_set_acls(1);
76446+ } else {
76447+ error = -EPERM;
76448+ goto out;
76449+ }
76450+ break;
76451+ default:
76452+ gr_log_int(GR_DONT_AUDIT, GR_INVMODE_ACL_MSG, gr_usermode->mode);
76453+ error = -EINVAL;
76454+ break;
76455+ }
76456+
76457+ if (error != -EPERM)
76458+ goto out;
76459+
76460+ if(!(gr_auth_attempts++))
76461+ gr_auth_expires = get_seconds() + CONFIG_GRKERNSEC_ACL_TIMEOUT;
76462+
76463+ out:
76464+ mutex_unlock(&gr_dev_mutex);
76465+
76466+ if (!error)
76467+ error = req_count;
76468+
76469+ return error;
76470+}
76471+
76472+int
76473+gr_set_acls(const int type)
76474+{
76475+ struct task_struct *task, *task2;
76476+ struct acl_role_label *role = current->role;
76477+ struct acl_subject_label *subj;
76478+ __u16 acl_role_id = current->acl_role_id;
76479+ const struct cred *cred;
76480+ int ret;
76481+
76482+ rcu_read_lock();
76483+ read_lock(&tasklist_lock);
76484+ read_lock(&grsec_exec_file_lock);
76485+ do_each_thread(task2, task) {
76486+ /* check to see if we're called from the exit handler,
76487+ if so, only replace ACLs that have inherited the admin
76488+ ACL */
76489+
76490+ if (type && (task->role != role ||
76491+ task->acl_role_id != acl_role_id))
76492+ continue;
76493+
76494+ task->acl_role_id = 0;
76495+ task->acl_sp_role = 0;
76496+ task->inherited = 0;
76497+
76498+ if (task->exec_file) {
76499+ cred = __task_cred(task);
76500+ task->role = __lookup_acl_role_label(polstate, task, GR_GLOBAL_UID(cred->uid), GR_GLOBAL_GID(cred->gid));
76501+ subj = __gr_get_subject_for_task(polstate, task, NULL, 1);
76502+ if (subj == NULL) {
76503+ ret = -EINVAL;
76504+ read_unlock(&grsec_exec_file_lock);
76505+ read_unlock(&tasklist_lock);
76506+ rcu_read_unlock();
76507+ gr_log_str_int(GR_DONT_AUDIT_GOOD, GR_DEFACL_MSG, task->comm, task_pid_nr(task));
76508+ return ret;
76509+ }
76510+ __gr_apply_subject_to_task(polstate, task, subj);
76511+ } else {
76512+ // it's a kernel process
76513+ task->role = polstate->kernel_role;
76514+ task->acl = polstate->kernel_role->root_label;
76515+#ifdef CONFIG_GRKERNSEC_ACL_HIDEKERN
76516+ task->acl->mode &= ~GR_PROCFIND;
76517+#endif
76518+ }
76519+ } while_each_thread(task2, task);
76520+ read_unlock(&grsec_exec_file_lock);
76521+ read_unlock(&tasklist_lock);
76522+ rcu_read_unlock();
76523+
76524+ return 0;
76525+}
76526diff --git a/grsecurity/gracl_res.c b/grsecurity/gracl_res.c
76527new file mode 100644
76528index 0000000..39645c9
76529--- /dev/null
76530+++ b/grsecurity/gracl_res.c
76531@@ -0,0 +1,68 @@
76532+#include <linux/kernel.h>
76533+#include <linux/sched.h>
76534+#include <linux/gracl.h>
76535+#include <linux/grinternal.h>
76536+
76537+static const char *restab_log[] = {
76538+ [RLIMIT_CPU] = "RLIMIT_CPU",
76539+ [RLIMIT_FSIZE] = "RLIMIT_FSIZE",
76540+ [RLIMIT_DATA] = "RLIMIT_DATA",
76541+ [RLIMIT_STACK] = "RLIMIT_STACK",
76542+ [RLIMIT_CORE] = "RLIMIT_CORE",
76543+ [RLIMIT_RSS] = "RLIMIT_RSS",
76544+ [RLIMIT_NPROC] = "RLIMIT_NPROC",
76545+ [RLIMIT_NOFILE] = "RLIMIT_NOFILE",
76546+ [RLIMIT_MEMLOCK] = "RLIMIT_MEMLOCK",
76547+ [RLIMIT_AS] = "RLIMIT_AS",
76548+ [RLIMIT_LOCKS] = "RLIMIT_LOCKS",
76549+ [RLIMIT_SIGPENDING] = "RLIMIT_SIGPENDING",
76550+ [RLIMIT_MSGQUEUE] = "RLIMIT_MSGQUEUE",
76551+ [RLIMIT_NICE] = "RLIMIT_NICE",
76552+ [RLIMIT_RTPRIO] = "RLIMIT_RTPRIO",
76553+ [RLIMIT_RTTIME] = "RLIMIT_RTTIME",
76554+ [GR_CRASH_RES] = "RLIMIT_CRASH"
76555+};
76556+
76557+void
76558+gr_log_resource(const struct task_struct *task,
76559+ const int res, const unsigned long wanted, const int gt)
76560+{
76561+ const struct cred *cred;
76562+ unsigned long rlim;
76563+
76564+ if (!gr_acl_is_enabled() && !grsec_resource_logging)
76565+ return;
76566+
76567+ // not yet supported resource
76568+ if (unlikely(!restab_log[res]))
76569+ return;
76570+
76571+ if (res == RLIMIT_CPU || res == RLIMIT_RTTIME)
76572+ rlim = task_rlimit_max(task, res);
76573+ else
76574+ rlim = task_rlimit(task, res);
76575+
76576+ if (likely((rlim == RLIM_INFINITY) || (gt && wanted <= rlim) || (!gt && wanted < rlim)))
76577+ return;
76578+
76579+ rcu_read_lock();
76580+ cred = __task_cred(task);
76581+
76582+ if (res == RLIMIT_NPROC &&
76583+ (cap_raised(cred->cap_effective, CAP_SYS_ADMIN) ||
76584+ cap_raised(cred->cap_effective, CAP_SYS_RESOURCE)))
76585+ goto out_rcu_unlock;
76586+ else if (res == RLIMIT_MEMLOCK &&
76587+ cap_raised(cred->cap_effective, CAP_IPC_LOCK))
76588+ goto out_rcu_unlock;
76589+ else if (res == RLIMIT_NICE && cap_raised(cred->cap_effective, CAP_SYS_NICE))
76590+ goto out_rcu_unlock;
76591+ rcu_read_unlock();
76592+
76593+ gr_log_res_ulong2_str(GR_DONT_AUDIT, GR_RESOURCE_MSG, task, wanted, restab_log[res], rlim);
76594+
76595+ return;
76596+out_rcu_unlock:
76597+ rcu_read_unlock();
76598+ return;
76599+}
76600diff --git a/grsecurity/gracl_segv.c b/grsecurity/gracl_segv.c
76601new file mode 100644
76602index 0000000..218b66b
76603--- /dev/null
76604+++ b/grsecurity/gracl_segv.c
76605@@ -0,0 +1,324 @@
76606+#include <linux/kernel.h>
76607+#include <linux/mm.h>
76608+#include <asm/uaccess.h>
76609+#include <asm/errno.h>
76610+#include <asm/mman.h>
76611+#include <net/sock.h>
76612+#include <linux/file.h>
76613+#include <linux/fs.h>
76614+#include <linux/net.h>
76615+#include <linux/in.h>
76616+#include <linux/slab.h>
76617+#include <linux/types.h>
76618+#include <linux/sched.h>
76619+#include <linux/timer.h>
76620+#include <linux/gracl.h>
76621+#include <linux/grsecurity.h>
76622+#include <linux/grinternal.h>
76623+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
76624+#include <linux/magic.h>
76625+#include <linux/pagemap.h>
76626+#include "../fs/btrfs/async-thread.h"
76627+#include "../fs/btrfs/ctree.h"
76628+#include "../fs/btrfs/btrfs_inode.h"
76629+#endif
76630+
76631+static struct crash_uid *uid_set;
76632+static unsigned short uid_used;
76633+static DEFINE_SPINLOCK(gr_uid_lock);
76634+extern rwlock_t gr_inode_lock;
76635+extern struct acl_subject_label *
76636+ lookup_acl_subj_label(const u64 inode, const dev_t dev,
76637+ struct acl_role_label *role);
76638+
76639+static inline dev_t __get_dev(const struct dentry *dentry)
76640+{
76641+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
76642+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
76643+ return BTRFS_I(dentry->d_inode)->root->anon_dev;
76644+ else
76645+#endif
76646+ return dentry->d_sb->s_dev;
76647+}
76648+
76649+static inline u64 __get_ino(const struct dentry *dentry)
76650+{
76651+#if defined(CONFIG_BTRFS_FS) || defined(CONFIG_BTRFS_FS_MODULE)
76652+ if (dentry->d_sb->s_magic == BTRFS_SUPER_MAGIC)
76653+ return btrfs_ino(dentry->d_inode);
76654+ else
76655+#endif
76656+ return dentry->d_inode->i_ino;
76657+}
76658+
76659+int
76660+gr_init_uidset(void)
76661+{
76662+ uid_set =
76663+ kmalloc(GR_UIDTABLE_MAX * sizeof (struct crash_uid), GFP_KERNEL);
76664+ uid_used = 0;
76665+
76666+ return uid_set ? 1 : 0;
76667+}
76668+
76669+void
76670+gr_free_uidset(void)
76671+{
76672+ if (uid_set) {
76673+ struct crash_uid *tmpset;
76674+ spin_lock(&gr_uid_lock);
76675+ tmpset = uid_set;
76676+ uid_set = NULL;
76677+ uid_used = 0;
76678+ spin_unlock(&gr_uid_lock);
76679+ if (tmpset)
76680+ kfree(tmpset);
76681+ }
76682+
76683+ return;
76684+}
76685+
76686+int
76687+gr_find_uid(const uid_t uid)
76688+{
76689+ struct crash_uid *tmp = uid_set;
76690+ uid_t buid;
76691+ int low = 0, high = uid_used - 1, mid;
76692+
76693+ while (high >= low) {
76694+ mid = (low + high) >> 1;
76695+ buid = tmp[mid].uid;
76696+ if (buid == uid)
76697+ return mid;
76698+ if (buid > uid)
76699+ high = mid - 1;
76700+ if (buid < uid)
76701+ low = mid + 1;
76702+ }
76703+
76704+ return -1;
76705+}
76706+
76707+static __inline__ void
76708+gr_insertsort(void)
76709+{
76710+ unsigned short i, j;
76711+ struct crash_uid index;
76712+
76713+ for (i = 1; i < uid_used; i++) {
76714+ index = uid_set[i];
76715+ j = i;
76716+ while ((j > 0) && uid_set[j - 1].uid > index.uid) {
76717+ uid_set[j] = uid_set[j - 1];
76718+ j--;
76719+ }
76720+ uid_set[j] = index;
76721+ }
76722+
76723+ return;
76724+}
76725+
76726+static __inline__ void
76727+gr_insert_uid(const kuid_t kuid, const unsigned long expires)
76728+{
76729+ int loc;
76730+ uid_t uid = GR_GLOBAL_UID(kuid);
76731+
76732+ if (uid_used == GR_UIDTABLE_MAX)
76733+ return;
76734+
76735+ loc = gr_find_uid(uid);
76736+
76737+ if (loc >= 0) {
76738+ uid_set[loc].expires = expires;
76739+ return;
76740+ }
76741+
76742+ uid_set[uid_used].uid = uid;
76743+ uid_set[uid_used].expires = expires;
76744+ uid_used++;
76745+
76746+ gr_insertsort();
76747+
76748+ return;
76749+}
76750+
76751+void
76752+gr_remove_uid(const unsigned short loc)
76753+{
76754+ unsigned short i;
76755+
76756+ for (i = loc + 1; i < uid_used; i++)
76757+ uid_set[i - 1] = uid_set[i];
76758+
76759+ uid_used--;
76760+
76761+ return;
76762+}
76763+
76764+int
76765+gr_check_crash_uid(const kuid_t kuid)
76766+{
76767+ int loc;
76768+ int ret = 0;
76769+ uid_t uid;
76770+
76771+ if (unlikely(!gr_acl_is_enabled()))
76772+ return 0;
76773+
76774+ uid = GR_GLOBAL_UID(kuid);
76775+
76776+ spin_lock(&gr_uid_lock);
76777+ loc = gr_find_uid(uid);
76778+
76779+ if (loc < 0)
76780+ goto out_unlock;
76781+
76782+ if (time_before_eq(uid_set[loc].expires, get_seconds()))
76783+ gr_remove_uid(loc);
76784+ else
76785+ ret = 1;
76786+
76787+out_unlock:
76788+ spin_unlock(&gr_uid_lock);
76789+ return ret;
76790+}
76791+
76792+static __inline__ int
76793+proc_is_setxid(const struct cred *cred)
76794+{
76795+ if (!uid_eq(cred->uid, cred->euid) || !uid_eq(cred->uid, cred->suid) ||
76796+ !uid_eq(cred->uid, cred->fsuid))
76797+ return 1;
76798+ if (!gid_eq(cred->gid, cred->egid) || !gid_eq(cred->gid, cred->sgid) ||
76799+ !gid_eq(cred->gid, cred->fsgid))
76800+ return 1;
76801+
76802+ return 0;
76803+}
76804+
76805+extern int gr_fake_force_sig(int sig, struct task_struct *t);
76806+
76807+void
76808+gr_handle_crash(struct task_struct *task, const int sig)
76809+{
76810+ struct acl_subject_label *curr;
76811+ struct task_struct *tsk, *tsk2;
76812+ const struct cred *cred;
76813+ const struct cred *cred2;
76814+
76815+ if (sig != SIGSEGV && sig != SIGKILL && sig != SIGBUS && sig != SIGILL)
76816+ return;
76817+
76818+ if (unlikely(!gr_acl_is_enabled()))
76819+ return;
76820+
76821+ curr = task->acl;
76822+
76823+ if (!(curr->resmask & (1U << GR_CRASH_RES)))
76824+ return;
76825+
76826+ if (time_before_eq(curr->expires, get_seconds())) {
76827+ curr->expires = 0;
76828+ curr->crashes = 0;
76829+ }
76830+
76831+ curr->crashes++;
76832+
76833+ if (!curr->expires)
76834+ curr->expires = get_seconds() + curr->res[GR_CRASH_RES].rlim_max;
76835+
76836+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
76837+ time_after(curr->expires, get_seconds())) {
76838+ rcu_read_lock();
76839+ cred = __task_cred(task);
76840+ if (gr_is_global_nonroot(cred->uid) && proc_is_setxid(cred)) {
76841+ gr_log_crash1(GR_DONT_AUDIT, GR_SEGVSTART_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
76842+ spin_lock(&gr_uid_lock);
76843+ gr_insert_uid(cred->uid, curr->expires);
76844+ spin_unlock(&gr_uid_lock);
76845+ curr->expires = 0;
76846+ curr->crashes = 0;
76847+ read_lock(&tasklist_lock);
76848+ do_each_thread(tsk2, tsk) {
76849+ cred2 = __task_cred(tsk);
76850+ if (tsk != task && uid_eq(cred2->uid, cred->uid))
76851+ gr_fake_force_sig(SIGKILL, tsk);
76852+ } while_each_thread(tsk2, tsk);
76853+ read_unlock(&tasklist_lock);
76854+ } else {
76855+ gr_log_crash2(GR_DONT_AUDIT, GR_SEGVNOSUID_ACL_MSG, task, curr->res[GR_CRASH_RES].rlim_max);
76856+ read_lock(&tasklist_lock);
76857+ read_lock(&grsec_exec_file_lock);
76858+ do_each_thread(tsk2, tsk) {
76859+ if (likely(tsk != task)) {
76860+ // if this thread has the same subject as the one that triggered
76861+ // RES_CRASH and it's the same binary, kill it
76862+ if (tsk->acl == task->acl && gr_is_same_file(tsk->exec_file, task->exec_file))
76863+ gr_fake_force_sig(SIGKILL, tsk);
76864+ }
76865+ } while_each_thread(tsk2, tsk);
76866+ read_unlock(&grsec_exec_file_lock);
76867+ read_unlock(&tasklist_lock);
76868+ }
76869+ rcu_read_unlock();
76870+ }
76871+
76872+ return;
76873+}
76874+
76875+int
76876+gr_check_crash_exec(const struct file *filp)
76877+{
76878+ struct acl_subject_label *curr;
76879+ struct dentry *dentry;
76880+
76881+ if (unlikely(!gr_acl_is_enabled()))
76882+ return 0;
76883+
76884+ read_lock(&gr_inode_lock);
76885+ dentry = filp->f_path.dentry;
76886+ curr = lookup_acl_subj_label(__get_ino(dentry), __get_dev(dentry),
76887+ current->role);
76888+ read_unlock(&gr_inode_lock);
76889+
76890+ if (!curr || !(curr->resmask & (1U << GR_CRASH_RES)) ||
76891+ (!curr->crashes && !curr->expires))
76892+ return 0;
76893+
76894+ if ((curr->crashes >= curr->res[GR_CRASH_RES].rlim_cur) &&
76895+ time_after(curr->expires, get_seconds()))
76896+ return 1;
76897+ else if (time_before_eq(curr->expires, get_seconds())) {
76898+ curr->crashes = 0;
76899+ curr->expires = 0;
76900+ }
76901+
76902+ return 0;
76903+}
76904+
76905+void
76906+gr_handle_alertkill(struct task_struct *task)
76907+{
76908+ struct acl_subject_label *curracl;
76909+ __u32 curr_ip;
76910+ struct task_struct *p, *p2;
76911+
76912+ if (unlikely(!gr_acl_is_enabled()))
76913+ return;
76914+
76915+ curracl = task->acl;
76916+ curr_ip = task->signal->curr_ip;
76917+
76918+ if ((curracl->mode & GR_KILLIPPROC) && curr_ip) {
76919+ read_lock(&tasklist_lock);
76920+ do_each_thread(p2, p) {
76921+ if (p->signal->curr_ip == curr_ip)
76922+ gr_fake_force_sig(SIGKILL, p);
76923+ } while_each_thread(p2, p);
76924+ read_unlock(&tasklist_lock);
76925+ } else if (curracl->mode & GR_KILLPROC)
76926+ gr_fake_force_sig(SIGKILL, task);
76927+
76928+ return;
76929+}
76930diff --git a/grsecurity/gracl_shm.c b/grsecurity/gracl_shm.c
76931new file mode 100644
76932index 0000000..6b0c9cc
76933--- /dev/null
76934+++ b/grsecurity/gracl_shm.c
76935@@ -0,0 +1,40 @@
76936+#include <linux/kernel.h>
76937+#include <linux/mm.h>
76938+#include <linux/sched.h>
76939+#include <linux/file.h>
76940+#include <linux/ipc.h>
76941+#include <linux/gracl.h>
76942+#include <linux/grsecurity.h>
76943+#include <linux/grinternal.h>
76944+
76945+int
76946+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
76947+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
76948+{
76949+ struct task_struct *task;
76950+
76951+ if (!gr_acl_is_enabled())
76952+ return 1;
76953+
76954+ rcu_read_lock();
76955+ read_lock(&tasklist_lock);
76956+
76957+ task = find_task_by_vpid(shm_cprid);
76958+
76959+ if (unlikely(!task))
76960+ task = find_task_by_vpid(shm_lapid);
76961+
76962+ if (unlikely(task && (time_before_eq64(task->start_time, shm_createtime) ||
76963+ (task_pid_nr(task) == shm_lapid)) &&
76964+ (task->acl->mode & GR_PROTSHM) &&
76965+ (task->acl != current->acl))) {
76966+ read_unlock(&tasklist_lock);
76967+ rcu_read_unlock();
76968+ gr_log_int3(GR_DONT_AUDIT, GR_SHMAT_ACL_MSG, GR_GLOBAL_UID(cuid), shm_cprid, shmid);
76969+ return 0;
76970+ }
76971+ read_unlock(&tasklist_lock);
76972+ rcu_read_unlock();
76973+
76974+ return 1;
76975+}
76976diff --git a/grsecurity/grsec_chdir.c b/grsecurity/grsec_chdir.c
76977new file mode 100644
76978index 0000000..bc0be01
76979--- /dev/null
76980+++ b/grsecurity/grsec_chdir.c
76981@@ -0,0 +1,19 @@
76982+#include <linux/kernel.h>
76983+#include <linux/sched.h>
76984+#include <linux/fs.h>
76985+#include <linux/file.h>
76986+#include <linux/grsecurity.h>
76987+#include <linux/grinternal.h>
76988+
76989+void
76990+gr_log_chdir(const struct dentry *dentry, const struct vfsmount *mnt)
76991+{
76992+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
76993+ if ((grsec_enable_chdir && grsec_enable_group &&
76994+ in_group_p(grsec_audit_gid)) || (grsec_enable_chdir &&
76995+ !grsec_enable_group)) {
76996+ gr_log_fs_generic(GR_DO_AUDIT, GR_CHDIR_AUDIT_MSG, dentry, mnt);
76997+ }
76998+#endif
76999+ return;
77000+}
77001diff --git a/grsecurity/grsec_chroot.c b/grsecurity/grsec_chroot.c
77002new file mode 100644
77003index 0000000..114ea4f
77004--- /dev/null
77005+++ b/grsecurity/grsec_chroot.c
77006@@ -0,0 +1,467 @@
77007+#include <linux/kernel.h>
77008+#include <linux/module.h>
77009+#include <linux/sched.h>
77010+#include <linux/file.h>
77011+#include <linux/fs.h>
77012+#include <linux/mount.h>
77013+#include <linux/types.h>
77014+#include "../fs/mount.h"
77015+#include <linux/grsecurity.h>
77016+#include <linux/grinternal.h>
77017+
77018+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
77019+int gr_init_ran;
77020+#endif
77021+
77022+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
77023+{
77024+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
77025+ struct dentry *tmpd = dentry;
77026+
77027+ read_seqlock_excl(&mount_lock);
77028+ write_seqlock(&rename_lock);
77029+
77030+ while (tmpd != mnt->mnt_root) {
77031+ atomic_inc(&tmpd->chroot_refcnt);
77032+ tmpd = tmpd->d_parent;
77033+ }
77034+ atomic_inc(&tmpd->chroot_refcnt);
77035+
77036+ write_sequnlock(&rename_lock);
77037+ read_sequnlock_excl(&mount_lock);
77038+#endif
77039+}
77040+
77041+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt)
77042+{
77043+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
77044+ struct dentry *tmpd = dentry;
77045+
77046+ read_seqlock_excl(&mount_lock);
77047+ write_seqlock(&rename_lock);
77048+
77049+ while (tmpd != mnt->mnt_root) {
77050+ atomic_dec(&tmpd->chroot_refcnt);
77051+ tmpd = tmpd->d_parent;
77052+ }
77053+ atomic_dec(&tmpd->chroot_refcnt);
77054+
77055+ write_sequnlock(&rename_lock);
77056+ read_sequnlock_excl(&mount_lock);
77057+#endif
77058+}
77059+
77060+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
77061+static struct dentry *get_closest_chroot(struct dentry *dentry)
77062+{
77063+ write_seqlock(&rename_lock);
77064+ do {
77065+ if (atomic_read(&dentry->chroot_refcnt)) {
77066+ write_sequnlock(&rename_lock);
77067+ return dentry;
77068+ }
77069+ dentry = dentry->d_parent;
77070+ } while (!IS_ROOT(dentry));
77071+ write_sequnlock(&rename_lock);
77072+ return NULL;
77073+}
77074+#endif
77075+
77076+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
77077+ struct dentry *newdentry, struct vfsmount *newmnt)
77078+{
77079+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
77080+ struct dentry *chroot;
77081+
77082+ if (unlikely(!grsec_enable_chroot_rename))
77083+ return 0;
77084+
77085+ if (likely(!proc_is_chrooted(current) && gr_is_global_root(current_uid())))
77086+ return 0;
77087+
77088+ chroot = get_closest_chroot(olddentry);
77089+
77090+ if (chroot == NULL)
77091+ return 0;
77092+
77093+ if (is_subdir(newdentry, chroot))
77094+ return 0;
77095+
77096+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_RENAME_MSG, olddentry, oldmnt);
77097+
77098+ return 1;
77099+#else
77100+ return 0;
77101+#endif
77102+}
77103+
77104+void gr_set_chroot_entries(struct task_struct *task, const struct path *path)
77105+{
77106+#ifdef CONFIG_GRKERNSEC
77107+ if (task_pid_nr(task) > 1 && path->dentry != init_task.fs->root.dentry &&
77108+ path->dentry != task->nsproxy->mnt_ns->root->mnt.mnt_root
77109+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
77110+ && gr_init_ran
77111+#endif
77112+ )
77113+ task->gr_is_chrooted = 1;
77114+ else {
77115+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
77116+ if (task_pid_nr(task) == 1 && !gr_init_ran)
77117+ gr_init_ran = 1;
77118+#endif
77119+ task->gr_is_chrooted = 0;
77120+ }
77121+
77122+ task->gr_chroot_dentry = path->dentry;
77123+#endif
77124+ return;
77125+}
77126+
77127+void gr_clear_chroot_entries(struct task_struct *task)
77128+{
77129+#ifdef CONFIG_GRKERNSEC
77130+ task->gr_is_chrooted = 0;
77131+ task->gr_chroot_dentry = NULL;
77132+#endif
77133+ return;
77134+}
77135+
77136+int
77137+gr_handle_chroot_unix(const pid_t pid)
77138+{
77139+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
77140+ struct task_struct *p;
77141+
77142+ if (unlikely(!grsec_enable_chroot_unix))
77143+ return 1;
77144+
77145+ if (likely(!proc_is_chrooted(current)))
77146+ return 1;
77147+
77148+ rcu_read_lock();
77149+ read_lock(&tasklist_lock);
77150+ p = find_task_by_vpid_unrestricted(pid);
77151+ if (unlikely(p && !have_same_root(current, p))) {
77152+ read_unlock(&tasklist_lock);
77153+ rcu_read_unlock();
77154+ gr_log_noargs(GR_DONT_AUDIT, GR_UNIX_CHROOT_MSG);
77155+ return 0;
77156+ }
77157+ read_unlock(&tasklist_lock);
77158+ rcu_read_unlock();
77159+#endif
77160+ return 1;
77161+}
77162+
77163+int
77164+gr_handle_chroot_nice(void)
77165+{
77166+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
77167+ if (grsec_enable_chroot_nice && proc_is_chrooted(current)) {
77168+ gr_log_noargs(GR_DONT_AUDIT, GR_NICE_CHROOT_MSG);
77169+ return -EPERM;
77170+ }
77171+#endif
77172+ return 0;
77173+}
77174+
77175+int
77176+gr_handle_chroot_setpriority(struct task_struct *p, const int niceval)
77177+{
77178+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
77179+ if (grsec_enable_chroot_nice && (niceval < task_nice(p))
77180+ && proc_is_chrooted(current)) {
77181+ gr_log_str_int(GR_DONT_AUDIT, GR_PRIORITY_CHROOT_MSG, p->comm, task_pid_nr(p));
77182+ return -EACCES;
77183+ }
77184+#endif
77185+ return 0;
77186+}
77187+
77188+int
77189+gr_handle_chroot_fowner(struct pid *pid, enum pid_type type)
77190+{
77191+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
77192+ struct task_struct *p;
77193+ int ret = 0;
77194+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || !pid)
77195+ return ret;
77196+
77197+ read_lock(&tasklist_lock);
77198+ do_each_pid_task(pid, type, p) {
77199+ if (!have_same_root(current, p)) {
77200+ ret = 1;
77201+ goto out;
77202+ }
77203+ } while_each_pid_task(pid, type, p);
77204+out:
77205+ read_unlock(&tasklist_lock);
77206+ return ret;
77207+#endif
77208+ return 0;
77209+}
77210+
77211+int
77212+gr_pid_is_chrooted(struct task_struct *p)
77213+{
77214+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
77215+ if (!grsec_enable_chroot_findtask || !proc_is_chrooted(current) || p == NULL)
77216+ return 0;
77217+
77218+ if ((p->exit_state & (EXIT_ZOMBIE | EXIT_DEAD)) ||
77219+ !have_same_root(current, p)) {
77220+ return 1;
77221+ }
77222+#endif
77223+ return 0;
77224+}
77225+
77226+EXPORT_SYMBOL_GPL(gr_pid_is_chrooted);
77227+
77228+#if defined(CONFIG_GRKERNSEC_CHROOT_DOUBLE) || defined(CONFIG_GRKERNSEC_CHROOT_FCHDIR)
77229+int gr_is_outside_chroot(const struct dentry *u_dentry, const struct vfsmount *u_mnt)
77230+{
77231+ struct path path, currentroot;
77232+ int ret = 0;
77233+
77234+ path.dentry = (struct dentry *)u_dentry;
77235+ path.mnt = (struct vfsmount *)u_mnt;
77236+ get_fs_root(current->fs, &currentroot);
77237+ if (path_is_under(&path, &currentroot))
77238+ ret = 1;
77239+ path_put(&currentroot);
77240+
77241+ return ret;
77242+}
77243+#endif
77244+
77245+int
77246+gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt)
77247+{
77248+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
77249+ if (!grsec_enable_chroot_fchdir)
77250+ return 1;
77251+
77252+ if (!proc_is_chrooted(current))
77253+ return 1;
77254+ else if (!gr_is_outside_chroot(u_dentry, u_mnt)) {
77255+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_FCHDIR_MSG, u_dentry, u_mnt);
77256+ return 0;
77257+ }
77258+#endif
77259+ return 1;
77260+}
77261+
77262+int
77263+gr_chroot_fhandle(void)
77264+{
77265+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
77266+ if (!grsec_enable_chroot_fchdir)
77267+ return 1;
77268+
77269+ if (!proc_is_chrooted(current))
77270+ return 1;
77271+ else {
77272+ gr_log_noargs(GR_DONT_AUDIT, GR_CHROOT_FHANDLE_MSG);
77273+ return 0;
77274+ }
77275+#endif
77276+ return 1;
77277+}
77278+
77279+int
77280+gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
77281+ const u64 shm_createtime)
77282+{
77283+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
77284+ struct task_struct *p;
77285+
77286+ if (unlikely(!grsec_enable_chroot_shmat))
77287+ return 1;
77288+
77289+ if (likely(!proc_is_chrooted(current)))
77290+ return 1;
77291+
77292+ rcu_read_lock();
77293+ read_lock(&tasklist_lock);
77294+
77295+ if ((p = find_task_by_vpid_unrestricted(shm_cprid))) {
77296+ if (time_before_eq64(p->start_time, shm_createtime)) {
77297+ if (have_same_root(current, p)) {
77298+ goto allow;
77299+ } else {
77300+ read_unlock(&tasklist_lock);
77301+ rcu_read_unlock();
77302+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
77303+ return 0;
77304+ }
77305+ }
77306+ /* creator exited, pid reuse, fall through to next check */
77307+ }
77308+ if ((p = find_task_by_vpid_unrestricted(shm_lapid))) {
77309+ if (unlikely(!have_same_root(current, p))) {
77310+ read_unlock(&tasklist_lock);
77311+ rcu_read_unlock();
77312+ gr_log_noargs(GR_DONT_AUDIT, GR_SHMAT_CHROOT_MSG);
77313+ return 0;
77314+ }
77315+ }
77316+
77317+allow:
77318+ read_unlock(&tasklist_lock);
77319+ rcu_read_unlock();
77320+#endif
77321+ return 1;
77322+}
77323+
77324+void
77325+gr_log_chroot_exec(const struct dentry *dentry, const struct vfsmount *mnt)
77326+{
77327+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
77328+ if (grsec_enable_chroot_execlog && proc_is_chrooted(current))
77329+ gr_log_fs_generic(GR_DO_AUDIT, GR_EXEC_CHROOT_MSG, dentry, mnt);
77330+#endif
77331+ return;
77332+}
77333+
77334+int
77335+gr_handle_chroot_mknod(const struct dentry *dentry,
77336+ const struct vfsmount *mnt, const int mode)
77337+{
77338+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
77339+ if (grsec_enable_chroot_mknod && !S_ISFIFO(mode) && !S_ISREG(mode) &&
77340+ proc_is_chrooted(current)) {
77341+ gr_log_fs_generic(GR_DONT_AUDIT, GR_MKNOD_CHROOT_MSG, dentry, mnt);
77342+ return -EPERM;
77343+ }
77344+#endif
77345+ return 0;
77346+}
77347+
77348+int
77349+gr_handle_chroot_mount(const struct dentry *dentry,
77350+ const struct vfsmount *mnt, const char *dev_name)
77351+{
77352+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
77353+ if (grsec_enable_chroot_mount && proc_is_chrooted(current)) {
77354+ gr_log_str_fs(GR_DONT_AUDIT, GR_MOUNT_CHROOT_MSG, dev_name ? dev_name : "none", dentry, mnt);
77355+ return -EPERM;
77356+ }
77357+#endif
77358+ return 0;
77359+}
77360+
77361+int
77362+gr_handle_chroot_pivot(void)
77363+{
77364+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
77365+ if (grsec_enable_chroot_pivot && proc_is_chrooted(current)) {
77366+ gr_log_noargs(GR_DONT_AUDIT, GR_PIVOT_CHROOT_MSG);
77367+ return -EPERM;
77368+ }
77369+#endif
77370+ return 0;
77371+}
77372+
77373+int
77374+gr_handle_chroot_chroot(const struct dentry *dentry, const struct vfsmount *mnt)
77375+{
77376+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
77377+ if (grsec_enable_chroot_double && proc_is_chrooted(current) &&
77378+ !gr_is_outside_chroot(dentry, mnt)) {
77379+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHROOT_CHROOT_MSG, dentry, mnt);
77380+ return -EPERM;
77381+ }
77382+#endif
77383+ return 0;
77384+}
77385+
77386+extern const char *captab_log[];
77387+extern int captab_log_entries;
77388+
77389+int
77390+gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
77391+{
77392+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
77393+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
77394+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
77395+ if (cap_raised(chroot_caps, cap)) {
77396+ if (cap_raised(cred->cap_effective, cap) && cap < captab_log_entries) {
77397+ gr_log_cap(GR_DONT_AUDIT, GR_CAP_CHROOT_MSG, task, captab_log[cap]);
77398+ }
77399+ return 0;
77400+ }
77401+ }
77402+#endif
77403+ return 1;
77404+}
77405+
77406+int
77407+gr_chroot_is_capable(const int cap)
77408+{
77409+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
77410+ return gr_task_chroot_is_capable(current, current_cred(), cap);
77411+#endif
77412+ return 1;
77413+}
77414+
77415+int
77416+gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap)
77417+{
77418+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
77419+ if (grsec_enable_chroot_caps && proc_is_chrooted(task)) {
77420+ kernel_cap_t chroot_caps = GR_CHROOT_CAPS;
77421+ if (cap_raised(chroot_caps, cap)) {
77422+ return 0;
77423+ }
77424+ }
77425+#endif
77426+ return 1;
77427+}
77428+
77429+int
77430+gr_chroot_is_capable_nolog(const int cap)
77431+{
77432+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
77433+ return gr_task_chroot_is_capable_nolog(current, cap);
77434+#endif
77435+ return 1;
77436+}
77437+
77438+int
77439+gr_handle_chroot_sysctl(const int op)
77440+{
77441+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
77442+ if (grsec_enable_chroot_sysctl && (op & MAY_WRITE) &&
77443+ proc_is_chrooted(current))
77444+ return -EACCES;
77445+#endif
77446+ return 0;
77447+}
77448+
77449+void
77450+gr_handle_chroot_chdir(const struct path *path)
77451+{
77452+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
77453+ if (grsec_enable_chroot_chdir)
77454+ set_fs_pwd(current->fs, path);
77455+#endif
77456+ return;
77457+}
77458+
77459+int
77460+gr_handle_chroot_chmod(const struct dentry *dentry,
77461+ const struct vfsmount *mnt, const int mode)
77462+{
77463+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
77464+ /* allow chmod +s on directories, but not files */
77465+ if (grsec_enable_chroot_chmod && !S_ISDIR(dentry->d_inode->i_mode) &&
77466+ ((mode & S_ISUID) || ((mode & (S_ISGID | S_IXGRP)) == (S_ISGID | S_IXGRP))) &&
77467+ proc_is_chrooted(current)) {
77468+ gr_log_fs_generic(GR_DONT_AUDIT, GR_CHMOD_CHROOT_MSG, dentry, mnt);
77469+ return -EPERM;
77470+ }
77471+#endif
77472+ return 0;
77473+}
77474diff --git a/grsecurity/grsec_disabled.c b/grsecurity/grsec_disabled.c
77475new file mode 100644
77476index 0000000..946f750
77477--- /dev/null
77478+++ b/grsecurity/grsec_disabled.c
77479@@ -0,0 +1,445 @@
77480+#include <linux/kernel.h>
77481+#include <linux/module.h>
77482+#include <linux/sched.h>
77483+#include <linux/file.h>
77484+#include <linux/fs.h>
77485+#include <linux/kdev_t.h>
77486+#include <linux/net.h>
77487+#include <linux/in.h>
77488+#include <linux/ip.h>
77489+#include <linux/skbuff.h>
77490+#include <linux/sysctl.h>
77491+
77492+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
77493+void
77494+pax_set_initial_flags(struct linux_binprm *bprm)
77495+{
77496+ return;
77497+}
77498+#endif
77499+
77500+#ifdef CONFIG_SYSCTL
77501+__u32
77502+gr_handle_sysctl(const struct ctl_table * table, const int op)
77503+{
77504+ return 0;
77505+}
77506+#endif
77507+
77508+#ifdef CONFIG_TASKSTATS
77509+int gr_is_taskstats_denied(int pid)
77510+{
77511+ return 0;
77512+}
77513+#endif
77514+
77515+int
77516+gr_acl_is_enabled(void)
77517+{
77518+ return 0;
77519+}
77520+
77521+int
77522+gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap)
77523+{
77524+ return 0;
77525+}
77526+
77527+void
77528+gr_handle_proc_create(const struct dentry *dentry, const struct inode *inode)
77529+{
77530+ return;
77531+}
77532+
77533+int
77534+gr_handle_rawio(const struct inode *inode)
77535+{
77536+ return 0;
77537+}
77538+
77539+void
77540+gr_acl_handle_psacct(struct task_struct *task, const long code)
77541+{
77542+ return;
77543+}
77544+
77545+int
77546+gr_handle_ptrace(struct task_struct *task, const long request)
77547+{
77548+ return 0;
77549+}
77550+
77551+int
77552+gr_handle_proc_ptrace(struct task_struct *task)
77553+{
77554+ return 0;
77555+}
77556+
77557+int
77558+gr_set_acls(const int type)
77559+{
77560+ return 0;
77561+}
77562+
77563+int
77564+gr_check_hidden_task(const struct task_struct *tsk)
77565+{
77566+ return 0;
77567+}
77568+
77569+int
77570+gr_check_protected_task(const struct task_struct *task)
77571+{
77572+ return 0;
77573+}
77574+
77575+int
77576+gr_check_protected_task_fowner(struct pid *pid, enum pid_type type)
77577+{
77578+ return 0;
77579+}
77580+
77581+void
77582+gr_copy_label(struct task_struct *tsk)
77583+{
77584+ return;
77585+}
77586+
77587+void
77588+gr_set_pax_flags(struct task_struct *task)
77589+{
77590+ return;
77591+}
77592+
77593+int
77594+gr_set_proc_label(const struct dentry *dentry, const struct vfsmount *mnt,
77595+ const int unsafe_share)
77596+{
77597+ return 0;
77598+}
77599+
77600+void
77601+gr_handle_delete(const u64 ino, const dev_t dev)
77602+{
77603+ return;
77604+}
77605+
77606+void
77607+gr_handle_create(const struct dentry *dentry, const struct vfsmount *mnt)
77608+{
77609+ return;
77610+}
77611+
77612+void
77613+gr_handle_crash(struct task_struct *task, const int sig)
77614+{
77615+ return;
77616+}
77617+
77618+int
77619+gr_check_crash_exec(const struct file *filp)
77620+{
77621+ return 0;
77622+}
77623+
77624+int
77625+gr_check_crash_uid(const kuid_t uid)
77626+{
77627+ return 0;
77628+}
77629+
77630+void
77631+gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
77632+ struct dentry *old_dentry,
77633+ struct dentry *new_dentry,
77634+ struct vfsmount *mnt, const __u8 replace, unsigned int flags)
77635+{
77636+ return;
77637+}
77638+
77639+int
77640+gr_search_socket(const int family, const int type, const int protocol)
77641+{
77642+ return 1;
77643+}
77644+
77645+int
77646+gr_search_connectbind(const int mode, const struct socket *sock,
77647+ const struct sockaddr_in *addr)
77648+{
77649+ return 0;
77650+}
77651+
77652+void
77653+gr_handle_alertkill(struct task_struct *task)
77654+{
77655+ return;
77656+}
77657+
77658+__u32
77659+gr_acl_handle_execve(const struct dentry * dentry, const struct vfsmount * mnt)
77660+{
77661+ return 1;
77662+}
77663+
77664+__u32
77665+gr_acl_handle_hidden_file(const struct dentry * dentry,
77666+ const struct vfsmount * mnt)
77667+{
77668+ return 1;
77669+}
77670+
77671+__u32
77672+gr_acl_handle_open(const struct dentry * dentry, const struct vfsmount * mnt,
77673+ int acc_mode)
77674+{
77675+ return 1;
77676+}
77677+
77678+__u32
77679+gr_acl_handle_rmdir(const struct dentry * dentry, const struct vfsmount * mnt)
77680+{
77681+ return 1;
77682+}
77683+
77684+__u32
77685+gr_acl_handle_unlink(const struct dentry * dentry, const struct vfsmount * mnt)
77686+{
77687+ return 1;
77688+}
77689+
77690+int
77691+gr_acl_handle_mmap(const struct file *file, const unsigned long prot,
77692+ unsigned int *vm_flags)
77693+{
77694+ return 1;
77695+}
77696+
77697+__u32
77698+gr_acl_handle_truncate(const struct dentry * dentry,
77699+ const struct vfsmount * mnt)
77700+{
77701+ return 1;
77702+}
77703+
77704+__u32
77705+gr_acl_handle_utime(const struct dentry * dentry, const struct vfsmount * mnt)
77706+{
77707+ return 1;
77708+}
77709+
77710+__u32
77711+gr_acl_handle_access(const struct dentry * dentry,
77712+ const struct vfsmount * mnt, const int fmode)
77713+{
77714+ return 1;
77715+}
77716+
77717+__u32
77718+gr_acl_handle_chmod(const struct dentry * dentry, const struct vfsmount * mnt,
77719+ umode_t *mode)
77720+{
77721+ return 1;
77722+}
77723+
77724+__u32
77725+gr_acl_handle_chown(const struct dentry * dentry, const struct vfsmount * mnt)
77726+{
77727+ return 1;
77728+}
77729+
77730+__u32
77731+gr_acl_handle_setxattr(const struct dentry * dentry, const struct vfsmount * mnt)
77732+{
77733+ return 1;
77734+}
77735+
77736+__u32
77737+gr_acl_handle_removexattr(const struct dentry * dentry, const struct vfsmount * mnt)
77738+{
77739+ return 1;
77740+}
77741+
77742+void
77743+grsecurity_init(void)
77744+{
77745+ return;
77746+}
77747+
77748+umode_t gr_acl_umask(void)
77749+{
77750+ return 0;
77751+}
77752+
77753+__u32
77754+gr_acl_handle_mknod(const struct dentry * new_dentry,
77755+ const struct dentry * parent_dentry,
77756+ const struct vfsmount * parent_mnt,
77757+ const int mode)
77758+{
77759+ return 1;
77760+}
77761+
77762+__u32
77763+gr_acl_handle_mkdir(const struct dentry * new_dentry,
77764+ const struct dentry * parent_dentry,
77765+ const struct vfsmount * parent_mnt)
77766+{
77767+ return 1;
77768+}
77769+
77770+__u32
77771+gr_acl_handle_symlink(const struct dentry * new_dentry,
77772+ const struct dentry * parent_dentry,
77773+ const struct vfsmount * parent_mnt, const struct filename *from)
77774+{
77775+ return 1;
77776+}
77777+
77778+__u32
77779+gr_acl_handle_link(const struct dentry * new_dentry,
77780+ const struct dentry * parent_dentry,
77781+ const struct vfsmount * parent_mnt,
77782+ const struct dentry * old_dentry,
77783+ const struct vfsmount * old_mnt, const struct filename *to)
77784+{
77785+ return 1;
77786+}
77787+
77788+int
77789+gr_acl_handle_rename(const struct dentry *new_dentry,
77790+ const struct dentry *parent_dentry,
77791+ const struct vfsmount *parent_mnt,
77792+ const struct dentry *old_dentry,
77793+ const struct inode *old_parent_inode,
77794+ const struct vfsmount *old_mnt, const struct filename *newname,
77795+ unsigned int flags)
77796+{
77797+ return 0;
77798+}
77799+
77800+int
77801+gr_acl_handle_filldir(const struct file *file, const char *name,
77802+ const int namelen, const u64 ino)
77803+{
77804+ return 1;
77805+}
77806+
77807+int
77808+gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
77809+ const u64 shm_createtime, const kuid_t cuid, const int shmid)
77810+{
77811+ return 1;
77812+}
77813+
77814+int
77815+gr_search_bind(const struct socket *sock, const struct sockaddr_in *addr)
77816+{
77817+ return 0;
77818+}
77819+
77820+int
77821+gr_search_accept(const struct socket *sock)
77822+{
77823+ return 0;
77824+}
77825+
77826+int
77827+gr_search_listen(const struct socket *sock)
77828+{
77829+ return 0;
77830+}
77831+
77832+int
77833+gr_search_connect(const struct socket *sock, const struct sockaddr_in *addr)
77834+{
77835+ return 0;
77836+}
77837+
77838+__u32
77839+gr_acl_handle_unix(const struct dentry * dentry, const struct vfsmount * mnt)
77840+{
77841+ return 1;
77842+}
77843+
77844+__u32
77845+gr_acl_handle_creat(const struct dentry * dentry,
77846+ const struct dentry * p_dentry,
77847+ const struct vfsmount * p_mnt, int open_flags, int acc_mode,
77848+ const int imode)
77849+{
77850+ return 1;
77851+}
77852+
77853+void
77854+gr_acl_handle_exit(void)
77855+{
77856+ return;
77857+}
77858+
77859+int
77860+gr_acl_handle_mprotect(const struct file *file, const unsigned long prot)
77861+{
77862+ return 1;
77863+}
77864+
77865+void
77866+gr_set_role_label(const kuid_t uid, const kgid_t gid)
77867+{
77868+ return;
77869+}
77870+
77871+int
77872+gr_acl_handle_procpidmem(const struct task_struct *task)
77873+{
77874+ return 0;
77875+}
77876+
77877+int
77878+gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb)
77879+{
77880+ return 0;
77881+}
77882+
77883+int
77884+gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr)
77885+{
77886+ return 0;
77887+}
77888+
77889+int
77890+gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs)
77891+{
77892+ return 0;
77893+}
77894+
77895+int
77896+gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs)
77897+{
77898+ return 0;
77899+}
77900+
77901+int gr_acl_enable_at_secure(void)
77902+{
77903+ return 0;
77904+}
77905+
77906+dev_t gr_get_dev_from_dentry(struct dentry *dentry)
77907+{
77908+ return dentry->d_sb->s_dev;
77909+}
77910+
77911+u64 gr_get_ino_from_dentry(struct dentry *dentry)
77912+{
77913+ return dentry->d_inode->i_ino;
77914+}
77915+
77916+void gr_put_exec_file(struct task_struct *task)
77917+{
77918+ return;
77919+}
77920+
77921+#ifdef CONFIG_SECURITY
77922+EXPORT_SYMBOL_GPL(gr_check_user_change);
77923+EXPORT_SYMBOL_GPL(gr_check_group_change);
77924+#endif
77925diff --git a/grsecurity/grsec_exec.c b/grsecurity/grsec_exec.c
77926new file mode 100644
77927index 0000000..fb7531e
77928--- /dev/null
77929+++ b/grsecurity/grsec_exec.c
77930@@ -0,0 +1,189 @@
77931+#include <linux/kernel.h>
77932+#include <linux/sched.h>
77933+#include <linux/file.h>
77934+#include <linux/binfmts.h>
77935+#include <linux/fs.h>
77936+#include <linux/types.h>
77937+#include <linux/grdefs.h>
77938+#include <linux/grsecurity.h>
77939+#include <linux/grinternal.h>
77940+#include <linux/capability.h>
77941+#include <linux/module.h>
77942+#include <linux/compat.h>
77943+
77944+#include <asm/uaccess.h>
77945+
77946+#ifdef CONFIG_GRKERNSEC_EXECLOG
77947+static char gr_exec_arg_buf[132];
77948+static DEFINE_MUTEX(gr_exec_arg_mutex);
77949+#endif
77950+
77951+struct user_arg_ptr {
77952+#ifdef CONFIG_COMPAT
77953+ bool is_compat;
77954+#endif
77955+ union {
77956+ const char __user *const __user *native;
77957+#ifdef CONFIG_COMPAT
77958+ const compat_uptr_t __user *compat;
77959+#endif
77960+ } ptr;
77961+};
77962+
77963+extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
77964+
77965+void
77966+gr_handle_exec_args(struct linux_binprm *bprm, struct user_arg_ptr argv)
77967+{
77968+#ifdef CONFIG_GRKERNSEC_EXECLOG
77969+ char *grarg = gr_exec_arg_buf;
77970+ unsigned int i, x, execlen = 0;
77971+ char c;
77972+
77973+ if (!((grsec_enable_execlog && grsec_enable_group &&
77974+ in_group_p(grsec_audit_gid))
77975+ || (grsec_enable_execlog && !grsec_enable_group)))
77976+ return;
77977+
77978+ mutex_lock(&gr_exec_arg_mutex);
77979+ memset(grarg, 0, sizeof(gr_exec_arg_buf));
77980+
77981+ for (i = 0; i < bprm->argc && execlen < 128; i++) {
77982+ const char __user *p;
77983+ unsigned int len;
77984+
77985+ p = get_user_arg_ptr(argv, i);
77986+ if (IS_ERR(p))
77987+ goto log;
77988+
77989+ len = strnlen_user(p, 128 - execlen);
77990+ if (len > 128 - execlen)
77991+ len = 128 - execlen;
77992+ else if (len > 0)
77993+ len--;
77994+ if (copy_from_user(grarg + execlen, p, len))
77995+ goto log;
77996+
77997+ /* rewrite unprintable characters */
77998+ for (x = 0; x < len; x++) {
77999+ c = *(grarg + execlen + x);
78000+ if (c < 32 || c > 126)
78001+ *(grarg + execlen + x) = ' ';
78002+ }
78003+
78004+ execlen += len;
78005+ *(grarg + execlen) = ' ';
78006+ *(grarg + execlen + 1) = '\0';
78007+ execlen++;
78008+ }
78009+
78010+ log:
78011+ gr_log_fs_str(GR_DO_AUDIT, GR_EXEC_AUDIT_MSG, bprm->file->f_path.dentry,
78012+ bprm->file->f_path.mnt, grarg);
78013+ mutex_unlock(&gr_exec_arg_mutex);
78014+#endif
78015+ return;
78016+}
78017+
78018+#ifdef CONFIG_GRKERNSEC
78019+extern int gr_acl_is_capable(const int cap);
78020+extern int gr_acl_is_capable_nolog(const int cap);
78021+extern int gr_task_acl_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
78022+extern int gr_task_acl_is_capable_nolog(const struct task_struct *task, const int cap);
78023+extern int gr_chroot_is_capable(const int cap);
78024+extern int gr_chroot_is_capable_nolog(const int cap);
78025+extern int gr_task_chroot_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
78026+extern int gr_task_chroot_is_capable_nolog(const struct task_struct *task, const int cap);
78027+#endif
78028+
78029+const char *captab_log[] = {
78030+ "CAP_CHOWN",
78031+ "CAP_DAC_OVERRIDE",
78032+ "CAP_DAC_READ_SEARCH",
78033+ "CAP_FOWNER",
78034+ "CAP_FSETID",
78035+ "CAP_KILL",
78036+ "CAP_SETGID",
78037+ "CAP_SETUID",
78038+ "CAP_SETPCAP",
78039+ "CAP_LINUX_IMMUTABLE",
78040+ "CAP_NET_BIND_SERVICE",
78041+ "CAP_NET_BROADCAST",
78042+ "CAP_NET_ADMIN",
78043+ "CAP_NET_RAW",
78044+ "CAP_IPC_LOCK",
78045+ "CAP_IPC_OWNER",
78046+ "CAP_SYS_MODULE",
78047+ "CAP_SYS_RAWIO",
78048+ "CAP_SYS_CHROOT",
78049+ "CAP_SYS_PTRACE",
78050+ "CAP_SYS_PACCT",
78051+ "CAP_SYS_ADMIN",
78052+ "CAP_SYS_BOOT",
78053+ "CAP_SYS_NICE",
78054+ "CAP_SYS_RESOURCE",
78055+ "CAP_SYS_TIME",
78056+ "CAP_SYS_TTY_CONFIG",
78057+ "CAP_MKNOD",
78058+ "CAP_LEASE",
78059+ "CAP_AUDIT_WRITE",
78060+ "CAP_AUDIT_CONTROL",
78061+ "CAP_SETFCAP",
78062+ "CAP_MAC_OVERRIDE",
78063+ "CAP_MAC_ADMIN",
78064+ "CAP_SYSLOG",
78065+ "CAP_WAKE_ALARM",
78066+ "CAP_BLOCK_SUSPEND",
78067+ "CAP_AUDIT_READ"
78068+};
78069+
78070+int captab_log_entries = sizeof(captab_log)/sizeof(captab_log[0]);
78071+
78072+int gr_is_capable(const int cap)
78073+{
78074+#ifdef CONFIG_GRKERNSEC
78075+ if (gr_acl_is_capable(cap) && gr_chroot_is_capable(cap))
78076+ return 1;
78077+ return 0;
78078+#else
78079+ return 1;
78080+#endif
78081+}
78082+
78083+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap)
78084+{
78085+#ifdef CONFIG_GRKERNSEC
78086+ if (gr_task_acl_is_capable(task, cred, cap) && gr_task_chroot_is_capable(task, cred, cap))
78087+ return 1;
78088+ return 0;
78089+#else
78090+ return 1;
78091+#endif
78092+}
78093+
78094+int gr_is_capable_nolog(const int cap)
78095+{
78096+#ifdef CONFIG_GRKERNSEC
78097+ if (gr_acl_is_capable_nolog(cap) && gr_chroot_is_capable_nolog(cap))
78098+ return 1;
78099+ return 0;
78100+#else
78101+ return 1;
78102+#endif
78103+}
78104+
78105+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap)
78106+{
78107+#ifdef CONFIG_GRKERNSEC
78108+ if (gr_task_acl_is_capable_nolog(task, cap) && gr_task_chroot_is_capable_nolog(task, cap))
78109+ return 1;
78110+ return 0;
78111+#else
78112+ return 1;
78113+#endif
78114+}
78115+
78116+EXPORT_SYMBOL_GPL(gr_is_capable);
78117+EXPORT_SYMBOL_GPL(gr_is_capable_nolog);
78118+EXPORT_SYMBOL_GPL(gr_task_is_capable);
78119+EXPORT_SYMBOL_GPL(gr_task_is_capable_nolog);
78120diff --git a/grsecurity/grsec_fifo.c b/grsecurity/grsec_fifo.c
78121new file mode 100644
78122index 0000000..06cc6ea
78123--- /dev/null
78124+++ b/grsecurity/grsec_fifo.c
78125@@ -0,0 +1,24 @@
78126+#include <linux/kernel.h>
78127+#include <linux/sched.h>
78128+#include <linux/fs.h>
78129+#include <linux/file.h>
78130+#include <linux/grinternal.h>
78131+
78132+int
78133+gr_handle_fifo(const struct dentry *dentry, const struct vfsmount *mnt,
78134+ const struct dentry *dir, const int flag, const int acc_mode)
78135+{
78136+#ifdef CONFIG_GRKERNSEC_FIFO
78137+ const struct cred *cred = current_cred();
78138+
78139+ if (grsec_enable_fifo && S_ISFIFO(dentry->d_inode->i_mode) &&
78140+ !(flag & O_EXCL) && (dir->d_inode->i_mode & S_ISVTX) &&
78141+ !uid_eq(dentry->d_inode->i_uid, dir->d_inode->i_uid) &&
78142+ !uid_eq(cred->fsuid, dentry->d_inode->i_uid)) {
78143+ if (!inode_permission(dentry->d_inode, acc_mode))
78144+ 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));
78145+ return -EACCES;
78146+ }
78147+#endif
78148+ return 0;
78149+}
78150diff --git a/grsecurity/grsec_fork.c b/grsecurity/grsec_fork.c
78151new file mode 100644
78152index 0000000..8ca18bf
78153--- /dev/null
78154+++ b/grsecurity/grsec_fork.c
78155@@ -0,0 +1,23 @@
78156+#include <linux/kernel.h>
78157+#include <linux/sched.h>
78158+#include <linux/grsecurity.h>
78159+#include <linux/grinternal.h>
78160+#include <linux/errno.h>
78161+
78162+void
78163+gr_log_forkfail(const int retval)
78164+{
78165+#ifdef CONFIG_GRKERNSEC_FORKFAIL
78166+ if (grsec_enable_forkfail && (retval == -EAGAIN || retval == -ENOMEM)) {
78167+ switch (retval) {
78168+ case -EAGAIN:
78169+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "EAGAIN");
78170+ break;
78171+ case -ENOMEM:
78172+ gr_log_str(GR_DONT_AUDIT, GR_FAILFORK_MSG, "ENOMEM");
78173+ break;
78174+ }
78175+ }
78176+#endif
78177+ return;
78178+}
78179diff --git a/grsecurity/grsec_init.c b/grsecurity/grsec_init.c
78180new file mode 100644
78181index 0000000..4ed9e7d
78182--- /dev/null
78183+++ b/grsecurity/grsec_init.c
78184@@ -0,0 +1,290 @@
78185+#include <linux/kernel.h>
78186+#include <linux/sched.h>
78187+#include <linux/mm.h>
78188+#include <linux/gracl.h>
78189+#include <linux/slab.h>
78190+#include <linux/vmalloc.h>
78191+#include <linux/percpu.h>
78192+#include <linux/module.h>
78193+
78194+int grsec_enable_ptrace_readexec;
78195+int grsec_enable_setxid;
78196+int grsec_enable_symlinkown;
78197+kgid_t grsec_symlinkown_gid;
78198+int grsec_enable_brute;
78199+int grsec_enable_link;
78200+int grsec_enable_dmesg;
78201+int grsec_enable_harden_ptrace;
78202+int grsec_enable_harden_ipc;
78203+int grsec_enable_fifo;
78204+int grsec_enable_execlog;
78205+int grsec_enable_signal;
78206+int grsec_enable_forkfail;
78207+int grsec_enable_audit_ptrace;
78208+int grsec_enable_time;
78209+int grsec_enable_group;
78210+kgid_t grsec_audit_gid;
78211+int grsec_enable_chdir;
78212+int grsec_enable_mount;
78213+int grsec_enable_rofs;
78214+int grsec_deny_new_usb;
78215+int grsec_enable_chroot_findtask;
78216+int grsec_enable_chroot_mount;
78217+int grsec_enable_chroot_shmat;
78218+int grsec_enable_chroot_fchdir;
78219+int grsec_enable_chroot_double;
78220+int grsec_enable_chroot_pivot;
78221+int grsec_enable_chroot_chdir;
78222+int grsec_enable_chroot_chmod;
78223+int grsec_enable_chroot_mknod;
78224+int grsec_enable_chroot_nice;
78225+int grsec_enable_chroot_execlog;
78226+int grsec_enable_chroot_caps;
78227+int grsec_enable_chroot_rename;
78228+int grsec_enable_chroot_sysctl;
78229+int grsec_enable_chroot_unix;
78230+int grsec_enable_tpe;
78231+kgid_t grsec_tpe_gid;
78232+int grsec_enable_blackhole;
78233+#ifdef CONFIG_IPV6_MODULE
78234+EXPORT_SYMBOL_GPL(grsec_enable_blackhole);
78235+#endif
78236+int grsec_lastack_retries;
78237+int grsec_enable_tpe_all;
78238+int grsec_enable_tpe_invert;
78239+int grsec_enable_socket_all;
78240+kgid_t grsec_socket_all_gid;
78241+int grsec_enable_socket_client;
78242+kgid_t grsec_socket_client_gid;
78243+int grsec_enable_socket_server;
78244+kgid_t grsec_socket_server_gid;
78245+int grsec_resource_logging;
78246+int grsec_disable_privio;
78247+int grsec_enable_log_rwxmaps;
78248+int grsec_lock;
78249+
78250+DEFINE_SPINLOCK(grsec_alert_lock);
78251+unsigned long grsec_alert_wtime = 0;
78252+unsigned long grsec_alert_fyet = 0;
78253+
78254+DEFINE_SPINLOCK(grsec_audit_lock);
78255+
78256+DEFINE_RWLOCK(grsec_exec_file_lock);
78257+
78258+char *gr_shared_page[4];
78259+
78260+char *gr_alert_log_fmt;
78261+char *gr_audit_log_fmt;
78262+char *gr_alert_log_buf;
78263+char *gr_audit_log_buf;
78264+
78265+extern struct gr_arg *gr_usermode;
78266+extern unsigned char *gr_system_salt;
78267+extern unsigned char *gr_system_sum;
78268+
78269+void __init
78270+grsecurity_init(void)
78271+{
78272+ int j;
78273+ /* create the per-cpu shared pages */
78274+
78275+#ifdef CONFIG_X86
78276+ memset((char *)(0x41a + PAGE_OFFSET), 0, 36);
78277+#endif
78278+
78279+ for (j = 0; j < 4; j++) {
78280+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long));
78281+ if (gr_shared_page[j] == NULL) {
78282+ panic("Unable to allocate grsecurity shared page");
78283+ return;
78284+ }
78285+ }
78286+
78287+ /* allocate log buffers */
78288+ gr_alert_log_fmt = kmalloc(512, GFP_KERNEL);
78289+ if (!gr_alert_log_fmt) {
78290+ panic("Unable to allocate grsecurity alert log format buffer");
78291+ return;
78292+ }
78293+ gr_audit_log_fmt = kmalloc(512, GFP_KERNEL);
78294+ if (!gr_audit_log_fmt) {
78295+ panic("Unable to allocate grsecurity audit log format buffer");
78296+ return;
78297+ }
78298+ gr_alert_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
78299+ if (!gr_alert_log_buf) {
78300+ panic("Unable to allocate grsecurity alert log buffer");
78301+ return;
78302+ }
78303+ gr_audit_log_buf = (char *) get_zeroed_page(GFP_KERNEL);
78304+ if (!gr_audit_log_buf) {
78305+ panic("Unable to allocate grsecurity audit log buffer");
78306+ return;
78307+ }
78308+
78309+ /* allocate memory for authentication structure */
78310+ gr_usermode = kmalloc(sizeof(struct gr_arg), GFP_KERNEL);
78311+ gr_system_salt = kmalloc(GR_SALT_LEN, GFP_KERNEL);
78312+ gr_system_sum = kmalloc(GR_SHA_LEN, GFP_KERNEL);
78313+
78314+ if (!gr_usermode || !gr_system_salt || !gr_system_sum) {
78315+ panic("Unable to allocate grsecurity authentication structure");
78316+ return;
78317+ }
78318+
78319+#ifdef CONFIG_GRKERNSEC_IO
78320+#if !defined(CONFIG_GRKERNSEC_SYSCTL_DISTRO)
78321+ grsec_disable_privio = 1;
78322+#elif defined(CONFIG_GRKERNSEC_SYSCTL_ON)
78323+ grsec_disable_privio = 1;
78324+#else
78325+ grsec_disable_privio = 0;
78326+#endif
78327+#endif
78328+
78329+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
78330+ /* for backward compatibility, tpe_invert always defaults to on if
78331+ enabled in the kernel
78332+ */
78333+ grsec_enable_tpe_invert = 1;
78334+#endif
78335+
78336+#if !defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_SYSCTL_ON)
78337+#ifndef CONFIG_GRKERNSEC_SYSCTL
78338+ grsec_lock = 1;
78339+#endif
78340+
78341+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
78342+ grsec_enable_log_rwxmaps = 1;
78343+#endif
78344+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
78345+ grsec_enable_group = 1;
78346+ grsec_audit_gid = KGIDT_INIT(CONFIG_GRKERNSEC_AUDIT_GID);
78347+#endif
78348+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
78349+ grsec_enable_ptrace_readexec = 1;
78350+#endif
78351+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
78352+ grsec_enable_chdir = 1;
78353+#endif
78354+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
78355+ grsec_enable_harden_ptrace = 1;
78356+#endif
78357+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
78358+ grsec_enable_harden_ipc = 1;
78359+#endif
78360+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
78361+ grsec_enable_mount = 1;
78362+#endif
78363+#ifdef CONFIG_GRKERNSEC_LINK
78364+ grsec_enable_link = 1;
78365+#endif
78366+#ifdef CONFIG_GRKERNSEC_BRUTE
78367+ grsec_enable_brute = 1;
78368+#endif
78369+#ifdef CONFIG_GRKERNSEC_DMESG
78370+ grsec_enable_dmesg = 1;
78371+#endif
78372+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
78373+ grsec_enable_blackhole = 1;
78374+ grsec_lastack_retries = 4;
78375+#endif
78376+#ifdef CONFIG_GRKERNSEC_FIFO
78377+ grsec_enable_fifo = 1;
78378+#endif
78379+#ifdef CONFIG_GRKERNSEC_EXECLOG
78380+ grsec_enable_execlog = 1;
78381+#endif
78382+#ifdef CONFIG_GRKERNSEC_SETXID
78383+ grsec_enable_setxid = 1;
78384+#endif
78385+#ifdef CONFIG_GRKERNSEC_SIGNAL
78386+ grsec_enable_signal = 1;
78387+#endif
78388+#ifdef CONFIG_GRKERNSEC_FORKFAIL
78389+ grsec_enable_forkfail = 1;
78390+#endif
78391+#ifdef CONFIG_GRKERNSEC_TIME
78392+ grsec_enable_time = 1;
78393+#endif
78394+#ifdef CONFIG_GRKERNSEC_RESLOG
78395+ grsec_resource_logging = 1;
78396+#endif
78397+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
78398+ grsec_enable_chroot_findtask = 1;
78399+#endif
78400+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
78401+ grsec_enable_chroot_unix = 1;
78402+#endif
78403+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
78404+ grsec_enable_chroot_mount = 1;
78405+#endif
78406+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
78407+ grsec_enable_chroot_fchdir = 1;
78408+#endif
78409+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
78410+ grsec_enable_chroot_shmat = 1;
78411+#endif
78412+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
78413+ grsec_enable_audit_ptrace = 1;
78414+#endif
78415+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
78416+ grsec_enable_chroot_double = 1;
78417+#endif
78418+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
78419+ grsec_enable_chroot_pivot = 1;
78420+#endif
78421+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
78422+ grsec_enable_chroot_chdir = 1;
78423+#endif
78424+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
78425+ grsec_enable_chroot_chmod = 1;
78426+#endif
78427+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
78428+ grsec_enable_chroot_mknod = 1;
78429+#endif
78430+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
78431+ grsec_enable_chroot_nice = 1;
78432+#endif
78433+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
78434+ grsec_enable_chroot_execlog = 1;
78435+#endif
78436+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
78437+ grsec_enable_chroot_caps = 1;
78438+#endif
78439+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
78440+ grsec_enable_chroot_rename = 1;
78441+#endif
78442+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
78443+ grsec_enable_chroot_sysctl = 1;
78444+#endif
78445+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
78446+ grsec_enable_symlinkown = 1;
78447+ grsec_symlinkown_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SYMLINKOWN_GID);
78448+#endif
78449+#ifdef CONFIG_GRKERNSEC_TPE
78450+ grsec_enable_tpe = 1;
78451+ grsec_tpe_gid = KGIDT_INIT(CONFIG_GRKERNSEC_TPE_GID);
78452+#ifdef CONFIG_GRKERNSEC_TPE_ALL
78453+ grsec_enable_tpe_all = 1;
78454+#endif
78455+#endif
78456+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
78457+ grsec_enable_socket_all = 1;
78458+ grsec_socket_all_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_ALL_GID);
78459+#endif
78460+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
78461+ grsec_enable_socket_client = 1;
78462+ grsec_socket_client_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_CLIENT_GID);
78463+#endif
78464+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
78465+ grsec_enable_socket_server = 1;
78466+ grsec_socket_server_gid = KGIDT_INIT(CONFIG_GRKERNSEC_SOCKET_SERVER_GID);
78467+#endif
78468+#endif
78469+#ifdef CONFIG_GRKERNSEC_DENYUSB_FORCE
78470+ grsec_deny_new_usb = 1;
78471+#endif
78472+
78473+ return;
78474+}
78475diff --git a/grsecurity/grsec_ipc.c b/grsecurity/grsec_ipc.c
78476new file mode 100644
78477index 0000000..1773300
78478--- /dev/null
78479+++ b/grsecurity/grsec_ipc.c
78480@@ -0,0 +1,48 @@
78481+#include <linux/kernel.h>
78482+#include <linux/mm.h>
78483+#include <linux/sched.h>
78484+#include <linux/file.h>
78485+#include <linux/ipc.h>
78486+#include <linux/ipc_namespace.h>
78487+#include <linux/grsecurity.h>
78488+#include <linux/grinternal.h>
78489+
78490+int
78491+gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode)
78492+{
78493+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
78494+ int write;
78495+ int orig_granted_mode;
78496+ kuid_t euid;
78497+ kgid_t egid;
78498+
78499+ if (!grsec_enable_harden_ipc)
78500+ return 1;
78501+
78502+ euid = current_euid();
78503+ egid = current_egid();
78504+
78505+ write = requested_mode & 00002;
78506+ orig_granted_mode = ipcp->mode;
78507+
78508+ if (uid_eq(euid, ipcp->cuid) || uid_eq(euid, ipcp->uid))
78509+ orig_granted_mode >>= 6;
78510+ else {
78511+ /* if likely wrong permissions, lock to user */
78512+ if (orig_granted_mode & 0007)
78513+ orig_granted_mode = 0;
78514+ /* otherwise do a egid-only check */
78515+ else if (gid_eq(egid, ipcp->cgid) || gid_eq(egid, ipcp->gid))
78516+ orig_granted_mode >>= 3;
78517+ /* otherwise, no access */
78518+ else
78519+ orig_granted_mode = 0;
78520+ }
78521+ if (!(requested_mode & ~granted_mode & 0007) && (requested_mode & ~orig_granted_mode & 0007) &&
78522+ !ns_capable_nolog(ns->user_ns, CAP_IPC_OWNER)) {
78523+ gr_log_str_int(GR_DONT_AUDIT, GR_IPC_DENIED_MSG, write ? "write" : "read", GR_GLOBAL_UID(ipcp->cuid));
78524+ return 0;
78525+ }
78526+#endif
78527+ return 1;
78528+}
78529diff --git a/grsecurity/grsec_link.c b/grsecurity/grsec_link.c
78530new file mode 100644
78531index 0000000..5e05e20
78532--- /dev/null
78533+++ b/grsecurity/grsec_link.c
78534@@ -0,0 +1,58 @@
78535+#include <linux/kernel.h>
78536+#include <linux/sched.h>
78537+#include <linux/fs.h>
78538+#include <linux/file.h>
78539+#include <linux/grinternal.h>
78540+
78541+int gr_handle_symlink_owner(const struct path *link, const struct inode *target)
78542+{
78543+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
78544+ const struct inode *link_inode = link->dentry->d_inode;
78545+
78546+ if (grsec_enable_symlinkown && in_group_p(grsec_symlinkown_gid) &&
78547+ /* ignore root-owned links, e.g. /proc/self */
78548+ gr_is_global_nonroot(link_inode->i_uid) && target &&
78549+ !uid_eq(link_inode->i_uid, target->i_uid)) {
78550+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINKOWNER_MSG, link->dentry, link->mnt, link_inode->i_uid, target->i_uid);
78551+ return 1;
78552+ }
78553+#endif
78554+ return 0;
78555+}
78556+
78557+int
78558+gr_handle_follow_link(const struct inode *parent,
78559+ const struct inode *inode,
78560+ const struct dentry *dentry, const struct vfsmount *mnt)
78561+{
78562+#ifdef CONFIG_GRKERNSEC_LINK
78563+ const struct cred *cred = current_cred();
78564+
78565+ if (grsec_enable_link && S_ISLNK(inode->i_mode) &&
78566+ (parent->i_mode & S_ISVTX) && !uid_eq(parent->i_uid, inode->i_uid) &&
78567+ (parent->i_mode & S_IWOTH) && !uid_eq(cred->fsuid, inode->i_uid)) {
78568+ gr_log_fs_int2(GR_DONT_AUDIT, GR_SYMLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid);
78569+ return -EACCES;
78570+ }
78571+#endif
78572+ return 0;
78573+}
78574+
78575+int
78576+gr_handle_hardlink(const struct dentry *dentry,
78577+ const struct vfsmount *mnt,
78578+ struct inode *inode, const int mode, const struct filename *to)
78579+{
78580+#ifdef CONFIG_GRKERNSEC_LINK
78581+ const struct cred *cred = current_cred();
78582+
78583+ if (grsec_enable_link && !uid_eq(cred->fsuid, inode->i_uid) &&
78584+ (!S_ISREG(mode) || is_privileged_binary(dentry) ||
78585+ (inode_permission(inode, MAY_READ | MAY_WRITE))) &&
78586+ !capable(CAP_FOWNER) && gr_is_global_nonroot(cred->uid)) {
78587+ gr_log_fs_int2_str(GR_DONT_AUDIT, GR_HARDLINK_MSG, dentry, mnt, inode->i_uid, inode->i_gid, to->name);
78588+ return -EPERM;
78589+ }
78590+#endif
78591+ return 0;
78592+}
78593diff --git a/grsecurity/grsec_log.c b/grsecurity/grsec_log.c
78594new file mode 100644
78595index 0000000..dbe0a6b
78596--- /dev/null
78597+++ b/grsecurity/grsec_log.c
78598@@ -0,0 +1,341 @@
78599+#include <linux/kernel.h>
78600+#include <linux/sched.h>
78601+#include <linux/file.h>
78602+#include <linux/tty.h>
78603+#include <linux/fs.h>
78604+#include <linux/mm.h>
78605+#include <linux/grinternal.h>
78606+
78607+#ifdef CONFIG_TREE_PREEMPT_RCU
78608+#define DISABLE_PREEMPT() preempt_disable()
78609+#define ENABLE_PREEMPT() preempt_enable()
78610+#else
78611+#define DISABLE_PREEMPT()
78612+#define ENABLE_PREEMPT()
78613+#endif
78614+
78615+#define BEGIN_LOCKS(x) \
78616+ DISABLE_PREEMPT(); \
78617+ rcu_read_lock(); \
78618+ read_lock(&tasklist_lock); \
78619+ read_lock(&grsec_exec_file_lock); \
78620+ if (x != GR_DO_AUDIT) \
78621+ spin_lock(&grsec_alert_lock); \
78622+ else \
78623+ spin_lock(&grsec_audit_lock)
78624+
78625+#define END_LOCKS(x) \
78626+ if (x != GR_DO_AUDIT) \
78627+ spin_unlock(&grsec_alert_lock); \
78628+ else \
78629+ spin_unlock(&grsec_audit_lock); \
78630+ read_unlock(&grsec_exec_file_lock); \
78631+ read_unlock(&tasklist_lock); \
78632+ rcu_read_unlock(); \
78633+ ENABLE_PREEMPT(); \
78634+ if (x == GR_DONT_AUDIT) \
78635+ gr_handle_alertkill(current)
78636+
78637+enum {
78638+ FLOODING,
78639+ NO_FLOODING
78640+};
78641+
78642+extern char *gr_alert_log_fmt;
78643+extern char *gr_audit_log_fmt;
78644+extern char *gr_alert_log_buf;
78645+extern char *gr_audit_log_buf;
78646+
78647+static int gr_log_start(int audit)
78648+{
78649+ char *loglevel = (audit == GR_DO_AUDIT) ? KERN_INFO : KERN_ALERT;
78650+ char *fmt = (audit == GR_DO_AUDIT) ? gr_audit_log_fmt : gr_alert_log_fmt;
78651+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
78652+#if (CONFIG_GRKERNSEC_FLOODTIME > 0 && CONFIG_GRKERNSEC_FLOODBURST > 0)
78653+ unsigned long curr_secs = get_seconds();
78654+
78655+ if (audit == GR_DO_AUDIT)
78656+ goto set_fmt;
78657+
78658+ if (!grsec_alert_wtime || time_after(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)) {
78659+ grsec_alert_wtime = curr_secs;
78660+ grsec_alert_fyet = 0;
78661+ } else if (time_before_eq(curr_secs, grsec_alert_wtime + CONFIG_GRKERNSEC_FLOODTIME)
78662+ && (grsec_alert_fyet < CONFIG_GRKERNSEC_FLOODBURST)) {
78663+ grsec_alert_fyet++;
78664+ } else if (grsec_alert_fyet == CONFIG_GRKERNSEC_FLOODBURST) {
78665+ grsec_alert_wtime = curr_secs;
78666+ grsec_alert_fyet++;
78667+ printk(KERN_ALERT "grsec: more alerts, logging disabled for %d seconds\n", CONFIG_GRKERNSEC_FLOODTIME);
78668+ return FLOODING;
78669+ }
78670+ else return FLOODING;
78671+
78672+set_fmt:
78673+#endif
78674+ memset(buf, 0, PAGE_SIZE);
78675+ if (current->signal->curr_ip && gr_acl_is_enabled()) {
78676+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: (%.64s:%c:%.950s) ");
78677+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
78678+ } else if (current->signal->curr_ip) {
78679+ sprintf(fmt, "%s%s", loglevel, "grsec: From %pI4: ");
78680+ snprintf(buf, PAGE_SIZE - 1, fmt, &current->signal->curr_ip);
78681+ } else if (gr_acl_is_enabled()) {
78682+ sprintf(fmt, "%s%s", loglevel, "grsec: (%.64s:%c:%.950s) ");
78683+ snprintf(buf, PAGE_SIZE - 1, fmt, current->role->rolename, gr_roletype_to_char(), current->acl->filename);
78684+ } else {
78685+ sprintf(fmt, "%s%s", loglevel, "grsec: ");
78686+ strcpy(buf, fmt);
78687+ }
78688+
78689+ return NO_FLOODING;
78690+}
78691+
78692+static void gr_log_middle(int audit, const char *msg, va_list ap)
78693+ __attribute__ ((format (printf, 2, 0)));
78694+
78695+static void gr_log_middle(int audit, const char *msg, va_list ap)
78696+{
78697+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
78698+ unsigned int len = strlen(buf);
78699+
78700+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
78701+
78702+ return;
78703+}
78704+
78705+static void gr_log_middle_varargs(int audit, const char *msg, ...)
78706+ __attribute__ ((format (printf, 2, 3)));
78707+
78708+static void gr_log_middle_varargs(int audit, const char *msg, ...)
78709+{
78710+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
78711+ unsigned int len = strlen(buf);
78712+ va_list ap;
78713+
78714+ va_start(ap, msg);
78715+ vsnprintf(buf + len, PAGE_SIZE - len - 1, msg, ap);
78716+ va_end(ap);
78717+
78718+ return;
78719+}
78720+
78721+static void gr_log_end(int audit, int append_default)
78722+{
78723+ char *buf = (audit == GR_DO_AUDIT) ? gr_audit_log_buf : gr_alert_log_buf;
78724+ if (append_default) {
78725+ struct task_struct *task = current;
78726+ struct task_struct *parent = task->real_parent;
78727+ const struct cred *cred = __task_cred(task);
78728+ const struct cred *pcred = __task_cred(parent);
78729+ unsigned int len = strlen(buf);
78730+
78731+ 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));
78732+ }
78733+
78734+ printk("%s\n", buf);
78735+
78736+ return;
78737+}
78738+
78739+void gr_log_varargs(int audit, const char *msg, int argtypes, ...)
78740+{
78741+ int logtype;
78742+ char *result = (audit == GR_DO_AUDIT) ? "successful" : "denied";
78743+ char *str1 = NULL, *str2 = NULL, *str3 = NULL;
78744+ void *voidptr = NULL;
78745+ int num1 = 0, num2 = 0;
78746+ unsigned long ulong1 = 0, ulong2 = 0;
78747+ struct dentry *dentry = NULL;
78748+ struct vfsmount *mnt = NULL;
78749+ struct file *file = NULL;
78750+ struct task_struct *task = NULL;
78751+ struct vm_area_struct *vma = NULL;
78752+ const struct cred *cred, *pcred;
78753+ va_list ap;
78754+
78755+ BEGIN_LOCKS(audit);
78756+ logtype = gr_log_start(audit);
78757+ if (logtype == FLOODING) {
78758+ END_LOCKS(audit);
78759+ return;
78760+ }
78761+ va_start(ap, argtypes);
78762+ switch (argtypes) {
78763+ case GR_TTYSNIFF:
78764+ task = va_arg(ap, struct task_struct *);
78765+ 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));
78766+ break;
78767+ case GR_SYSCTL_HIDDEN:
78768+ str1 = va_arg(ap, char *);
78769+ gr_log_middle_varargs(audit, msg, result, str1);
78770+ break;
78771+ case GR_RBAC:
78772+ dentry = va_arg(ap, struct dentry *);
78773+ mnt = va_arg(ap, struct vfsmount *);
78774+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt));
78775+ break;
78776+ case GR_RBAC_STR:
78777+ dentry = va_arg(ap, struct dentry *);
78778+ mnt = va_arg(ap, struct vfsmount *);
78779+ str1 = va_arg(ap, char *);
78780+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1);
78781+ break;
78782+ case GR_STR_RBAC:
78783+ str1 = va_arg(ap, char *);
78784+ dentry = va_arg(ap, struct dentry *);
78785+ mnt = va_arg(ap, struct vfsmount *);
78786+ gr_log_middle_varargs(audit, msg, result, str1, gr_to_filename(dentry, mnt));
78787+ break;
78788+ case GR_RBAC_MODE2:
78789+ dentry = va_arg(ap, struct dentry *);
78790+ mnt = va_arg(ap, struct vfsmount *);
78791+ str1 = va_arg(ap, char *);
78792+ str2 = va_arg(ap, char *);
78793+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2);
78794+ break;
78795+ case GR_RBAC_MODE3:
78796+ dentry = va_arg(ap, struct dentry *);
78797+ mnt = va_arg(ap, struct vfsmount *);
78798+ str1 = va_arg(ap, char *);
78799+ str2 = va_arg(ap, char *);
78800+ str3 = va_arg(ap, char *);
78801+ gr_log_middle_varargs(audit, msg, result, gr_to_filename(dentry, mnt), str1, str2, str3);
78802+ break;
78803+ case GR_FILENAME:
78804+ dentry = va_arg(ap, struct dentry *);
78805+ mnt = va_arg(ap, struct vfsmount *);
78806+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt));
78807+ break;
78808+ case GR_STR_FILENAME:
78809+ str1 = va_arg(ap, char *);
78810+ dentry = va_arg(ap, struct dentry *);
78811+ mnt = va_arg(ap, struct vfsmount *);
78812+ gr_log_middle_varargs(audit, msg, str1, gr_to_filename(dentry, mnt));
78813+ break;
78814+ case GR_FILENAME_STR:
78815+ dentry = va_arg(ap, struct dentry *);
78816+ mnt = va_arg(ap, struct vfsmount *);
78817+ str1 = va_arg(ap, char *);
78818+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), str1);
78819+ break;
78820+ case GR_FILENAME_TWO_INT:
78821+ dentry = va_arg(ap, struct dentry *);
78822+ mnt = va_arg(ap, struct vfsmount *);
78823+ num1 = va_arg(ap, int);
78824+ num2 = va_arg(ap, int);
78825+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2);
78826+ break;
78827+ case GR_FILENAME_TWO_INT_STR:
78828+ dentry = va_arg(ap, struct dentry *);
78829+ mnt = va_arg(ap, struct vfsmount *);
78830+ num1 = va_arg(ap, int);
78831+ num2 = va_arg(ap, int);
78832+ str1 = va_arg(ap, char *);
78833+ gr_log_middle_varargs(audit, msg, gr_to_filename(dentry, mnt), num1, num2, str1);
78834+ break;
78835+ case GR_TEXTREL:
78836+ file = va_arg(ap, struct file *);
78837+ ulong1 = va_arg(ap, unsigned long);
78838+ ulong2 = va_arg(ap, unsigned long);
78839+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>", ulong1, ulong2);
78840+ break;
78841+ case GR_PTRACE:
78842+ task = va_arg(ap, struct task_struct *);
78843+ 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));
78844+ break;
78845+ case GR_RESOURCE:
78846+ task = va_arg(ap, struct task_struct *);
78847+ cred = __task_cred(task);
78848+ pcred = __task_cred(task->real_parent);
78849+ ulong1 = va_arg(ap, unsigned long);
78850+ str1 = va_arg(ap, char *);
78851+ ulong2 = va_arg(ap, unsigned long);
78852+ 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));
78853+ break;
78854+ case GR_CAP:
78855+ task = va_arg(ap, struct task_struct *);
78856+ cred = __task_cred(task);
78857+ pcred = __task_cred(task->real_parent);
78858+ str1 = va_arg(ap, char *);
78859+ 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));
78860+ break;
78861+ case GR_SIG:
78862+ str1 = va_arg(ap, char *);
78863+ voidptr = va_arg(ap, void *);
78864+ gr_log_middle_varargs(audit, msg, str1, voidptr);
78865+ break;
78866+ case GR_SIG2:
78867+ task = va_arg(ap, struct task_struct *);
78868+ cred = __task_cred(task);
78869+ pcred = __task_cred(task->real_parent);
78870+ num1 = va_arg(ap, int);
78871+ 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));
78872+ break;
78873+ case GR_CRASH1:
78874+ task = va_arg(ap, struct task_struct *);
78875+ cred = __task_cred(task);
78876+ pcred = __task_cred(task->real_parent);
78877+ ulong1 = va_arg(ap, unsigned long);
78878+ 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);
78879+ break;
78880+ case GR_CRASH2:
78881+ task = va_arg(ap, struct task_struct *);
78882+ cred = __task_cred(task);
78883+ pcred = __task_cred(task->real_parent);
78884+ ulong1 = va_arg(ap, unsigned long);
78885+ 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);
78886+ break;
78887+ case GR_RWXMAP:
78888+ file = va_arg(ap, struct file *);
78889+ gr_log_middle_varargs(audit, msg, file ? gr_to_filename(file->f_path.dentry, file->f_path.mnt) : "<anonymous mapping>");
78890+ break;
78891+ case GR_RWXMAPVMA:
78892+ vma = va_arg(ap, struct vm_area_struct *);
78893+ if (vma->vm_file)
78894+ str1 = gr_to_filename(vma->vm_file->f_path.dentry, vma->vm_file->f_path.mnt);
78895+ else if (vma->vm_flags & (VM_GROWSDOWN | VM_GROWSUP))
78896+ str1 = "<stack>";
78897+ else if (vma->vm_start <= current->mm->brk &&
78898+ vma->vm_end >= current->mm->start_brk)
78899+ str1 = "<heap>";
78900+ else
78901+ str1 = "<anonymous mapping>";
78902+ gr_log_middle_varargs(audit, msg, str1);
78903+ break;
78904+ case GR_PSACCT:
78905+ {
78906+ unsigned int wday, cday;
78907+ __u8 whr, chr;
78908+ __u8 wmin, cmin;
78909+ __u8 wsec, csec;
78910+ char cur_tty[64] = { 0 };
78911+ char parent_tty[64] = { 0 };
78912+
78913+ task = va_arg(ap, struct task_struct *);
78914+ wday = va_arg(ap, unsigned int);
78915+ cday = va_arg(ap, unsigned int);
78916+ whr = va_arg(ap, int);
78917+ chr = va_arg(ap, int);
78918+ wmin = va_arg(ap, int);
78919+ cmin = va_arg(ap, int);
78920+ wsec = va_arg(ap, int);
78921+ csec = va_arg(ap, int);
78922+ ulong1 = va_arg(ap, unsigned long);
78923+ cred = __task_cred(task);
78924+ pcred = __task_cred(task->real_parent);
78925+
78926+ 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));
78927+ }
78928+ break;
78929+ default:
78930+ gr_log_middle(audit, msg, ap);
78931+ }
78932+ va_end(ap);
78933+ // these don't need DEFAULTSECARGS printed on the end
78934+ if (argtypes == GR_CRASH1 || argtypes == GR_CRASH2)
78935+ gr_log_end(audit, 0);
78936+ else
78937+ gr_log_end(audit, 1);
78938+ END_LOCKS(audit);
78939+}
78940diff --git a/grsecurity/grsec_mem.c b/grsecurity/grsec_mem.c
78941new file mode 100644
78942index 0000000..0e39d8c
78943--- /dev/null
78944+++ b/grsecurity/grsec_mem.c
78945@@ -0,0 +1,48 @@
78946+#include <linux/kernel.h>
78947+#include <linux/sched.h>
78948+#include <linux/mm.h>
78949+#include <linux/mman.h>
78950+#include <linux/module.h>
78951+#include <linux/grinternal.h>
78952+
78953+void gr_handle_msr_write(void)
78954+{
78955+ gr_log_noargs(GR_DONT_AUDIT, GR_MSRWRITE_MSG);
78956+ return;
78957+}
78958+EXPORT_SYMBOL_GPL(gr_handle_msr_write);
78959+
78960+void
78961+gr_handle_ioperm(void)
78962+{
78963+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPERM_MSG);
78964+ return;
78965+}
78966+
78967+void
78968+gr_handle_iopl(void)
78969+{
78970+ gr_log_noargs(GR_DONT_AUDIT, GR_IOPL_MSG);
78971+ return;
78972+}
78973+
78974+void
78975+gr_handle_mem_readwrite(u64 from, u64 to)
78976+{
78977+ gr_log_two_u64(GR_DONT_AUDIT, GR_MEM_READWRITE_MSG, from, to);
78978+ return;
78979+}
78980+
78981+void
78982+gr_handle_vm86(void)
78983+{
78984+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
78985+ return;
78986+}
78987+
78988+void
78989+gr_log_badprocpid(const char *entry)
78990+{
78991+ gr_log_str(GR_DONT_AUDIT, GR_BADPROCPID_MSG, entry);
78992+ return;
78993+}
78994diff --git a/grsecurity/grsec_mount.c b/grsecurity/grsec_mount.c
78995new file mode 100644
78996index 0000000..6f9eb73
78997--- /dev/null
78998+++ b/grsecurity/grsec_mount.c
78999@@ -0,0 +1,65 @@
79000+#include <linux/kernel.h>
79001+#include <linux/sched.h>
79002+#include <linux/mount.h>
79003+#include <linux/major.h>
79004+#include <linux/grsecurity.h>
79005+#include <linux/grinternal.h>
79006+
79007+void
79008+gr_log_remount(const char *devname, const int retval)
79009+{
79010+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
79011+ if (grsec_enable_mount && (retval >= 0))
79012+ gr_log_str(GR_DO_AUDIT, GR_REMOUNT_AUDIT_MSG, devname ? devname : "none");
79013+#endif
79014+ return;
79015+}
79016+
79017+void
79018+gr_log_unmount(const char *devname, const int retval)
79019+{
79020+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
79021+ if (grsec_enable_mount && (retval >= 0))
79022+ gr_log_str(GR_DO_AUDIT, GR_UNMOUNT_AUDIT_MSG, devname ? devname : "none");
79023+#endif
79024+ return;
79025+}
79026+
79027+void
79028+gr_log_mount(const char *from, struct path *to, const int retval)
79029+{
79030+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
79031+ if (grsec_enable_mount && (retval >= 0))
79032+ gr_log_str_fs(GR_DO_AUDIT, GR_MOUNT_AUDIT_MSG, from ? from : "none", to->dentry, to->mnt);
79033+#endif
79034+ return;
79035+}
79036+
79037+int
79038+gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags)
79039+{
79040+#ifdef CONFIG_GRKERNSEC_ROFS
79041+ if (grsec_enable_rofs && !(mnt_flags & MNT_READONLY)) {
79042+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_MOUNT_MSG, dentry, mnt);
79043+ return -EPERM;
79044+ } else
79045+ return 0;
79046+#endif
79047+ return 0;
79048+}
79049+
79050+int
79051+gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode)
79052+{
79053+#ifdef CONFIG_GRKERNSEC_ROFS
79054+ struct inode *inode = dentry->d_inode;
79055+
79056+ if (grsec_enable_rofs && (acc_mode & MAY_WRITE) &&
79057+ inode && (S_ISBLK(inode->i_mode) || (S_ISCHR(inode->i_mode) && imajor(inode) == RAW_MAJOR))) {
79058+ gr_log_fs_generic(GR_DO_AUDIT, GR_ROFS_BLOCKWRITE_MSG, dentry, mnt);
79059+ return -EPERM;
79060+ } else
79061+ return 0;
79062+#endif
79063+ return 0;
79064+}
79065diff --git a/grsecurity/grsec_pax.c b/grsecurity/grsec_pax.c
79066new file mode 100644
79067index 0000000..6ee9d50
79068--- /dev/null
79069+++ b/grsecurity/grsec_pax.c
79070@@ -0,0 +1,45 @@
79071+#include <linux/kernel.h>
79072+#include <linux/sched.h>
79073+#include <linux/mm.h>
79074+#include <linux/file.h>
79075+#include <linux/grinternal.h>
79076+#include <linux/grsecurity.h>
79077+
79078+void
79079+gr_log_textrel(struct vm_area_struct * vma)
79080+{
79081+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
79082+ if (grsec_enable_log_rwxmaps)
79083+ gr_log_textrel_ulong_ulong(GR_DONT_AUDIT, GR_TEXTREL_AUDIT_MSG, vma->vm_file, vma->vm_start, vma->vm_pgoff);
79084+#endif
79085+ return;
79086+}
79087+
79088+void gr_log_ptgnustack(struct file *file)
79089+{
79090+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
79091+ if (grsec_enable_log_rwxmaps)
79092+ gr_log_rwxmap(GR_DONT_AUDIT, GR_PTGNUSTACK_MSG, file);
79093+#endif
79094+ return;
79095+}
79096+
79097+void
79098+gr_log_rwxmmap(struct file *file)
79099+{
79100+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
79101+ if (grsec_enable_log_rwxmaps)
79102+ gr_log_rwxmap(GR_DONT_AUDIT, GR_RWXMMAP_MSG, file);
79103+#endif
79104+ return;
79105+}
79106+
79107+void
79108+gr_log_rwxmprotect(struct vm_area_struct *vma)
79109+{
79110+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
79111+ if (grsec_enable_log_rwxmaps)
79112+ gr_log_rwxmap_vma(GR_DONT_AUDIT, GR_RWXMPROTECT_MSG, vma);
79113+#endif
79114+ return;
79115+}
79116diff --git a/grsecurity/grsec_proc.c b/grsecurity/grsec_proc.c
79117new file mode 100644
79118index 0000000..2005a3a
79119--- /dev/null
79120+++ b/grsecurity/grsec_proc.c
79121@@ -0,0 +1,20 @@
79122+#include <linux/kernel.h>
79123+#include <linux/sched.h>
79124+#include <linux/grsecurity.h>
79125+#include <linux/grinternal.h>
79126+
79127+int gr_proc_is_restricted(void)
79128+{
79129+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
79130+ const struct cred *cred = current_cred();
79131+#endif
79132+
79133+#ifdef CONFIG_GRKERNSEC_PROC_USER
79134+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID))
79135+ return -EACCES;
79136+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
79137+ if (!uid_eq(cred->fsuid, GLOBAL_ROOT_UID) && !in_group_p(grsec_proc_gid))
79138+ return -EACCES;
79139+#endif
79140+ return 0;
79141+}
79142diff --git a/grsecurity/grsec_ptrace.c b/grsecurity/grsec_ptrace.c
79143new file mode 100644
79144index 0000000..f7f29aa
79145--- /dev/null
79146+++ b/grsecurity/grsec_ptrace.c
79147@@ -0,0 +1,30 @@
79148+#include <linux/kernel.h>
79149+#include <linux/sched.h>
79150+#include <linux/grinternal.h>
79151+#include <linux/security.h>
79152+
79153+void
79154+gr_audit_ptrace(struct task_struct *task)
79155+{
79156+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
79157+ if (grsec_enable_audit_ptrace)
79158+ gr_log_ptrace(GR_DO_AUDIT, GR_PTRACE_AUDIT_MSG, task);
79159+#endif
79160+ return;
79161+}
79162+
79163+int
79164+gr_ptrace_readexec(struct file *file, int unsafe_flags)
79165+{
79166+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
79167+ const struct dentry *dentry = file->f_path.dentry;
79168+ const struct vfsmount *mnt = file->f_path.mnt;
79169+
79170+ if (grsec_enable_ptrace_readexec && (unsafe_flags & LSM_UNSAFE_PTRACE) &&
79171+ (inode_permission(dentry->d_inode, MAY_READ) || !gr_acl_handle_open(dentry, mnt, MAY_READ))) {
79172+ gr_log_fs_generic(GR_DONT_AUDIT, GR_PTRACE_READEXEC_MSG, dentry, mnt);
79173+ return -EACCES;
79174+ }
79175+#endif
79176+ return 0;
79177+}
79178diff --git a/grsecurity/grsec_sig.c b/grsecurity/grsec_sig.c
79179new file mode 100644
79180index 0000000..3860c7e
79181--- /dev/null
79182+++ b/grsecurity/grsec_sig.c
79183@@ -0,0 +1,236 @@
79184+#include <linux/kernel.h>
79185+#include <linux/sched.h>
79186+#include <linux/fs.h>
79187+#include <linux/delay.h>
79188+#include <linux/grsecurity.h>
79189+#include <linux/grinternal.h>
79190+#include <linux/hardirq.h>
79191+
79192+char *signames[] = {
79193+ [SIGSEGV] = "Segmentation fault",
79194+ [SIGILL] = "Illegal instruction",
79195+ [SIGABRT] = "Abort",
79196+ [SIGBUS] = "Invalid alignment/Bus error"
79197+};
79198+
79199+void
79200+gr_log_signal(const int sig, const void *addr, const struct task_struct *t)
79201+{
79202+#ifdef CONFIG_GRKERNSEC_SIGNAL
79203+ if (grsec_enable_signal && ((sig == SIGSEGV) || (sig == SIGILL) ||
79204+ (sig == SIGABRT) || (sig == SIGBUS))) {
79205+ if (task_pid_nr(t) == task_pid_nr(current)) {
79206+ gr_log_sig_addr(GR_DONT_AUDIT_GOOD, GR_UNISIGLOG_MSG, signames[sig], addr);
79207+ } else {
79208+ gr_log_sig_task(GR_DONT_AUDIT_GOOD, GR_DUALSIGLOG_MSG, t, sig);
79209+ }
79210+ }
79211+#endif
79212+ return;
79213+}
79214+
79215+int
79216+gr_handle_signal(const struct task_struct *p, const int sig)
79217+{
79218+#ifdef CONFIG_GRKERNSEC
79219+ /* ignore the 0 signal for protected task checks */
79220+ if (task_pid_nr(current) > 1 && sig && gr_check_protected_task(p)) {
79221+ gr_log_sig_task(GR_DONT_AUDIT, GR_SIG_ACL_MSG, p, sig);
79222+ return -EPERM;
79223+ } else if (gr_pid_is_chrooted((struct task_struct *)p)) {
79224+ return -EPERM;
79225+ }
79226+#endif
79227+ return 0;
79228+}
79229+
79230+#ifdef CONFIG_GRKERNSEC
79231+extern int specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t);
79232+
79233+int gr_fake_force_sig(int sig, struct task_struct *t)
79234+{
79235+ unsigned long int flags;
79236+ int ret, blocked, ignored;
79237+ struct k_sigaction *action;
79238+
79239+ spin_lock_irqsave(&t->sighand->siglock, flags);
79240+ action = &t->sighand->action[sig-1];
79241+ ignored = action->sa.sa_handler == SIG_IGN;
79242+ blocked = sigismember(&t->blocked, sig);
79243+ if (blocked || ignored) {
79244+ action->sa.sa_handler = SIG_DFL;
79245+ if (blocked) {
79246+ sigdelset(&t->blocked, sig);
79247+ recalc_sigpending_and_wake(t);
79248+ }
79249+ }
79250+ if (action->sa.sa_handler == SIG_DFL)
79251+ t->signal->flags &= ~SIGNAL_UNKILLABLE;
79252+ ret = specific_send_sig_info(sig, SEND_SIG_PRIV, t);
79253+
79254+ spin_unlock_irqrestore(&t->sighand->siglock, flags);
79255+
79256+ return ret;
79257+}
79258+#endif
79259+
79260+#define GR_USER_BAN_TIME (15 * 60)
79261+#define GR_DAEMON_BRUTE_TIME (30 * 60)
79262+
79263+void gr_handle_brute_attach(int dumpable)
79264+{
79265+#ifdef CONFIG_GRKERNSEC_BRUTE
79266+ struct task_struct *p = current;
79267+ kuid_t uid = GLOBAL_ROOT_UID;
79268+ int daemon = 0;
79269+
79270+ if (!grsec_enable_brute)
79271+ return;
79272+
79273+ rcu_read_lock();
79274+ read_lock(&tasklist_lock);
79275+ read_lock(&grsec_exec_file_lock);
79276+ if (p->real_parent && gr_is_same_file(p->real_parent->exec_file, p->exec_file)) {
79277+ p->real_parent->brute_expires = get_seconds() + GR_DAEMON_BRUTE_TIME;
79278+ p->real_parent->brute = 1;
79279+ daemon = 1;
79280+ } else {
79281+ const struct cred *cred = __task_cred(p), *cred2;
79282+ struct task_struct *tsk, *tsk2;
79283+
79284+ if (dumpable != SUID_DUMP_USER && gr_is_global_nonroot(cred->uid)) {
79285+ struct user_struct *user;
79286+
79287+ uid = cred->uid;
79288+
79289+ /* this is put upon execution past expiration */
79290+ user = find_user(uid);
79291+ if (user == NULL)
79292+ goto unlock;
79293+ user->suid_banned = 1;
79294+ user->suid_ban_expires = get_seconds() + GR_USER_BAN_TIME;
79295+ if (user->suid_ban_expires == ~0UL)
79296+ user->suid_ban_expires--;
79297+
79298+ /* only kill other threads of the same binary, from the same user */
79299+ do_each_thread(tsk2, tsk) {
79300+ cred2 = __task_cred(tsk);
79301+ if (tsk != p && uid_eq(cred2->uid, uid) && gr_is_same_file(tsk->exec_file, p->exec_file))
79302+ gr_fake_force_sig(SIGKILL, tsk);
79303+ } while_each_thread(tsk2, tsk);
79304+ }
79305+ }
79306+unlock:
79307+ read_unlock(&grsec_exec_file_lock);
79308+ read_unlock(&tasklist_lock);
79309+ rcu_read_unlock();
79310+
79311+ if (gr_is_global_nonroot(uid))
79312+ 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);
79313+ else if (daemon)
79314+ gr_log_noargs(GR_DONT_AUDIT, GR_BRUTE_DAEMON_MSG);
79315+
79316+#endif
79317+ return;
79318+}
79319+
79320+void gr_handle_brute_check(void)
79321+{
79322+#ifdef CONFIG_GRKERNSEC_BRUTE
79323+ struct task_struct *p = current;
79324+
79325+ if (unlikely(p->brute)) {
79326+ if (!grsec_enable_brute)
79327+ p->brute = 0;
79328+ else if (time_before(get_seconds(), p->brute_expires))
79329+ msleep(30 * 1000);
79330+ }
79331+#endif
79332+ return;
79333+}
79334+
79335+void gr_handle_kernel_exploit(void)
79336+{
79337+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
79338+ const struct cred *cred;
79339+ struct task_struct *tsk, *tsk2;
79340+ struct user_struct *user;
79341+ kuid_t uid;
79342+
79343+ if (in_irq() || in_serving_softirq() || in_nmi())
79344+ panic("grsec: halting the system due to suspicious kernel crash caused in interrupt context");
79345+
79346+ uid = current_uid();
79347+
79348+ if (gr_is_global_root(uid))
79349+ panic("grsec: halting the system due to suspicious kernel crash caused by root");
79350+ else {
79351+ /* kill all the processes of this user, hold a reference
79352+ to their creds struct, and prevent them from creating
79353+ another process until system reset
79354+ */
79355+ printk(KERN_ALERT "grsec: banning user with uid %u until system restart for suspicious kernel crash\n",
79356+ GR_GLOBAL_UID(uid));
79357+ /* we intentionally leak this ref */
79358+ user = get_uid(current->cred->user);
79359+ if (user)
79360+ user->kernel_banned = 1;
79361+
79362+ /* kill all processes of this user */
79363+ read_lock(&tasklist_lock);
79364+ do_each_thread(tsk2, tsk) {
79365+ cred = __task_cred(tsk);
79366+ if (uid_eq(cred->uid, uid))
79367+ gr_fake_force_sig(SIGKILL, tsk);
79368+ } while_each_thread(tsk2, tsk);
79369+ read_unlock(&tasklist_lock);
79370+ }
79371+#endif
79372+}
79373+
79374+#ifdef CONFIG_GRKERNSEC_BRUTE
79375+static bool suid_ban_expired(struct user_struct *user)
79376+{
79377+ if (user->suid_ban_expires != ~0UL && time_after_eq(get_seconds(), user->suid_ban_expires)) {
79378+ user->suid_banned = 0;
79379+ user->suid_ban_expires = 0;
79380+ free_uid(user);
79381+ return true;
79382+ }
79383+
79384+ return false;
79385+}
79386+#endif
79387+
79388+int gr_process_kernel_exec_ban(void)
79389+{
79390+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
79391+ if (unlikely(current->cred->user->kernel_banned))
79392+ return -EPERM;
79393+#endif
79394+ return 0;
79395+}
79396+
79397+int gr_process_kernel_setuid_ban(struct user_struct *user)
79398+{
79399+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
79400+ if (unlikely(user->kernel_banned))
79401+ gr_fake_force_sig(SIGKILL, current);
79402+#endif
79403+ return 0;
79404+}
79405+
79406+int gr_process_suid_exec_ban(const struct linux_binprm *bprm)
79407+{
79408+#ifdef CONFIG_GRKERNSEC_BRUTE
79409+ struct user_struct *user = current->cred->user;
79410+ if (unlikely(user->suid_banned)) {
79411+ if (suid_ban_expired(user))
79412+ return 0;
79413+ /* disallow execution of suid binaries only */
79414+ else if (!uid_eq(bprm->cred->euid, current->cred->uid))
79415+ return -EPERM;
79416+ }
79417+#endif
79418+ return 0;
79419+}
79420diff --git a/grsecurity/grsec_sock.c b/grsecurity/grsec_sock.c
79421new file mode 100644
79422index 0000000..e3650b6
79423--- /dev/null
79424+++ b/grsecurity/grsec_sock.c
79425@@ -0,0 +1,244 @@
79426+#include <linux/kernel.h>
79427+#include <linux/module.h>
79428+#include <linux/sched.h>
79429+#include <linux/file.h>
79430+#include <linux/net.h>
79431+#include <linux/in.h>
79432+#include <linux/ip.h>
79433+#include <net/sock.h>
79434+#include <net/inet_sock.h>
79435+#include <linux/grsecurity.h>
79436+#include <linux/grinternal.h>
79437+#include <linux/gracl.h>
79438+
79439+extern int gr_search_udp_recvmsg(const struct sock *sk, const struct sk_buff *skb);
79440+extern int gr_search_udp_sendmsg(const struct sock *sk, const struct sockaddr_in *addr);
79441+
79442+EXPORT_SYMBOL_GPL(gr_search_udp_recvmsg);
79443+EXPORT_SYMBOL_GPL(gr_search_udp_sendmsg);
79444+
79445+#ifdef CONFIG_UNIX_MODULE
79446+EXPORT_SYMBOL_GPL(gr_acl_handle_unix);
79447+EXPORT_SYMBOL_GPL(gr_acl_handle_mknod);
79448+EXPORT_SYMBOL_GPL(gr_handle_chroot_unix);
79449+EXPORT_SYMBOL_GPL(gr_handle_create);
79450+#endif
79451+
79452+#ifdef CONFIG_GRKERNSEC
79453+#define gr_conn_table_size 32749
79454+struct conn_table_entry {
79455+ struct conn_table_entry *next;
79456+ struct signal_struct *sig;
79457+};
79458+
79459+struct conn_table_entry *gr_conn_table[gr_conn_table_size];
79460+DEFINE_SPINLOCK(gr_conn_table_lock);
79461+
79462+extern const char * gr_socktype_to_name(unsigned char type);
79463+extern const char * gr_proto_to_name(unsigned char proto);
79464+extern const char * gr_sockfamily_to_name(unsigned char family);
79465+
79466+static __inline__ int
79467+conn_hash(__u32 saddr, __u32 daddr, __u16 sport, __u16 dport, unsigned int size)
79468+{
79469+ return ((daddr + saddr + (sport << 8) + (dport << 16)) % size);
79470+}
79471+
79472+static __inline__ int
79473+conn_match(const struct signal_struct *sig, __u32 saddr, __u32 daddr,
79474+ __u16 sport, __u16 dport)
79475+{
79476+ if (unlikely(sig->gr_saddr == saddr && sig->gr_daddr == daddr &&
79477+ sig->gr_sport == sport && sig->gr_dport == dport))
79478+ return 1;
79479+ else
79480+ return 0;
79481+}
79482+
79483+static void gr_add_to_task_ip_table_nolock(struct signal_struct *sig, struct conn_table_entry *newent)
79484+{
79485+ struct conn_table_entry **match;
79486+ unsigned int index;
79487+
79488+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
79489+ sig->gr_sport, sig->gr_dport,
79490+ gr_conn_table_size);
79491+
79492+ newent->sig = sig;
79493+
79494+ match = &gr_conn_table[index];
79495+ newent->next = *match;
79496+ *match = newent;
79497+
79498+ return;
79499+}
79500+
79501+static void gr_del_task_from_ip_table_nolock(struct signal_struct *sig)
79502+{
79503+ struct conn_table_entry *match, *last = NULL;
79504+ unsigned int index;
79505+
79506+ index = conn_hash(sig->gr_saddr, sig->gr_daddr,
79507+ sig->gr_sport, sig->gr_dport,
79508+ gr_conn_table_size);
79509+
79510+ match = gr_conn_table[index];
79511+ while (match && !conn_match(match->sig,
79512+ sig->gr_saddr, sig->gr_daddr, sig->gr_sport,
79513+ sig->gr_dport)) {
79514+ last = match;
79515+ match = match->next;
79516+ }
79517+
79518+ if (match) {
79519+ if (last)
79520+ last->next = match->next;
79521+ else
79522+ gr_conn_table[index] = NULL;
79523+ kfree(match);
79524+ }
79525+
79526+ return;
79527+}
79528+
79529+static struct signal_struct * gr_lookup_task_ip_table(__u32 saddr, __u32 daddr,
79530+ __u16 sport, __u16 dport)
79531+{
79532+ struct conn_table_entry *match;
79533+ unsigned int index;
79534+
79535+ index = conn_hash(saddr, daddr, sport, dport, gr_conn_table_size);
79536+
79537+ match = gr_conn_table[index];
79538+ while (match && !conn_match(match->sig, saddr, daddr, sport, dport))
79539+ match = match->next;
79540+
79541+ if (match)
79542+ return match->sig;
79543+ else
79544+ return NULL;
79545+}
79546+
79547+#endif
79548+
79549+void gr_update_task_in_ip_table(const struct inet_sock *inet)
79550+{
79551+#ifdef CONFIG_GRKERNSEC
79552+ struct signal_struct *sig = current->signal;
79553+ struct conn_table_entry *newent;
79554+
79555+ newent = kmalloc(sizeof(struct conn_table_entry), GFP_ATOMIC);
79556+ if (newent == NULL)
79557+ return;
79558+ /* no bh lock needed since we are called with bh disabled */
79559+ spin_lock(&gr_conn_table_lock);
79560+ gr_del_task_from_ip_table_nolock(sig);
79561+ sig->gr_saddr = inet->inet_rcv_saddr;
79562+ sig->gr_daddr = inet->inet_daddr;
79563+ sig->gr_sport = inet->inet_sport;
79564+ sig->gr_dport = inet->inet_dport;
79565+ gr_add_to_task_ip_table_nolock(sig, newent);
79566+ spin_unlock(&gr_conn_table_lock);
79567+#endif
79568+ return;
79569+}
79570+
79571+void gr_del_task_from_ip_table(struct task_struct *task)
79572+{
79573+#ifdef CONFIG_GRKERNSEC
79574+ spin_lock_bh(&gr_conn_table_lock);
79575+ gr_del_task_from_ip_table_nolock(task->signal);
79576+ spin_unlock_bh(&gr_conn_table_lock);
79577+#endif
79578+ return;
79579+}
79580+
79581+void
79582+gr_attach_curr_ip(const struct sock *sk)
79583+{
79584+#ifdef CONFIG_GRKERNSEC
79585+ struct signal_struct *p, *set;
79586+ const struct inet_sock *inet = inet_sk(sk);
79587+
79588+ if (unlikely(sk->sk_protocol != IPPROTO_TCP))
79589+ return;
79590+
79591+ set = current->signal;
79592+
79593+ spin_lock_bh(&gr_conn_table_lock);
79594+ p = gr_lookup_task_ip_table(inet->inet_daddr, inet->inet_rcv_saddr,
79595+ inet->inet_dport, inet->inet_sport);
79596+ if (unlikely(p != NULL)) {
79597+ set->curr_ip = p->curr_ip;
79598+ set->used_accept = 1;
79599+ gr_del_task_from_ip_table_nolock(p);
79600+ spin_unlock_bh(&gr_conn_table_lock);
79601+ return;
79602+ }
79603+ spin_unlock_bh(&gr_conn_table_lock);
79604+
79605+ set->curr_ip = inet->inet_daddr;
79606+ set->used_accept = 1;
79607+#endif
79608+ return;
79609+}
79610+
79611+int
79612+gr_handle_sock_all(const int family, const int type, const int protocol)
79613+{
79614+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
79615+ if (grsec_enable_socket_all && in_group_p(grsec_socket_all_gid) &&
79616+ (family != AF_UNIX)) {
79617+ if (family == AF_INET)
79618+ gr_log_str3(GR_DONT_AUDIT, GR_SOCK_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), gr_proto_to_name(protocol));
79619+ else
79620+ gr_log_str2_int(GR_DONT_AUDIT, GR_SOCK_NOINET_MSG, gr_sockfamily_to_name(family), gr_socktype_to_name(type), protocol);
79621+ return -EACCES;
79622+ }
79623+#endif
79624+ return 0;
79625+}
79626+
79627+int
79628+gr_handle_sock_server(const struct sockaddr *sck)
79629+{
79630+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
79631+ if (grsec_enable_socket_server &&
79632+ in_group_p(grsec_socket_server_gid) &&
79633+ sck && (sck->sa_family != AF_UNIX) &&
79634+ (sck->sa_family != AF_LOCAL)) {
79635+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
79636+ return -EACCES;
79637+ }
79638+#endif
79639+ return 0;
79640+}
79641+
79642+int
79643+gr_handle_sock_server_other(const struct sock *sck)
79644+{
79645+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
79646+ if (grsec_enable_socket_server &&
79647+ in_group_p(grsec_socket_server_gid) &&
79648+ sck && (sck->sk_family != AF_UNIX) &&
79649+ (sck->sk_family != AF_LOCAL)) {
79650+ gr_log_noargs(GR_DONT_AUDIT, GR_BIND_MSG);
79651+ return -EACCES;
79652+ }
79653+#endif
79654+ return 0;
79655+}
79656+
79657+int
79658+gr_handle_sock_client(const struct sockaddr *sck)
79659+{
79660+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
79661+ if (grsec_enable_socket_client && in_group_p(grsec_socket_client_gid) &&
79662+ sck && (sck->sa_family != AF_UNIX) &&
79663+ (sck->sa_family != AF_LOCAL)) {
79664+ gr_log_noargs(GR_DONT_AUDIT, GR_CONNECT_MSG);
79665+ return -EACCES;
79666+ }
79667+#endif
79668+ return 0;
79669+}
79670diff --git a/grsecurity/grsec_sysctl.c b/grsecurity/grsec_sysctl.c
79671new file mode 100644
79672index 0000000..cce889e
79673--- /dev/null
79674+++ b/grsecurity/grsec_sysctl.c
79675@@ -0,0 +1,488 @@
79676+#include <linux/kernel.h>
79677+#include <linux/sched.h>
79678+#include <linux/sysctl.h>
79679+#include <linux/grsecurity.h>
79680+#include <linux/grinternal.h>
79681+
79682+int
79683+gr_handle_sysctl_mod(const char *dirname, const char *name, const int op)
79684+{
79685+#ifdef CONFIG_GRKERNSEC_SYSCTL
79686+ if (dirname == NULL || name == NULL)
79687+ return 0;
79688+ if (!strcmp(dirname, "grsecurity") && grsec_lock && (op & MAY_WRITE)) {
79689+ gr_log_str(GR_DONT_AUDIT, GR_SYSCTL_MSG, name);
79690+ return -EACCES;
79691+ }
79692+#endif
79693+ return 0;
79694+}
79695+
79696+#if defined(CONFIG_GRKERNSEC_ROFS) || defined(CONFIG_GRKERNSEC_DENYUSB)
79697+static int __maybe_unused __read_only one = 1;
79698+#endif
79699+
79700+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS) || \
79701+ defined(CONFIG_GRKERNSEC_DENYUSB)
79702+struct ctl_table grsecurity_table[] = {
79703+#ifdef CONFIG_GRKERNSEC_SYSCTL
79704+#ifdef CONFIG_GRKERNSEC_SYSCTL_DISTRO
79705+#ifdef CONFIG_GRKERNSEC_IO
79706+ {
79707+ .procname = "disable_priv_io",
79708+ .data = &grsec_disable_privio,
79709+ .maxlen = sizeof(int),
79710+ .mode = 0600,
79711+ .proc_handler = &proc_dointvec,
79712+ },
79713+#endif
79714+#endif
79715+#ifdef CONFIG_GRKERNSEC_LINK
79716+ {
79717+ .procname = "linking_restrictions",
79718+ .data = &grsec_enable_link,
79719+ .maxlen = sizeof(int),
79720+ .mode = 0600,
79721+ .proc_handler = &proc_dointvec,
79722+ },
79723+#endif
79724+#ifdef CONFIG_GRKERNSEC_SYMLINKOWN
79725+ {
79726+ .procname = "enforce_symlinksifowner",
79727+ .data = &grsec_enable_symlinkown,
79728+ .maxlen = sizeof(int),
79729+ .mode = 0600,
79730+ .proc_handler = &proc_dointvec,
79731+ },
79732+ {
79733+ .procname = "symlinkown_gid",
79734+ .data = &grsec_symlinkown_gid,
79735+ .maxlen = sizeof(int),
79736+ .mode = 0600,
79737+ .proc_handler = &proc_dointvec,
79738+ },
79739+#endif
79740+#ifdef CONFIG_GRKERNSEC_BRUTE
79741+ {
79742+ .procname = "deter_bruteforce",
79743+ .data = &grsec_enable_brute,
79744+ .maxlen = sizeof(int),
79745+ .mode = 0600,
79746+ .proc_handler = &proc_dointvec,
79747+ },
79748+#endif
79749+#ifdef CONFIG_GRKERNSEC_FIFO
79750+ {
79751+ .procname = "fifo_restrictions",
79752+ .data = &grsec_enable_fifo,
79753+ .maxlen = sizeof(int),
79754+ .mode = 0600,
79755+ .proc_handler = &proc_dointvec,
79756+ },
79757+#endif
79758+#ifdef CONFIG_GRKERNSEC_PTRACE_READEXEC
79759+ {
79760+ .procname = "ptrace_readexec",
79761+ .data = &grsec_enable_ptrace_readexec,
79762+ .maxlen = sizeof(int),
79763+ .mode = 0600,
79764+ .proc_handler = &proc_dointvec,
79765+ },
79766+#endif
79767+#ifdef CONFIG_GRKERNSEC_SETXID
79768+ {
79769+ .procname = "consistent_setxid",
79770+ .data = &grsec_enable_setxid,
79771+ .maxlen = sizeof(int),
79772+ .mode = 0600,
79773+ .proc_handler = &proc_dointvec,
79774+ },
79775+#endif
79776+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
79777+ {
79778+ .procname = "ip_blackhole",
79779+ .data = &grsec_enable_blackhole,
79780+ .maxlen = sizeof(int),
79781+ .mode = 0600,
79782+ .proc_handler = &proc_dointvec,
79783+ },
79784+ {
79785+ .procname = "lastack_retries",
79786+ .data = &grsec_lastack_retries,
79787+ .maxlen = sizeof(int),
79788+ .mode = 0600,
79789+ .proc_handler = &proc_dointvec,
79790+ },
79791+#endif
79792+#ifdef CONFIG_GRKERNSEC_EXECLOG
79793+ {
79794+ .procname = "exec_logging",
79795+ .data = &grsec_enable_execlog,
79796+ .maxlen = sizeof(int),
79797+ .mode = 0600,
79798+ .proc_handler = &proc_dointvec,
79799+ },
79800+#endif
79801+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
79802+ {
79803+ .procname = "rwxmap_logging",
79804+ .data = &grsec_enable_log_rwxmaps,
79805+ .maxlen = sizeof(int),
79806+ .mode = 0600,
79807+ .proc_handler = &proc_dointvec,
79808+ },
79809+#endif
79810+#ifdef CONFIG_GRKERNSEC_SIGNAL
79811+ {
79812+ .procname = "signal_logging",
79813+ .data = &grsec_enable_signal,
79814+ .maxlen = sizeof(int),
79815+ .mode = 0600,
79816+ .proc_handler = &proc_dointvec,
79817+ },
79818+#endif
79819+#ifdef CONFIG_GRKERNSEC_FORKFAIL
79820+ {
79821+ .procname = "forkfail_logging",
79822+ .data = &grsec_enable_forkfail,
79823+ .maxlen = sizeof(int),
79824+ .mode = 0600,
79825+ .proc_handler = &proc_dointvec,
79826+ },
79827+#endif
79828+#ifdef CONFIG_GRKERNSEC_TIME
79829+ {
79830+ .procname = "timechange_logging",
79831+ .data = &grsec_enable_time,
79832+ .maxlen = sizeof(int),
79833+ .mode = 0600,
79834+ .proc_handler = &proc_dointvec,
79835+ },
79836+#endif
79837+#ifdef CONFIG_GRKERNSEC_CHROOT_SHMAT
79838+ {
79839+ .procname = "chroot_deny_shmat",
79840+ .data = &grsec_enable_chroot_shmat,
79841+ .maxlen = sizeof(int),
79842+ .mode = 0600,
79843+ .proc_handler = &proc_dointvec,
79844+ },
79845+#endif
79846+#ifdef CONFIG_GRKERNSEC_CHROOT_UNIX
79847+ {
79848+ .procname = "chroot_deny_unix",
79849+ .data = &grsec_enable_chroot_unix,
79850+ .maxlen = sizeof(int),
79851+ .mode = 0600,
79852+ .proc_handler = &proc_dointvec,
79853+ },
79854+#endif
79855+#ifdef CONFIG_GRKERNSEC_CHROOT_MOUNT
79856+ {
79857+ .procname = "chroot_deny_mount",
79858+ .data = &grsec_enable_chroot_mount,
79859+ .maxlen = sizeof(int),
79860+ .mode = 0600,
79861+ .proc_handler = &proc_dointvec,
79862+ },
79863+#endif
79864+#ifdef CONFIG_GRKERNSEC_CHROOT_FCHDIR
79865+ {
79866+ .procname = "chroot_deny_fchdir",
79867+ .data = &grsec_enable_chroot_fchdir,
79868+ .maxlen = sizeof(int),
79869+ .mode = 0600,
79870+ .proc_handler = &proc_dointvec,
79871+ },
79872+#endif
79873+#ifdef CONFIG_GRKERNSEC_CHROOT_DOUBLE
79874+ {
79875+ .procname = "chroot_deny_chroot",
79876+ .data = &grsec_enable_chroot_double,
79877+ .maxlen = sizeof(int),
79878+ .mode = 0600,
79879+ .proc_handler = &proc_dointvec,
79880+ },
79881+#endif
79882+#ifdef CONFIG_GRKERNSEC_CHROOT_PIVOT
79883+ {
79884+ .procname = "chroot_deny_pivot",
79885+ .data = &grsec_enable_chroot_pivot,
79886+ .maxlen = sizeof(int),
79887+ .mode = 0600,
79888+ .proc_handler = &proc_dointvec,
79889+ },
79890+#endif
79891+#ifdef CONFIG_GRKERNSEC_CHROOT_CHDIR
79892+ {
79893+ .procname = "chroot_enforce_chdir",
79894+ .data = &grsec_enable_chroot_chdir,
79895+ .maxlen = sizeof(int),
79896+ .mode = 0600,
79897+ .proc_handler = &proc_dointvec,
79898+ },
79899+#endif
79900+#ifdef CONFIG_GRKERNSEC_CHROOT_CHMOD
79901+ {
79902+ .procname = "chroot_deny_chmod",
79903+ .data = &grsec_enable_chroot_chmod,
79904+ .maxlen = sizeof(int),
79905+ .mode = 0600,
79906+ .proc_handler = &proc_dointvec,
79907+ },
79908+#endif
79909+#ifdef CONFIG_GRKERNSEC_CHROOT_MKNOD
79910+ {
79911+ .procname = "chroot_deny_mknod",
79912+ .data = &grsec_enable_chroot_mknod,
79913+ .maxlen = sizeof(int),
79914+ .mode = 0600,
79915+ .proc_handler = &proc_dointvec,
79916+ },
79917+#endif
79918+#ifdef CONFIG_GRKERNSEC_CHROOT_NICE
79919+ {
79920+ .procname = "chroot_restrict_nice",
79921+ .data = &grsec_enable_chroot_nice,
79922+ .maxlen = sizeof(int),
79923+ .mode = 0600,
79924+ .proc_handler = &proc_dointvec,
79925+ },
79926+#endif
79927+#ifdef CONFIG_GRKERNSEC_CHROOT_EXECLOG
79928+ {
79929+ .procname = "chroot_execlog",
79930+ .data = &grsec_enable_chroot_execlog,
79931+ .maxlen = sizeof(int),
79932+ .mode = 0600,
79933+ .proc_handler = &proc_dointvec,
79934+ },
79935+#endif
79936+#ifdef CONFIG_GRKERNSEC_CHROOT_CAPS
79937+ {
79938+ .procname = "chroot_caps",
79939+ .data = &grsec_enable_chroot_caps,
79940+ .maxlen = sizeof(int),
79941+ .mode = 0600,
79942+ .proc_handler = &proc_dointvec,
79943+ },
79944+#endif
79945+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
79946+ {
79947+ .procname = "chroot_deny_bad_rename",
79948+ .data = &grsec_enable_chroot_rename,
79949+ .maxlen = sizeof(int),
79950+ .mode = 0600,
79951+ .proc_handler = &proc_dointvec,
79952+ },
79953+#endif
79954+#ifdef CONFIG_GRKERNSEC_CHROOT_SYSCTL
79955+ {
79956+ .procname = "chroot_deny_sysctl",
79957+ .data = &grsec_enable_chroot_sysctl,
79958+ .maxlen = sizeof(int),
79959+ .mode = 0600,
79960+ .proc_handler = &proc_dointvec,
79961+ },
79962+#endif
79963+#ifdef CONFIG_GRKERNSEC_TPE
79964+ {
79965+ .procname = "tpe",
79966+ .data = &grsec_enable_tpe,
79967+ .maxlen = sizeof(int),
79968+ .mode = 0600,
79969+ .proc_handler = &proc_dointvec,
79970+ },
79971+ {
79972+ .procname = "tpe_gid",
79973+ .data = &grsec_tpe_gid,
79974+ .maxlen = sizeof(int),
79975+ .mode = 0600,
79976+ .proc_handler = &proc_dointvec,
79977+ },
79978+#endif
79979+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
79980+ {
79981+ .procname = "tpe_invert",
79982+ .data = &grsec_enable_tpe_invert,
79983+ .maxlen = sizeof(int),
79984+ .mode = 0600,
79985+ .proc_handler = &proc_dointvec,
79986+ },
79987+#endif
79988+#ifdef CONFIG_GRKERNSEC_TPE_ALL
79989+ {
79990+ .procname = "tpe_restrict_all",
79991+ .data = &grsec_enable_tpe_all,
79992+ .maxlen = sizeof(int),
79993+ .mode = 0600,
79994+ .proc_handler = &proc_dointvec,
79995+ },
79996+#endif
79997+#ifdef CONFIG_GRKERNSEC_SOCKET_ALL
79998+ {
79999+ .procname = "socket_all",
80000+ .data = &grsec_enable_socket_all,
80001+ .maxlen = sizeof(int),
80002+ .mode = 0600,
80003+ .proc_handler = &proc_dointvec,
80004+ },
80005+ {
80006+ .procname = "socket_all_gid",
80007+ .data = &grsec_socket_all_gid,
80008+ .maxlen = sizeof(int),
80009+ .mode = 0600,
80010+ .proc_handler = &proc_dointvec,
80011+ },
80012+#endif
80013+#ifdef CONFIG_GRKERNSEC_SOCKET_CLIENT
80014+ {
80015+ .procname = "socket_client",
80016+ .data = &grsec_enable_socket_client,
80017+ .maxlen = sizeof(int),
80018+ .mode = 0600,
80019+ .proc_handler = &proc_dointvec,
80020+ },
80021+ {
80022+ .procname = "socket_client_gid",
80023+ .data = &grsec_socket_client_gid,
80024+ .maxlen = sizeof(int),
80025+ .mode = 0600,
80026+ .proc_handler = &proc_dointvec,
80027+ },
80028+#endif
80029+#ifdef CONFIG_GRKERNSEC_SOCKET_SERVER
80030+ {
80031+ .procname = "socket_server",
80032+ .data = &grsec_enable_socket_server,
80033+ .maxlen = sizeof(int),
80034+ .mode = 0600,
80035+ .proc_handler = &proc_dointvec,
80036+ },
80037+ {
80038+ .procname = "socket_server_gid",
80039+ .data = &grsec_socket_server_gid,
80040+ .maxlen = sizeof(int),
80041+ .mode = 0600,
80042+ .proc_handler = &proc_dointvec,
80043+ },
80044+#endif
80045+#ifdef CONFIG_GRKERNSEC_AUDIT_GROUP
80046+ {
80047+ .procname = "audit_group",
80048+ .data = &grsec_enable_group,
80049+ .maxlen = sizeof(int),
80050+ .mode = 0600,
80051+ .proc_handler = &proc_dointvec,
80052+ },
80053+ {
80054+ .procname = "audit_gid",
80055+ .data = &grsec_audit_gid,
80056+ .maxlen = sizeof(int),
80057+ .mode = 0600,
80058+ .proc_handler = &proc_dointvec,
80059+ },
80060+#endif
80061+#ifdef CONFIG_GRKERNSEC_AUDIT_CHDIR
80062+ {
80063+ .procname = "audit_chdir",
80064+ .data = &grsec_enable_chdir,
80065+ .maxlen = sizeof(int),
80066+ .mode = 0600,
80067+ .proc_handler = &proc_dointvec,
80068+ },
80069+#endif
80070+#ifdef CONFIG_GRKERNSEC_AUDIT_MOUNT
80071+ {
80072+ .procname = "audit_mount",
80073+ .data = &grsec_enable_mount,
80074+ .maxlen = sizeof(int),
80075+ .mode = 0600,
80076+ .proc_handler = &proc_dointvec,
80077+ },
80078+#endif
80079+#ifdef CONFIG_GRKERNSEC_DMESG
80080+ {
80081+ .procname = "dmesg",
80082+ .data = &grsec_enable_dmesg,
80083+ .maxlen = sizeof(int),
80084+ .mode = 0600,
80085+ .proc_handler = &proc_dointvec,
80086+ },
80087+#endif
80088+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
80089+ {
80090+ .procname = "chroot_findtask",
80091+ .data = &grsec_enable_chroot_findtask,
80092+ .maxlen = sizeof(int),
80093+ .mode = 0600,
80094+ .proc_handler = &proc_dointvec,
80095+ },
80096+#endif
80097+#ifdef CONFIG_GRKERNSEC_RESLOG
80098+ {
80099+ .procname = "resource_logging",
80100+ .data = &grsec_resource_logging,
80101+ .maxlen = sizeof(int),
80102+ .mode = 0600,
80103+ .proc_handler = &proc_dointvec,
80104+ },
80105+#endif
80106+#ifdef CONFIG_GRKERNSEC_AUDIT_PTRACE
80107+ {
80108+ .procname = "audit_ptrace",
80109+ .data = &grsec_enable_audit_ptrace,
80110+ .maxlen = sizeof(int),
80111+ .mode = 0600,
80112+ .proc_handler = &proc_dointvec,
80113+ },
80114+#endif
80115+#ifdef CONFIG_GRKERNSEC_HARDEN_PTRACE
80116+ {
80117+ .procname = "harden_ptrace",
80118+ .data = &grsec_enable_harden_ptrace,
80119+ .maxlen = sizeof(int),
80120+ .mode = 0600,
80121+ .proc_handler = &proc_dointvec,
80122+ },
80123+#endif
80124+#ifdef CONFIG_GRKERNSEC_HARDEN_IPC
80125+ {
80126+ .procname = "harden_ipc",
80127+ .data = &grsec_enable_harden_ipc,
80128+ .maxlen = sizeof(int),
80129+ .mode = 0600,
80130+ .proc_handler = &proc_dointvec,
80131+ },
80132+#endif
80133+ {
80134+ .procname = "grsec_lock",
80135+ .data = &grsec_lock,
80136+ .maxlen = sizeof(int),
80137+ .mode = 0600,
80138+ .proc_handler = &proc_dointvec,
80139+ },
80140+#endif
80141+#ifdef CONFIG_GRKERNSEC_ROFS
80142+ {
80143+ .procname = "romount_protect",
80144+ .data = &grsec_enable_rofs,
80145+ .maxlen = sizeof(int),
80146+ .mode = 0600,
80147+ .proc_handler = &proc_dointvec_minmax,
80148+ .extra1 = &one,
80149+ .extra2 = &one,
80150+ },
80151+#endif
80152+#if defined(CONFIG_GRKERNSEC_DENYUSB) && !defined(CONFIG_GRKERNSEC_DENYUSB_FORCE)
80153+ {
80154+ .procname = "deny_new_usb",
80155+ .data = &grsec_deny_new_usb,
80156+ .maxlen = sizeof(int),
80157+ .mode = 0600,
80158+ .proc_handler = &proc_dointvec,
80159+ },
80160+#endif
80161+ { }
80162+};
80163+#endif
80164diff --git a/grsecurity/grsec_time.c b/grsecurity/grsec_time.c
80165new file mode 100644
80166index 0000000..61b514e
80167--- /dev/null
80168+++ b/grsecurity/grsec_time.c
80169@@ -0,0 +1,16 @@
80170+#include <linux/kernel.h>
80171+#include <linux/sched.h>
80172+#include <linux/grinternal.h>
80173+#include <linux/module.h>
80174+
80175+void
80176+gr_log_timechange(void)
80177+{
80178+#ifdef CONFIG_GRKERNSEC_TIME
80179+ if (grsec_enable_time)
80180+ gr_log_noargs(GR_DONT_AUDIT_GOOD, GR_TIME_MSG);
80181+#endif
80182+ return;
80183+}
80184+
80185+EXPORT_SYMBOL_GPL(gr_log_timechange);
80186diff --git a/grsecurity/grsec_tpe.c b/grsecurity/grsec_tpe.c
80187new file mode 100644
80188index 0000000..d1953de
80189--- /dev/null
80190+++ b/grsecurity/grsec_tpe.c
80191@@ -0,0 +1,78 @@
80192+#include <linux/kernel.h>
80193+#include <linux/sched.h>
80194+#include <linux/file.h>
80195+#include <linux/fs.h>
80196+#include <linux/grinternal.h>
80197+
80198+extern int gr_acl_tpe_check(void);
80199+
80200+int
80201+gr_tpe_allow(const struct file *file)
80202+{
80203+#ifdef CONFIG_GRKERNSEC
80204+ struct inode *inode = file->f_path.dentry->d_parent->d_inode;
80205+ struct inode *file_inode = file->f_path.dentry->d_inode;
80206+ const struct cred *cred = current_cred();
80207+ char *msg = NULL;
80208+ char *msg2 = NULL;
80209+
80210+ // never restrict root
80211+ if (gr_is_global_root(cred->uid))
80212+ return 1;
80213+
80214+ if (grsec_enable_tpe) {
80215+#ifdef CONFIG_GRKERNSEC_TPE_INVERT
80216+ if (grsec_enable_tpe_invert && !in_group_p(grsec_tpe_gid))
80217+ msg = "not being in trusted group";
80218+ else if (!grsec_enable_tpe_invert && in_group_p(grsec_tpe_gid))
80219+ msg = "being in untrusted group";
80220+#else
80221+ if (in_group_p(grsec_tpe_gid))
80222+ msg = "being in untrusted group";
80223+#endif
80224+ }
80225+ if (!msg && gr_acl_tpe_check())
80226+ msg = "being in untrusted role";
80227+
80228+ // not in any affected group/role
80229+ if (!msg)
80230+ goto next_check;
80231+
80232+ if (gr_is_global_nonroot(inode->i_uid))
80233+ msg2 = "file in non-root-owned directory";
80234+ else if (inode->i_mode & S_IWOTH)
80235+ msg2 = "file in world-writable directory";
80236+ else if (inode->i_mode & S_IWGRP)
80237+ msg2 = "file in group-writable directory";
80238+ else if (file_inode->i_mode & S_IWOTH)
80239+ msg2 = "file is world-writable";
80240+
80241+ if (msg && msg2) {
80242+ char fullmsg[70] = {0};
80243+ snprintf(fullmsg, sizeof(fullmsg)-1, "%s and %s", msg, msg2);
80244+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, fullmsg, file->f_path.dentry, file->f_path.mnt);
80245+ return 0;
80246+ }
80247+ msg = NULL;
80248+next_check:
80249+#ifdef CONFIG_GRKERNSEC_TPE_ALL
80250+ if (!grsec_enable_tpe || !grsec_enable_tpe_all)
80251+ return 1;
80252+
80253+ if (gr_is_global_nonroot(inode->i_uid) && !uid_eq(inode->i_uid, cred->uid))
80254+ msg = "directory not owned by user";
80255+ else if (inode->i_mode & S_IWOTH)
80256+ msg = "file in world-writable directory";
80257+ else if (inode->i_mode & S_IWGRP)
80258+ msg = "file in group-writable directory";
80259+ else if (file_inode->i_mode & S_IWOTH)
80260+ msg = "file is world-writable";
80261+
80262+ if (msg) {
80263+ gr_log_str_fs(GR_DONT_AUDIT, GR_EXEC_TPE_MSG, msg, file->f_path.dentry, file->f_path.mnt);
80264+ return 0;
80265+ }
80266+#endif
80267+#endif
80268+ return 1;
80269+}
80270diff --git a/grsecurity/grsec_usb.c b/grsecurity/grsec_usb.c
80271new file mode 100644
80272index 0000000..ae02d8e
80273--- /dev/null
80274+++ b/grsecurity/grsec_usb.c
80275@@ -0,0 +1,15 @@
80276+#include <linux/kernel.h>
80277+#include <linux/grinternal.h>
80278+#include <linux/module.h>
80279+
80280+int gr_handle_new_usb(void)
80281+{
80282+#ifdef CONFIG_GRKERNSEC_DENYUSB
80283+ if (grsec_deny_new_usb) {
80284+ printk(KERN_ALERT "grsec: denied insert of new USB device\n");
80285+ return 1;
80286+ }
80287+#endif
80288+ return 0;
80289+}
80290+EXPORT_SYMBOL_GPL(gr_handle_new_usb);
80291diff --git a/grsecurity/grsum.c b/grsecurity/grsum.c
80292new file mode 100644
80293index 0000000..158b330
80294--- /dev/null
80295+++ b/grsecurity/grsum.c
80296@@ -0,0 +1,64 @@
80297+#include <linux/err.h>
80298+#include <linux/kernel.h>
80299+#include <linux/sched.h>
80300+#include <linux/mm.h>
80301+#include <linux/scatterlist.h>
80302+#include <linux/crypto.h>
80303+#include <linux/gracl.h>
80304+
80305+
80306+#if !defined(CONFIG_CRYPTO) || defined(CONFIG_CRYPTO_MODULE) || !defined(CONFIG_CRYPTO_SHA256) || defined(CONFIG_CRYPTO_SHA256_MODULE)
80307+#error "crypto and sha256 must be built into the kernel"
80308+#endif
80309+
80310+int
80311+chkpw(struct gr_arg *entry, unsigned char *salt, unsigned char *sum)
80312+{
80313+ struct crypto_hash *tfm;
80314+ struct hash_desc desc;
80315+ struct scatterlist sg[2];
80316+ unsigned char temp_sum[GR_SHA_LEN] __attribute__((aligned(__alignof__(unsigned long))));
80317+ unsigned long *tmpsumptr = (unsigned long *)temp_sum;
80318+ unsigned long *sumptr = (unsigned long *)sum;
80319+ int cryptres;
80320+ int retval = 1;
80321+ volatile int mismatched = 0;
80322+ volatile int dummy = 0;
80323+ unsigned int i;
80324+
80325+ tfm = crypto_alloc_hash("sha256", 0, CRYPTO_ALG_ASYNC);
80326+ if (IS_ERR(tfm)) {
80327+ /* should never happen, since sha256 should be built in */
80328+ memset(entry->pw, 0, GR_PW_LEN);
80329+ return 1;
80330+ }
80331+
80332+ sg_init_table(sg, 2);
80333+ sg_set_buf(&sg[0], salt, GR_SALT_LEN);
80334+ sg_set_buf(&sg[1], entry->pw, strlen(entry->pw));
80335+
80336+ desc.tfm = tfm;
80337+ desc.flags = 0;
80338+
80339+ cryptres = crypto_hash_digest(&desc, sg, GR_SALT_LEN + strlen(entry->pw),
80340+ temp_sum);
80341+
80342+ memset(entry->pw, 0, GR_PW_LEN);
80343+
80344+ if (cryptres)
80345+ goto out;
80346+
80347+ for (i = 0; i < GR_SHA_LEN/sizeof(tmpsumptr[0]); i++)
80348+ if (sumptr[i] != tmpsumptr[i])
80349+ mismatched = 1;
80350+ else
80351+ dummy = 1; // waste a cycle
80352+
80353+ if (!mismatched)
80354+ retval = dummy - 1;
80355+
80356+out:
80357+ crypto_free_hash(tfm);
80358+
80359+ return retval;
80360+}
80361diff --git a/include/asm-generic/4level-fixup.h b/include/asm-generic/4level-fixup.h
80362index 5bdab6b..9ae82fe 100644
80363--- a/include/asm-generic/4level-fixup.h
80364+++ b/include/asm-generic/4level-fixup.h
80365@@ -14,8 +14,10 @@
80366 #define pmd_alloc(mm, pud, address) \
80367 ((unlikely(pgd_none(*(pud))) && __pmd_alloc(mm, pud, address))? \
80368 NULL: pmd_offset(pud, address))
80369+#define pmd_alloc_kernel(mm, pud, address) pmd_alloc((mm), (pud), (address))
80370
80371 #define pud_alloc(mm, pgd, address) (pgd)
80372+#define pud_alloc_kernel(mm, pgd, address) pud_alloc((mm), (pgd), (address))
80373 #define pud_offset(pgd, start) (pgd)
80374 #define pud_none(pud) 0
80375 #define pud_bad(pud) 0
80376diff --git a/include/asm-generic/atomic-long.h b/include/asm-generic/atomic-long.h
80377index b7babf0..1e4b4f1 100644
80378--- a/include/asm-generic/atomic-long.h
80379+++ b/include/asm-generic/atomic-long.h
80380@@ -22,6 +22,12 @@
80381
80382 typedef atomic64_t atomic_long_t;
80383
80384+#ifdef CONFIG_PAX_REFCOUNT
80385+typedef atomic64_unchecked_t atomic_long_unchecked_t;
80386+#else
80387+typedef atomic64_t atomic_long_unchecked_t;
80388+#endif
80389+
80390 #define ATOMIC_LONG_INIT(i) ATOMIC64_INIT(i)
80391
80392 static inline long atomic_long_read(atomic_long_t *l)
80393@@ -31,6 +37,15 @@ static inline long atomic_long_read(atomic_long_t *l)
80394 return (long)atomic64_read(v);
80395 }
80396
80397+#ifdef CONFIG_PAX_REFCOUNT
80398+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
80399+{
80400+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
80401+
80402+ return (long)atomic64_read_unchecked(v);
80403+}
80404+#endif
80405+
80406 static inline void atomic_long_set(atomic_long_t *l, long i)
80407 {
80408 atomic64_t *v = (atomic64_t *)l;
80409@@ -38,6 +53,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
80410 atomic64_set(v, i);
80411 }
80412
80413+#ifdef CONFIG_PAX_REFCOUNT
80414+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
80415+{
80416+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
80417+
80418+ atomic64_set_unchecked(v, i);
80419+}
80420+#endif
80421+
80422 static inline void atomic_long_inc(atomic_long_t *l)
80423 {
80424 atomic64_t *v = (atomic64_t *)l;
80425@@ -45,6 +69,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
80426 atomic64_inc(v);
80427 }
80428
80429+#ifdef CONFIG_PAX_REFCOUNT
80430+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
80431+{
80432+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
80433+
80434+ atomic64_inc_unchecked(v);
80435+}
80436+#endif
80437+
80438 static inline void atomic_long_dec(atomic_long_t *l)
80439 {
80440 atomic64_t *v = (atomic64_t *)l;
80441@@ -52,6 +85,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
80442 atomic64_dec(v);
80443 }
80444
80445+#ifdef CONFIG_PAX_REFCOUNT
80446+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
80447+{
80448+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
80449+
80450+ atomic64_dec_unchecked(v);
80451+}
80452+#endif
80453+
80454 static inline void atomic_long_add(long i, atomic_long_t *l)
80455 {
80456 atomic64_t *v = (atomic64_t *)l;
80457@@ -59,6 +101,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
80458 atomic64_add(i, v);
80459 }
80460
80461+#ifdef CONFIG_PAX_REFCOUNT
80462+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
80463+{
80464+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
80465+
80466+ atomic64_add_unchecked(i, v);
80467+}
80468+#endif
80469+
80470 static inline void atomic_long_sub(long i, atomic_long_t *l)
80471 {
80472 atomic64_t *v = (atomic64_t *)l;
80473@@ -66,6 +117,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
80474 atomic64_sub(i, v);
80475 }
80476
80477+#ifdef CONFIG_PAX_REFCOUNT
80478+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
80479+{
80480+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
80481+
80482+ atomic64_sub_unchecked(i, v);
80483+}
80484+#endif
80485+
80486 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
80487 {
80488 atomic64_t *v = (atomic64_t *)l;
80489@@ -94,13 +154,22 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
80490 return atomic64_add_negative(i, v);
80491 }
80492
80493-static inline long atomic_long_add_return(long i, atomic_long_t *l)
80494+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
80495 {
80496 atomic64_t *v = (atomic64_t *)l;
80497
80498 return (long)atomic64_add_return(i, v);
80499 }
80500
80501+#ifdef CONFIG_PAX_REFCOUNT
80502+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
80503+{
80504+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
80505+
80506+ return (long)atomic64_add_return_unchecked(i, v);
80507+}
80508+#endif
80509+
80510 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
80511 {
80512 atomic64_t *v = (atomic64_t *)l;
80513@@ -115,6 +184,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
80514 return (long)atomic64_inc_return(v);
80515 }
80516
80517+#ifdef CONFIG_PAX_REFCOUNT
80518+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
80519+{
80520+ atomic64_unchecked_t *v = (atomic64_unchecked_t *)l;
80521+
80522+ return (long)atomic64_inc_return_unchecked(v);
80523+}
80524+#endif
80525+
80526 static inline long atomic_long_dec_return(atomic_long_t *l)
80527 {
80528 atomic64_t *v = (atomic64_t *)l;
80529@@ -140,6 +218,12 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
80530
80531 typedef atomic_t atomic_long_t;
80532
80533+#ifdef CONFIG_PAX_REFCOUNT
80534+typedef atomic_unchecked_t atomic_long_unchecked_t;
80535+#else
80536+typedef atomic_t atomic_long_unchecked_t;
80537+#endif
80538+
80539 #define ATOMIC_LONG_INIT(i) ATOMIC_INIT(i)
80540 static inline long atomic_long_read(atomic_long_t *l)
80541 {
80542@@ -148,6 +232,15 @@ static inline long atomic_long_read(atomic_long_t *l)
80543 return (long)atomic_read(v);
80544 }
80545
80546+#ifdef CONFIG_PAX_REFCOUNT
80547+static inline long atomic_long_read_unchecked(atomic_long_unchecked_t *l)
80548+{
80549+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80550+
80551+ return (long)atomic_read_unchecked(v);
80552+}
80553+#endif
80554+
80555 static inline void atomic_long_set(atomic_long_t *l, long i)
80556 {
80557 atomic_t *v = (atomic_t *)l;
80558@@ -155,6 +248,15 @@ static inline void atomic_long_set(atomic_long_t *l, long i)
80559 atomic_set(v, i);
80560 }
80561
80562+#ifdef CONFIG_PAX_REFCOUNT
80563+static inline void atomic_long_set_unchecked(atomic_long_unchecked_t *l, long i)
80564+{
80565+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80566+
80567+ atomic_set_unchecked(v, i);
80568+}
80569+#endif
80570+
80571 static inline void atomic_long_inc(atomic_long_t *l)
80572 {
80573 atomic_t *v = (atomic_t *)l;
80574@@ -162,6 +264,15 @@ static inline void atomic_long_inc(atomic_long_t *l)
80575 atomic_inc(v);
80576 }
80577
80578+#ifdef CONFIG_PAX_REFCOUNT
80579+static inline void atomic_long_inc_unchecked(atomic_long_unchecked_t *l)
80580+{
80581+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80582+
80583+ atomic_inc_unchecked(v);
80584+}
80585+#endif
80586+
80587 static inline void atomic_long_dec(atomic_long_t *l)
80588 {
80589 atomic_t *v = (atomic_t *)l;
80590@@ -169,6 +280,15 @@ static inline void atomic_long_dec(atomic_long_t *l)
80591 atomic_dec(v);
80592 }
80593
80594+#ifdef CONFIG_PAX_REFCOUNT
80595+static inline void atomic_long_dec_unchecked(atomic_long_unchecked_t *l)
80596+{
80597+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80598+
80599+ atomic_dec_unchecked(v);
80600+}
80601+#endif
80602+
80603 static inline void atomic_long_add(long i, atomic_long_t *l)
80604 {
80605 atomic_t *v = (atomic_t *)l;
80606@@ -176,6 +296,15 @@ static inline void atomic_long_add(long i, atomic_long_t *l)
80607 atomic_add(i, v);
80608 }
80609
80610+#ifdef CONFIG_PAX_REFCOUNT
80611+static inline void atomic_long_add_unchecked(long i, atomic_long_unchecked_t *l)
80612+{
80613+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80614+
80615+ atomic_add_unchecked(i, v);
80616+}
80617+#endif
80618+
80619 static inline void atomic_long_sub(long i, atomic_long_t *l)
80620 {
80621 atomic_t *v = (atomic_t *)l;
80622@@ -183,6 +312,15 @@ static inline void atomic_long_sub(long i, atomic_long_t *l)
80623 atomic_sub(i, v);
80624 }
80625
80626+#ifdef CONFIG_PAX_REFCOUNT
80627+static inline void atomic_long_sub_unchecked(long i, atomic_long_unchecked_t *l)
80628+{
80629+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80630+
80631+ atomic_sub_unchecked(i, v);
80632+}
80633+#endif
80634+
80635 static inline int atomic_long_sub_and_test(long i, atomic_long_t *l)
80636 {
80637 atomic_t *v = (atomic_t *)l;
80638@@ -211,13 +349,23 @@ static inline int atomic_long_add_negative(long i, atomic_long_t *l)
80639 return atomic_add_negative(i, v);
80640 }
80641
80642-static inline long atomic_long_add_return(long i, atomic_long_t *l)
80643+static inline long __intentional_overflow(-1) atomic_long_add_return(long i, atomic_long_t *l)
80644 {
80645 atomic_t *v = (atomic_t *)l;
80646
80647 return (long)atomic_add_return(i, v);
80648 }
80649
80650+#ifdef CONFIG_PAX_REFCOUNT
80651+static inline long atomic_long_add_return_unchecked(long i, atomic_long_unchecked_t *l)
80652+{
80653+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80654+
80655+ return (long)atomic_add_return_unchecked(i, v);
80656+}
80657+
80658+#endif
80659+
80660 static inline long atomic_long_sub_return(long i, atomic_long_t *l)
80661 {
80662 atomic_t *v = (atomic_t *)l;
80663@@ -232,6 +380,15 @@ static inline long atomic_long_inc_return(atomic_long_t *l)
80664 return (long)atomic_inc_return(v);
80665 }
80666
80667+#ifdef CONFIG_PAX_REFCOUNT
80668+static inline long atomic_long_inc_return_unchecked(atomic_long_unchecked_t *l)
80669+{
80670+ atomic_unchecked_t *v = (atomic_unchecked_t *)l;
80671+
80672+ return (long)atomic_inc_return_unchecked(v);
80673+}
80674+#endif
80675+
80676 static inline long atomic_long_dec_return(atomic_long_t *l)
80677 {
80678 atomic_t *v = (atomic_t *)l;
80679@@ -255,4 +412,57 @@ static inline long atomic_long_add_unless(atomic_long_t *l, long a, long u)
80680
80681 #endif /* BITS_PER_LONG == 64 */
80682
80683+#ifdef CONFIG_PAX_REFCOUNT
80684+static inline void pax_refcount_needs_these_functions(void)
80685+{
80686+ atomic_read_unchecked((atomic_unchecked_t *)NULL);
80687+ atomic_set_unchecked((atomic_unchecked_t *)NULL, 0);
80688+ atomic_add_unchecked(0, (atomic_unchecked_t *)NULL);
80689+ atomic_sub_unchecked(0, (atomic_unchecked_t *)NULL);
80690+ atomic_inc_unchecked((atomic_unchecked_t *)NULL);
80691+ (void)atomic_inc_and_test_unchecked((atomic_unchecked_t *)NULL);
80692+ atomic_inc_return_unchecked((atomic_unchecked_t *)NULL);
80693+ atomic_add_return_unchecked(0, (atomic_unchecked_t *)NULL);
80694+ atomic_dec_unchecked((atomic_unchecked_t *)NULL);
80695+ atomic_cmpxchg_unchecked((atomic_unchecked_t *)NULL, 0, 0);
80696+ (void)atomic_xchg_unchecked((atomic_unchecked_t *)NULL, 0);
80697+#ifdef CONFIG_X86
80698+ atomic_clear_mask_unchecked(0, NULL);
80699+ atomic_set_mask_unchecked(0, NULL);
80700+#endif
80701+
80702+ atomic_long_read_unchecked((atomic_long_unchecked_t *)NULL);
80703+ atomic_long_set_unchecked((atomic_long_unchecked_t *)NULL, 0);
80704+ atomic_long_add_unchecked(0, (atomic_long_unchecked_t *)NULL);
80705+ atomic_long_sub_unchecked(0, (atomic_long_unchecked_t *)NULL);
80706+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)NULL);
80707+ atomic_long_add_return_unchecked(0, (atomic_long_unchecked_t *)NULL);
80708+ atomic_long_inc_return_unchecked((atomic_long_unchecked_t *)NULL);
80709+ atomic_long_dec_unchecked((atomic_long_unchecked_t *)NULL);
80710+}
80711+#else
80712+#define atomic_read_unchecked(v) atomic_read(v)
80713+#define atomic_set_unchecked(v, i) atomic_set((v), (i))
80714+#define atomic_add_unchecked(i, v) atomic_add((i), (v))
80715+#define atomic_sub_unchecked(i, v) atomic_sub((i), (v))
80716+#define atomic_inc_unchecked(v) atomic_inc(v)
80717+#define atomic_inc_and_test_unchecked(v) atomic_inc_and_test(v)
80718+#define atomic_inc_return_unchecked(v) atomic_inc_return(v)
80719+#define atomic_add_return_unchecked(i, v) atomic_add_return((i), (v))
80720+#define atomic_dec_unchecked(v) atomic_dec(v)
80721+#define atomic_cmpxchg_unchecked(v, o, n) atomic_cmpxchg((v), (o), (n))
80722+#define atomic_xchg_unchecked(v, i) atomic_xchg((v), (i))
80723+#define atomic_clear_mask_unchecked(mask, v) atomic_clear_mask((mask), (v))
80724+#define atomic_set_mask_unchecked(mask, v) atomic_set_mask((mask), (v))
80725+
80726+#define atomic_long_read_unchecked(v) atomic_long_read(v)
80727+#define atomic_long_set_unchecked(v, i) atomic_long_set((v), (i))
80728+#define atomic_long_add_unchecked(i, v) atomic_long_add((i), (v))
80729+#define atomic_long_sub_unchecked(i, v) atomic_long_sub((i), (v))
80730+#define atomic_long_inc_unchecked(v) atomic_long_inc(v)
80731+#define atomic_long_add_return_unchecked(i, v) atomic_long_add_return((i), (v))
80732+#define atomic_long_inc_return_unchecked(v) atomic_long_inc_return(v)
80733+#define atomic_long_dec_unchecked(v) atomic_long_dec(v)
80734+#endif
80735+
80736 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
80737diff --git a/include/asm-generic/atomic64.h b/include/asm-generic/atomic64.h
80738index 30ad9c8..c70c170 100644
80739--- a/include/asm-generic/atomic64.h
80740+++ b/include/asm-generic/atomic64.h
80741@@ -16,6 +16,8 @@ typedef struct {
80742 long long counter;
80743 } atomic64_t;
80744
80745+typedef atomic64_t atomic64_unchecked_t;
80746+
80747 #define ATOMIC64_INIT(i) { (i) }
80748
80749 extern long long atomic64_read(const atomic64_t *v);
80750@@ -51,4 +53,14 @@ extern int atomic64_add_unless(atomic64_t *v, long long a, long long u);
80751 #define atomic64_dec_and_test(v) (atomic64_dec_return((v)) == 0)
80752 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1LL, 0LL)
80753
80754+#define atomic64_read_unchecked(v) atomic64_read(v)
80755+#define atomic64_set_unchecked(v, i) atomic64_set((v), (i))
80756+#define atomic64_add_unchecked(a, v) atomic64_add((a), (v))
80757+#define atomic64_add_return_unchecked(a, v) atomic64_add_return((a), (v))
80758+#define atomic64_sub_unchecked(a, v) atomic64_sub((a), (v))
80759+#define atomic64_inc_unchecked(v) atomic64_inc(v)
80760+#define atomic64_inc_return_unchecked(v) atomic64_inc_return(v)
80761+#define atomic64_dec_unchecked(v) atomic64_dec(v)
80762+#define atomic64_cmpxchg_unchecked(v, o, n) atomic64_cmpxchg((v), (o), (n))
80763+
80764 #endif /* _ASM_GENERIC_ATOMIC64_H */
80765diff --git a/include/asm-generic/barrier.h b/include/asm-generic/barrier.h
80766index f5c40b0..e902f9d 100644
80767--- a/include/asm-generic/barrier.h
80768+++ b/include/asm-generic/barrier.h
80769@@ -82,7 +82,7 @@
80770 do { \
80771 compiletime_assert_atomic_type(*p); \
80772 smp_mb(); \
80773- ACCESS_ONCE(*p) = (v); \
80774+ ACCESS_ONCE_RW(*p) = (v); \
80775 } while (0)
80776
80777 #define smp_load_acquire(p) \
80778diff --git a/include/asm-generic/bitops/__fls.h b/include/asm-generic/bitops/__fls.h
80779index a60a7cc..0fe12f2 100644
80780--- a/include/asm-generic/bitops/__fls.h
80781+++ b/include/asm-generic/bitops/__fls.h
80782@@ -9,7 +9,7 @@
80783 *
80784 * Undefined if no set bit exists, so code should check against 0 first.
80785 */
80786-static __always_inline unsigned long __fls(unsigned long word)
80787+static __always_inline unsigned long __intentional_overflow(-1) __fls(unsigned long word)
80788 {
80789 int num = BITS_PER_LONG - 1;
80790
80791diff --git a/include/asm-generic/bitops/fls.h b/include/asm-generic/bitops/fls.h
80792index 0576d1f..dad6c71 100644
80793--- a/include/asm-generic/bitops/fls.h
80794+++ b/include/asm-generic/bitops/fls.h
80795@@ -9,7 +9,7 @@
80796 * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
80797 */
80798
80799-static __always_inline int fls(int x)
80800+static __always_inline int __intentional_overflow(-1) fls(int x)
80801 {
80802 int r = 32;
80803
80804diff --git a/include/asm-generic/bitops/fls64.h b/include/asm-generic/bitops/fls64.h
80805index b097cf8..3d40e14 100644
80806--- a/include/asm-generic/bitops/fls64.h
80807+++ b/include/asm-generic/bitops/fls64.h
80808@@ -15,7 +15,7 @@
80809 * at position 64.
80810 */
80811 #if BITS_PER_LONG == 32
80812-static __always_inline int fls64(__u64 x)
80813+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
80814 {
80815 __u32 h = x >> 32;
80816 if (h)
80817@@ -23,7 +23,7 @@ static __always_inline int fls64(__u64 x)
80818 return fls(x);
80819 }
80820 #elif BITS_PER_LONG == 64
80821-static __always_inline int fls64(__u64 x)
80822+static __always_inline int __intentional_overflow(-1) fls64(__u64 x)
80823 {
80824 if (x == 0)
80825 return 0;
80826diff --git a/include/asm-generic/cache.h b/include/asm-generic/cache.h
80827index 1bfcfe5..e04c5c9 100644
80828--- a/include/asm-generic/cache.h
80829+++ b/include/asm-generic/cache.h
80830@@ -6,7 +6,7 @@
80831 * cache lines need to provide their own cache.h.
80832 */
80833
80834-#define L1_CACHE_SHIFT 5
80835-#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
80836+#define L1_CACHE_SHIFT 5UL
80837+#define L1_CACHE_BYTES (1UL << L1_CACHE_SHIFT)
80838
80839 #endif /* __ASM_GENERIC_CACHE_H */
80840diff --git a/include/asm-generic/emergency-restart.h b/include/asm-generic/emergency-restart.h
80841index 0d68a1e..b74a761 100644
80842--- a/include/asm-generic/emergency-restart.h
80843+++ b/include/asm-generic/emergency-restart.h
80844@@ -1,7 +1,7 @@
80845 #ifndef _ASM_GENERIC_EMERGENCY_RESTART_H
80846 #define _ASM_GENERIC_EMERGENCY_RESTART_H
80847
80848-static inline void machine_emergency_restart(void)
80849+static inline __noreturn void machine_emergency_restart(void)
80850 {
80851 machine_restart(NULL);
80852 }
80853diff --git a/include/asm-generic/kmap_types.h b/include/asm-generic/kmap_types.h
80854index 90f99c7..00ce236 100644
80855--- a/include/asm-generic/kmap_types.h
80856+++ b/include/asm-generic/kmap_types.h
80857@@ -2,9 +2,9 @@
80858 #define _ASM_GENERIC_KMAP_TYPES_H
80859
80860 #ifdef __WITH_KM_FENCE
80861-# define KM_TYPE_NR 41
80862+# define KM_TYPE_NR 42
80863 #else
80864-# define KM_TYPE_NR 20
80865+# define KM_TYPE_NR 21
80866 #endif
80867
80868 #endif
80869diff --git a/include/asm-generic/local.h b/include/asm-generic/local.h
80870index 9ceb03b..62b0b8f 100644
80871--- a/include/asm-generic/local.h
80872+++ b/include/asm-generic/local.h
80873@@ -23,24 +23,37 @@ typedef struct
80874 atomic_long_t a;
80875 } local_t;
80876
80877+typedef struct {
80878+ atomic_long_unchecked_t a;
80879+} local_unchecked_t;
80880+
80881 #define LOCAL_INIT(i) { ATOMIC_LONG_INIT(i) }
80882
80883 #define local_read(l) atomic_long_read(&(l)->a)
80884+#define local_read_unchecked(l) atomic_long_read_unchecked(&(l)->a)
80885 #define local_set(l,i) atomic_long_set((&(l)->a),(i))
80886+#define local_set_unchecked(l,i) atomic_long_set_unchecked((&(l)->a),(i))
80887 #define local_inc(l) atomic_long_inc(&(l)->a)
80888+#define local_inc_unchecked(l) atomic_long_inc_unchecked(&(l)->a)
80889 #define local_dec(l) atomic_long_dec(&(l)->a)
80890+#define local_dec_unchecked(l) atomic_long_dec_unchecked(&(l)->a)
80891 #define local_add(i,l) atomic_long_add((i),(&(l)->a))
80892+#define local_add_unchecked(i,l) atomic_long_add_unchecked((i),(&(l)->a))
80893 #define local_sub(i,l) atomic_long_sub((i),(&(l)->a))
80894+#define local_sub_unchecked(i,l) atomic_long_sub_unchecked((i),(&(l)->a))
80895
80896 #define local_sub_and_test(i, l) atomic_long_sub_and_test((i), (&(l)->a))
80897 #define local_dec_and_test(l) atomic_long_dec_and_test(&(l)->a)
80898 #define local_inc_and_test(l) atomic_long_inc_and_test(&(l)->a)
80899 #define local_add_negative(i, l) atomic_long_add_negative((i), (&(l)->a))
80900 #define local_add_return(i, l) atomic_long_add_return((i), (&(l)->a))
80901+#define local_add_return_unchecked(i, l) atomic_long_add_return_unchecked((i), (&(l)->a))
80902 #define local_sub_return(i, l) atomic_long_sub_return((i), (&(l)->a))
80903 #define local_inc_return(l) atomic_long_inc_return(&(l)->a)
80904+#define local_dec_return(l) atomic_long_dec_return(&(l)->a)
80905
80906 #define local_cmpxchg(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
80907+#define local_cmpxchg_unchecked(l, o, n) atomic_long_cmpxchg((&(l)->a), (o), (n))
80908 #define local_xchg(l, n) atomic_long_xchg((&(l)->a), (n))
80909 #define local_add_unless(l, _a, u) atomic_long_add_unless((&(l)->a), (_a), (u))
80910 #define local_inc_not_zero(l) atomic_long_inc_not_zero(&(l)->a)
80911diff --git a/include/asm-generic/pgtable-nopmd.h b/include/asm-generic/pgtable-nopmd.h
80912index 725612b..9cc513a 100644
80913--- a/include/asm-generic/pgtable-nopmd.h
80914+++ b/include/asm-generic/pgtable-nopmd.h
80915@@ -1,14 +1,19 @@
80916 #ifndef _PGTABLE_NOPMD_H
80917 #define _PGTABLE_NOPMD_H
80918
80919-#ifndef __ASSEMBLY__
80920-
80921 #include <asm-generic/pgtable-nopud.h>
80922
80923-struct mm_struct;
80924-
80925 #define __PAGETABLE_PMD_FOLDED
80926
80927+#define PMD_SHIFT PUD_SHIFT
80928+#define PTRS_PER_PMD 1
80929+#define PMD_SIZE (_AC(1,UL) << PMD_SHIFT)
80930+#define PMD_MASK (~(PMD_SIZE-1))
80931+
80932+#ifndef __ASSEMBLY__
80933+
80934+struct mm_struct;
80935+
80936 /*
80937 * Having the pmd type consist of a pud gets the size right, and allows
80938 * us to conceptually access the pud entry that this pmd is folded into
80939@@ -16,11 +21,6 @@ struct mm_struct;
80940 */
80941 typedef struct { pud_t pud; } pmd_t;
80942
80943-#define PMD_SHIFT PUD_SHIFT
80944-#define PTRS_PER_PMD 1
80945-#define PMD_SIZE (1UL << PMD_SHIFT)
80946-#define PMD_MASK (~(PMD_SIZE-1))
80947-
80948 /*
80949 * The "pud_xxx()" functions here are trivial for a folded two-level
80950 * setup: the pmd is never bad, and a pmd always exists (as it's folded
80951diff --git a/include/asm-generic/pgtable-nopud.h b/include/asm-generic/pgtable-nopud.h
80952index 810431d..0ec4804f 100644
80953--- a/include/asm-generic/pgtable-nopud.h
80954+++ b/include/asm-generic/pgtable-nopud.h
80955@@ -1,10 +1,15 @@
80956 #ifndef _PGTABLE_NOPUD_H
80957 #define _PGTABLE_NOPUD_H
80958
80959-#ifndef __ASSEMBLY__
80960-
80961 #define __PAGETABLE_PUD_FOLDED
80962
80963+#define PUD_SHIFT PGDIR_SHIFT
80964+#define PTRS_PER_PUD 1
80965+#define PUD_SIZE (_AC(1,UL) << PUD_SHIFT)
80966+#define PUD_MASK (~(PUD_SIZE-1))
80967+
80968+#ifndef __ASSEMBLY__
80969+
80970 /*
80971 * Having the pud type consist of a pgd gets the size right, and allows
80972 * us to conceptually access the pgd entry that this pud is folded into
80973@@ -12,11 +17,6 @@
80974 */
80975 typedef struct { pgd_t pgd; } pud_t;
80976
80977-#define PUD_SHIFT PGDIR_SHIFT
80978-#define PTRS_PER_PUD 1
80979-#define PUD_SIZE (1UL << PUD_SHIFT)
80980-#define PUD_MASK (~(PUD_SIZE-1))
80981-
80982 /*
80983 * The "pgd_xxx()" functions here are trivial for a folded two-level
80984 * setup: the pud is never bad, and a pud always exists (as it's folded
80985@@ -29,6 +29,7 @@ static inline void pgd_clear(pgd_t *pgd) { }
80986 #define pud_ERROR(pud) (pgd_ERROR((pud).pgd))
80987
80988 #define pgd_populate(mm, pgd, pud) do { } while (0)
80989+#define pgd_populate_kernel(mm, pgd, pud) do { } while (0)
80990 /*
80991 * (puds are folded into pgds so this doesn't get actually called,
80992 * but the define is needed for a generic inline function.)
80993diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
80994index 4d46085..f4e92ef 100644
80995--- a/include/asm-generic/pgtable.h
80996+++ b/include/asm-generic/pgtable.h
80997@@ -689,6 +689,22 @@ static inline int pmd_protnone(pmd_t pmd)
80998 }
80999 #endif /* CONFIG_NUMA_BALANCING */
81000
81001+#ifndef __HAVE_ARCH_PAX_OPEN_KERNEL
81002+#ifdef CONFIG_PAX_KERNEXEC
81003+#error KERNEXEC requires pax_open_kernel
81004+#else
81005+static inline unsigned long pax_open_kernel(void) { return 0; }
81006+#endif
81007+#endif
81008+
81009+#ifndef __HAVE_ARCH_PAX_CLOSE_KERNEL
81010+#ifdef CONFIG_PAX_KERNEXEC
81011+#error KERNEXEC requires pax_close_kernel
81012+#else
81013+static inline unsigned long pax_close_kernel(void) { return 0; }
81014+#endif
81015+#endif
81016+
81017 #endif /* CONFIG_MMU */
81018
81019 #endif /* !__ASSEMBLY__ */
81020diff --git a/include/asm-generic/uaccess.h b/include/asm-generic/uaccess.h
81021index 72d8803..cb9749c 100644
81022--- a/include/asm-generic/uaccess.h
81023+++ b/include/asm-generic/uaccess.h
81024@@ -343,4 +343,20 @@ clear_user(void __user *to, unsigned long n)
81025 return __clear_user(to, n);
81026 }
81027
81028+#ifndef __HAVE_ARCH_PAX_OPEN_USERLAND
81029+#ifdef CONFIG_PAX_MEMORY_UDEREF
81030+#error UDEREF requires pax_open_userland
81031+#else
81032+static inline unsigned long pax_open_userland(void) { return 0; }
81033+#endif
81034+#endif
81035+
81036+#ifndef __HAVE_ARCH_PAX_CLOSE_USERLAND
81037+#ifdef CONFIG_PAX_MEMORY_UDEREF
81038+#error UDEREF requires pax_close_userland
81039+#else
81040+static inline unsigned long pax_close_userland(void) { return 0; }
81041+#endif
81042+#endif
81043+
81044 #endif /* __ASM_GENERIC_UACCESS_H */
81045diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
81046index ac78910..775a306 100644
81047--- a/include/asm-generic/vmlinux.lds.h
81048+++ b/include/asm-generic/vmlinux.lds.h
81049@@ -234,6 +234,7 @@
81050 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
81051 VMLINUX_SYMBOL(__start_rodata) = .; \
81052 *(.rodata) *(.rodata.*) \
81053+ *(.data..read_only) \
81054 *(__vermagic) /* Kernel version magic */ \
81055 . = ALIGN(8); \
81056 VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \
81057@@ -727,17 +728,18 @@
81058 * section in the linker script will go there too. @phdr should have
81059 * a leading colon.
81060 *
81061- * Note that this macros defines __per_cpu_load as an absolute symbol.
81062+ * Note that this macros defines per_cpu_load as an absolute symbol.
81063 * If there is no need to put the percpu section at a predetermined
81064 * address, use PERCPU_SECTION.
81065 */
81066 #define PERCPU_VADDR(cacheline, vaddr, phdr) \
81067- VMLINUX_SYMBOL(__per_cpu_load) = .; \
81068- .data..percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \
81069+ per_cpu_load = .; \
81070+ .data..percpu vaddr : AT(VMLINUX_SYMBOL(per_cpu_load) \
81071 - LOAD_OFFSET) { \
81072+ VMLINUX_SYMBOL(__per_cpu_load) = . + per_cpu_load; \
81073 PERCPU_INPUT(cacheline) \
81074 } phdr \
81075- . = VMLINUX_SYMBOL(__per_cpu_load) + SIZEOF(.data..percpu);
81076+ . = VMLINUX_SYMBOL(per_cpu_load) + SIZEOF(.data..percpu);
81077
81078 /**
81079 * PERCPU_SECTION - define output section for percpu area, simple version
81080diff --git a/include/crypto/algapi.h b/include/crypto/algapi.h
81081index 623a59c..1e79ab9 100644
81082--- a/include/crypto/algapi.h
81083+++ b/include/crypto/algapi.h
81084@@ -34,7 +34,7 @@ struct crypto_type {
81085 unsigned int maskclear;
81086 unsigned int maskset;
81087 unsigned int tfmsize;
81088-};
81089+} __do_const;
81090
81091 struct crypto_instance {
81092 struct crypto_alg alg;
81093diff --git a/include/drm/drmP.h b/include/drm/drmP.h
81094index e928625..78c2c05 100644
81095--- a/include/drm/drmP.h
81096+++ b/include/drm/drmP.h
81097@@ -59,6 +59,7 @@
81098
81099 #include <asm/mman.h>
81100 #include <asm/pgalloc.h>
81101+#include <asm/local.h>
81102 #include <asm/uaccess.h>
81103
81104 #include <uapi/drm/drm.h>
81105@@ -224,10 +225,12 @@ void drm_err(const char *format, ...);
81106 * \param cmd command.
81107 * \param arg argument.
81108 */
81109-typedef int drm_ioctl_t(struct drm_device *dev, void *data,
81110+typedef int (* const drm_ioctl_t)(struct drm_device *dev, void *data,
81111+ struct drm_file *file_priv);
81112+typedef int (* drm_ioctl_no_const_t)(struct drm_device *dev, void *data,
81113 struct drm_file *file_priv);
81114
81115-typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
81116+typedef int (* const drm_ioctl_compat_t)(struct file *filp, unsigned int cmd,
81117 unsigned long arg);
81118
81119 #define DRM_IOCTL_NR(n) _IOC_NR(n)
81120@@ -243,10 +246,10 @@ typedef int drm_ioctl_compat_t(struct file *filp, unsigned int cmd,
81121 struct drm_ioctl_desc {
81122 unsigned int cmd;
81123 int flags;
81124- drm_ioctl_t *func;
81125+ drm_ioctl_t func;
81126 unsigned int cmd_drv;
81127 const char *name;
81128-};
81129+} __do_const;
81130
81131 /**
81132 * Creates a driver or general drm_ioctl_desc array entry for the given
81133@@ -632,7 +635,8 @@ struct drm_info_list {
81134 int (*show)(struct seq_file*, void*); /** show callback */
81135 u32 driver_features; /**< Required driver features for this entry */
81136 void *data;
81137-};
81138+} __do_const;
81139+typedef struct drm_info_list __no_const drm_info_list_no_const;
81140
81141 /**
81142 * debugfs node structure. This structure represents a debugfs file.
81143@@ -716,7 +720,7 @@ struct drm_device {
81144
81145 /** \name Usage Counters */
81146 /*@{ */
81147- int open_count; /**< Outstanding files open, protected by drm_global_mutex. */
81148+ local_t open_count; /**< Outstanding files open, protected by drm_global_mutex. */
81149 spinlock_t buf_lock; /**< For drm_device::buf_use and a few other things. */
81150 int buf_use; /**< Buffers in use -- cannot alloc */
81151 atomic_t buf_alloc; /**< Buffer allocation in progress */
81152diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
81153index c250a22..59d2094 100644
81154--- a/include/drm/drm_crtc_helper.h
81155+++ b/include/drm/drm_crtc_helper.h
81156@@ -160,7 +160,7 @@ struct drm_encoder_helper_funcs {
81157 int (*atomic_check)(struct drm_encoder *encoder,
81158 struct drm_crtc_state *crtc_state,
81159 struct drm_connector_state *conn_state);
81160-};
81161+} __no_const;
81162
81163 /**
81164 * struct drm_connector_helper_funcs - helper operations for connectors
81165diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
81166index d016dc5..3951fe0 100644
81167--- a/include/drm/i915_pciids.h
81168+++ b/include/drm/i915_pciids.h
81169@@ -37,7 +37,7 @@
81170 */
81171 #define INTEL_VGA_DEVICE(id, info) { \
81172 0x8086, id, \
81173- ~0, ~0, \
81174+ PCI_ANY_ID, PCI_ANY_ID, \
81175 0x030000, 0xff0000, \
81176 (unsigned long) info }
81177
81178diff --git a/include/drm/ttm/ttm_memory.h b/include/drm/ttm/ttm_memory.h
81179index 72dcbe8..8db58d7 100644
81180--- a/include/drm/ttm/ttm_memory.h
81181+++ b/include/drm/ttm/ttm_memory.h
81182@@ -48,7 +48,7 @@
81183
81184 struct ttm_mem_shrink {
81185 int (*do_shrink) (struct ttm_mem_shrink *);
81186-};
81187+} __no_const;
81188
81189 /**
81190 * struct ttm_mem_global - Global memory accounting structure.
81191diff --git a/include/drm/ttm/ttm_page_alloc.h b/include/drm/ttm/ttm_page_alloc.h
81192index 49a8284..9643967 100644
81193--- a/include/drm/ttm/ttm_page_alloc.h
81194+++ b/include/drm/ttm/ttm_page_alloc.h
81195@@ -80,6 +80,7 @@ void ttm_dma_page_alloc_fini(void);
81196 */
81197 extern int ttm_dma_page_alloc_debugfs(struct seq_file *m, void *data);
81198
81199+struct device;
81200 extern int ttm_dma_populate(struct ttm_dma_tt *ttm_dma, struct device *dev);
81201 extern void ttm_dma_unpopulate(struct ttm_dma_tt *ttm_dma, struct device *dev);
81202
81203diff --git a/include/keys/asymmetric-subtype.h b/include/keys/asymmetric-subtype.h
81204index 4b840e8..155d235 100644
81205--- a/include/keys/asymmetric-subtype.h
81206+++ b/include/keys/asymmetric-subtype.h
81207@@ -37,7 +37,7 @@ struct asymmetric_key_subtype {
81208 /* Verify the signature on a key of this subtype (optional) */
81209 int (*verify_signature)(const struct key *key,
81210 const struct public_key_signature *sig);
81211-};
81212+} __do_const;
81213
81214 /**
81215 * asymmetric_key_subtype - Get the subtype from an asymmetric key
81216diff --git a/include/linux/atmdev.h b/include/linux/atmdev.h
81217index c1da539..1dcec55 100644
81218--- a/include/linux/atmdev.h
81219+++ b/include/linux/atmdev.h
81220@@ -28,7 +28,7 @@ struct compat_atm_iobuf {
81221 #endif
81222
81223 struct k_atm_aal_stats {
81224-#define __HANDLE_ITEM(i) atomic_t i
81225+#define __HANDLE_ITEM(i) atomic_unchecked_t i
81226 __AAL_STAT_ITEMS
81227 #undef __HANDLE_ITEM
81228 };
81229@@ -200,7 +200,7 @@ struct atmdev_ops { /* only send is required */
81230 int (*change_qos)(struct atm_vcc *vcc,struct atm_qos *qos,int flags);
81231 int (*proc_read)(struct atm_dev *dev,loff_t *pos,char *page);
81232 struct module *owner;
81233-};
81234+} __do_const ;
81235
81236 struct atmphy_ops {
81237 int (*start)(struct atm_dev *dev);
81238diff --git a/include/linux/atomic.h b/include/linux/atomic.h
81239index 5b08a85..60922fb 100644
81240--- a/include/linux/atomic.h
81241+++ b/include/linux/atomic.h
81242@@ -12,7 +12,7 @@
81243 * Atomically adds @a to @v, so long as @v was not already @u.
81244 * Returns non-zero if @v was not @u, and zero otherwise.
81245 */
81246-static inline int atomic_add_unless(atomic_t *v, int a, int u)
81247+static inline int __intentional_overflow(-1) atomic_add_unless(atomic_t *v, int a, int u)
81248 {
81249 return __atomic_add_unless(v, a, u) != u;
81250 }
81251diff --git a/include/linux/audit.h b/include/linux/audit.h
81252index c2e7e3a..8bfc0e1 100644
81253--- a/include/linux/audit.h
81254+++ b/include/linux/audit.h
81255@@ -223,7 +223,7 @@ static inline void audit_ptrace(struct task_struct *t)
81256 extern unsigned int audit_serial(void);
81257 extern int auditsc_get_stamp(struct audit_context *ctx,
81258 struct timespec *t, unsigned int *serial);
81259-extern int audit_set_loginuid(kuid_t loginuid);
81260+extern int __intentional_overflow(-1) audit_set_loginuid(kuid_t loginuid);
81261
81262 static inline kuid_t audit_get_loginuid(struct task_struct *tsk)
81263 {
81264diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h
81265index 576e463..28fd926 100644
81266--- a/include/linux/binfmts.h
81267+++ b/include/linux/binfmts.h
81268@@ -44,7 +44,7 @@ struct linux_binprm {
81269 unsigned interp_flags;
81270 unsigned interp_data;
81271 unsigned long loader, exec;
81272-};
81273+} __randomize_layout;
81274
81275 #define BINPRM_FLAGS_ENFORCE_NONDUMP_BIT 0
81276 #define BINPRM_FLAGS_ENFORCE_NONDUMP (1 << BINPRM_FLAGS_ENFORCE_NONDUMP_BIT)
81277@@ -77,8 +77,10 @@ struct linux_binfmt {
81278 int (*load_binary)(struct linux_binprm *);
81279 int (*load_shlib)(struct file *);
81280 int (*core_dump)(struct coredump_params *cprm);
81281+ void (*handle_mprotect)(struct vm_area_struct *vma, unsigned long newflags);
81282+ void (*handle_mmap)(struct file *);
81283 unsigned long min_coredump; /* minimal dump size */
81284-};
81285+} __do_const __randomize_layout;
81286
81287 extern void __register_binfmt(struct linux_binfmt *fmt, int insert);
81288
81289diff --git a/include/linux/bitmap.h b/include/linux/bitmap.h
81290index dbfbf49..10be372 100644
81291--- a/include/linux/bitmap.h
81292+++ b/include/linux/bitmap.h
81293@@ -299,7 +299,7 @@ static inline int bitmap_full(const unsigned long *src, unsigned int nbits)
81294 return __bitmap_full(src, nbits);
81295 }
81296
81297-static inline int bitmap_weight(const unsigned long *src, unsigned int nbits)
81298+static inline int __intentional_overflow(-1) bitmap_weight(const unsigned long *src, unsigned int nbits)
81299 {
81300 if (small_const_nbits(nbits))
81301 return hweight_long(*src & BITMAP_LAST_WORD_MASK(nbits));
81302diff --git a/include/linux/bitops.h b/include/linux/bitops.h
81303index 5d858e0..336c1d9 100644
81304--- a/include/linux/bitops.h
81305+++ b/include/linux/bitops.h
81306@@ -105,7 +105,7 @@ static inline __u64 ror64(__u64 word, unsigned int shift)
81307 * @word: value to rotate
81308 * @shift: bits to roll
81309 */
81310-static inline __u32 rol32(__u32 word, unsigned int shift)
81311+static inline __u32 __intentional_overflow(-1) rol32(__u32 word, unsigned int shift)
81312 {
81313 return (word << shift) | (word >> (32 - shift));
81314 }
81315@@ -115,7 +115,7 @@ static inline __u32 rol32(__u32 word, unsigned int shift)
81316 * @word: value to rotate
81317 * @shift: bits to roll
81318 */
81319-static inline __u32 ror32(__u32 word, unsigned int shift)
81320+static inline __u32 __intentional_overflow(-1) ror32(__u32 word, unsigned int shift)
81321 {
81322 return (word >> shift) | (word << (32 - shift));
81323 }
81324@@ -171,7 +171,7 @@ static inline __s32 sign_extend32(__u32 value, int index)
81325 return (__s32)(value << shift) >> shift;
81326 }
81327
81328-static inline unsigned fls_long(unsigned long l)
81329+static inline unsigned __intentional_overflow(-1) fls_long(unsigned long l)
81330 {
81331 if (sizeof(l) == 4)
81332 return fls(l);
81333diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
81334index 7f9a516..8889453 100644
81335--- a/include/linux/blkdev.h
81336+++ b/include/linux/blkdev.h
81337@@ -1616,7 +1616,7 @@ struct block_device_operations {
81338 /* this callback is with swap_lock and sometimes page table lock held */
81339 void (*swap_slot_free_notify) (struct block_device *, unsigned long);
81340 struct module *owner;
81341-};
81342+} __do_const;
81343
81344 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
81345 unsigned long);
81346diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
81347index afc1343..9735539 100644
81348--- a/include/linux/blktrace_api.h
81349+++ b/include/linux/blktrace_api.h
81350@@ -25,7 +25,7 @@ struct blk_trace {
81351 struct dentry *dropped_file;
81352 struct dentry *msg_file;
81353 struct list_head running_list;
81354- atomic_t dropped;
81355+ atomic_unchecked_t dropped;
81356 };
81357
81358 extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
81359diff --git a/include/linux/cache.h b/include/linux/cache.h
81360index 17e7e82..1d7da26 100644
81361--- a/include/linux/cache.h
81362+++ b/include/linux/cache.h
81363@@ -16,6 +16,14 @@
81364 #define __read_mostly
81365 #endif
81366
81367+#ifndef __read_only
81368+#ifdef CONFIG_PAX_KERNEXEC
81369+#error KERNEXEC requires __read_only
81370+#else
81371+#define __read_only __read_mostly
81372+#endif
81373+#endif
81374+
81375 #ifndef ____cacheline_aligned
81376 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
81377 #endif
81378diff --git a/include/linux/capability.h b/include/linux/capability.h
81379index aa93e5e..985a1b0 100644
81380--- a/include/linux/capability.h
81381+++ b/include/linux/capability.h
81382@@ -214,9 +214,14 @@ extern bool has_ns_capability_noaudit(struct task_struct *t,
81383 extern bool capable(int cap);
81384 extern bool ns_capable(struct user_namespace *ns, int cap);
81385 extern bool capable_wrt_inode_uidgid(const struct inode *inode, int cap);
81386+extern bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap);
81387 extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
81388+extern bool capable_nolog(int cap);
81389+extern bool ns_capable_nolog(struct user_namespace *ns, int cap);
81390
81391 /* audit system wants to get cap info from files as well */
81392 extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
81393
81394+extern int is_privileged_binary(const struct dentry *dentry);
81395+
81396 #endif /* !_LINUX_CAPABILITY_H */
81397diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
81398index 8609d57..86e4d79 100644
81399--- a/include/linux/cdrom.h
81400+++ b/include/linux/cdrom.h
81401@@ -87,7 +87,6 @@ struct cdrom_device_ops {
81402
81403 /* driver specifications */
81404 const int capability; /* capability flags */
81405- int n_minors; /* number of active minor devices */
81406 /* handle uniform packets for scsi type devices (scsi,atapi) */
81407 int (*generic_packet) (struct cdrom_device_info *,
81408 struct packet_command *);
81409diff --git a/include/linux/cleancache.h b/include/linux/cleancache.h
81410index 4ce9056..86caac6 100644
81411--- a/include/linux/cleancache.h
81412+++ b/include/linux/cleancache.h
81413@@ -31,7 +31,7 @@ struct cleancache_ops {
81414 void (*invalidate_page)(int, struct cleancache_filekey, pgoff_t);
81415 void (*invalidate_inode)(int, struct cleancache_filekey);
81416 void (*invalidate_fs)(int);
81417-};
81418+} __no_const;
81419
81420 extern struct cleancache_ops *
81421 cleancache_register_ops(struct cleancache_ops *ops);
81422diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
81423index 5591ea7..61b77ce 100644
81424--- a/include/linux/clk-provider.h
81425+++ b/include/linux/clk-provider.h
81426@@ -195,6 +195,7 @@ struct clk_ops {
81427 void (*init)(struct clk_hw *hw);
81428 int (*debug_init)(struct clk_hw *hw, struct dentry *dentry);
81429 };
81430+typedef struct clk_ops __no_const clk_ops_no_const;
81431
81432 /**
81433 * struct clk_init_data - holds init data that's common to all clocks and is
81434diff --git a/include/linux/compat.h b/include/linux/compat.h
81435index ab25814..d1540d1 100644
81436--- a/include/linux/compat.h
81437+++ b/include/linux/compat.h
81438@@ -316,7 +316,7 @@ compat_sys_get_robust_list(int pid, compat_uptr_t __user *head_ptr,
81439 compat_size_t __user *len_ptr);
81440
81441 asmlinkage long compat_sys_ipc(u32, int, int, u32, compat_uptr_t, u32);
81442-asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg);
81443+asmlinkage long compat_sys_shmat(int shmid, compat_uptr_t shmaddr, int shmflg) __intentional_overflow(0);
81444 asmlinkage long compat_sys_semctl(int semid, int semnum, int cmd, int arg);
81445 asmlinkage long compat_sys_msgsnd(int msqid, compat_uptr_t msgp,
81446 compat_ssize_t msgsz, int msgflg);
81447@@ -325,7 +325,7 @@ asmlinkage long compat_sys_msgrcv(int msqid, compat_uptr_t msgp,
81448 long compat_sys_msgctl(int first, int second, void __user *uptr);
81449 long compat_sys_shmctl(int first, int second, void __user *uptr);
81450 long compat_sys_semtimedop(int semid, struct sembuf __user *tsems,
81451- unsigned nsems, const struct compat_timespec __user *timeout);
81452+ compat_long_t nsems, const struct compat_timespec __user *timeout);
81453 asmlinkage long compat_sys_keyctl(u32 option,
81454 u32 arg2, u32 arg3, u32 arg4, u32 arg5);
81455 asmlinkage long compat_sys_ustat(unsigned dev, struct compat_ustat __user *u32);
81456@@ -439,7 +439,7 @@ extern int compat_ptrace_request(struct task_struct *child,
81457 extern long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
81458 compat_ulong_t addr, compat_ulong_t data);
81459 asmlinkage long compat_sys_ptrace(compat_long_t request, compat_long_t pid,
81460- compat_long_t addr, compat_long_t data);
81461+ compat_ulong_t addr, compat_ulong_t data);
81462
81463 asmlinkage long compat_sys_lookup_dcookie(u32, u32, char __user *, compat_size_t);
81464 /*
81465diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
81466index 769e198..f670585 100644
81467--- a/include/linux/compiler-gcc4.h
81468+++ b/include/linux/compiler-gcc4.h
81469@@ -39,9 +39,34 @@
81470 # define __compiletime_warning(message) __attribute__((warning(message)))
81471 # define __compiletime_error(message) __attribute__((error(message)))
81472 #endif /* __CHECKER__ */
81473+
81474+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
81475+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
81476+#define __bos0(ptr) __bos((ptr), 0)
81477+#define __bos1(ptr) __bos((ptr), 1)
81478 #endif /* GCC_VERSION >= 40300 */
81479
81480 #if GCC_VERSION >= 40500
81481+
81482+#ifdef RANDSTRUCT_PLUGIN
81483+#define __randomize_layout __attribute__((randomize_layout))
81484+#define __no_randomize_layout __attribute__((no_randomize_layout))
81485+#endif
81486+
81487+#ifdef CONSTIFY_PLUGIN
81488+#define __no_const __attribute__((no_const))
81489+#define __do_const __attribute__((do_const))
81490+#endif
81491+
81492+#ifdef SIZE_OVERFLOW_PLUGIN
81493+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
81494+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
81495+#endif
81496+
81497+#ifdef LATENT_ENTROPY_PLUGIN
81498+#define __latent_entropy __attribute__((latent_entropy))
81499+#endif
81500+
81501 /*
81502 * Mark a position in code as unreachable. This can be used to
81503 * suppress control flow warnings after asm blocks that transfer
81504diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
81505index efee493..c388661 100644
81506--- a/include/linux/compiler-gcc5.h
81507+++ b/include/linux/compiler-gcc5.h
81508@@ -28,6 +28,25 @@
81509 # define __compiletime_error(message) __attribute__((error(message)))
81510 #endif /* __CHECKER__ */
81511
81512+#define __alloc_size(...) __attribute((alloc_size(__VA_ARGS__)))
81513+#define __bos(ptr, arg) __builtin_object_size((ptr), (arg))
81514+#define __bos0(ptr) __bos((ptr), 0)
81515+#define __bos1(ptr) __bos((ptr), 1)
81516+
81517+#ifdef CONSTIFY_PLUGIN
81518+#define __no_const __attribute__((no_const))
81519+#define __do_const __attribute__((do_const))
81520+#endif
81521+
81522+#ifdef SIZE_OVERFLOW_PLUGIN
81523+#define __size_overflow(...) __attribute__((size_overflow(__VA_ARGS__)))
81524+#define __intentional_overflow(...) __attribute__((intentional_overflow(__VA_ARGS__)))
81525+#endif
81526+
81527+#ifdef LATENT_ENTROPY_PLUGIN
81528+#define __latent_entropy __attribute__((latent_entropy))
81529+#endif
81530+
81531 /*
81532 * Mark a position in code as unreachable. This can be used to
81533 * suppress control flow warnings after asm blocks that transfer
81534diff --git a/include/linux/compiler.h b/include/linux/compiler.h
81535index 1b45e4a..33028cd 100644
81536--- a/include/linux/compiler.h
81537+++ b/include/linux/compiler.h
81538@@ -5,11 +5,14 @@
81539
81540 #ifdef __CHECKER__
81541 # define __user __attribute__((noderef, address_space(1)))
81542+# define __force_user __force __user
81543 # define __kernel __attribute__((address_space(0)))
81544+# define __force_kernel __force __kernel
81545 # define __safe __attribute__((safe))
81546 # define __force __attribute__((force))
81547 # define __nocast __attribute__((nocast))
81548 # define __iomem __attribute__((noderef, address_space(2)))
81549+# define __force_iomem __force __iomem
81550 # define __must_hold(x) __attribute__((context(x,1,1)))
81551 # define __acquires(x) __attribute__((context(x,0,1)))
81552 # define __releases(x) __attribute__((context(x,1,0)))
81553@@ -17,20 +20,37 @@
81554 # define __release(x) __context__(x,-1)
81555 # define __cond_lock(x,c) ((c) ? ({ __acquire(x); 1; }) : 0)
81556 # define __percpu __attribute__((noderef, address_space(3)))
81557+# define __force_percpu __force __percpu
81558 #ifdef CONFIG_SPARSE_RCU_POINTER
81559 # define __rcu __attribute__((noderef, address_space(4)))
81560+# define __force_rcu __force __rcu
81561 #else
81562 # define __rcu
81563+# define __force_rcu
81564 #endif
81565 extern void __chk_user_ptr(const volatile void __user *);
81566 extern void __chk_io_ptr(const volatile void __iomem *);
81567 #else
81568-# define __user
81569-# define __kernel
81570+# ifdef CHECKER_PLUGIN
81571+//# define __user
81572+//# define __force_user
81573+//# define __kernel
81574+//# define __force_kernel
81575+# else
81576+# ifdef STRUCTLEAK_PLUGIN
81577+# define __user __attribute__((user))
81578+# else
81579+# define __user
81580+# endif
81581+# define __force_user
81582+# define __kernel
81583+# define __force_kernel
81584+# endif
81585 # define __safe
81586 # define __force
81587 # define __nocast
81588 # define __iomem
81589+# define __force_iomem
81590 # define __chk_user_ptr(x) (void)0
81591 # define __chk_io_ptr(x) (void)0
81592 # define __builtin_warning(x, y...) (1)
81593@@ -41,7 +61,9 @@ extern void __chk_io_ptr(const volatile void __iomem *);
81594 # define __release(x) (void)0
81595 # define __cond_lock(x,c) (c)
81596 # define __percpu
81597+# define __force_percpu
81598 # define __rcu
81599+# define __force_rcu
81600 #endif
81601
81602 /* Indirect macros required for expanded argument pasting, eg. __LINE__. */
81603@@ -205,32 +227,32 @@ static __always_inline void data_access_exceeds_word_size(void)
81604 static __always_inline void __read_once_size(const volatile void *p, void *res, int size)
81605 {
81606 switch (size) {
81607- case 1: *(__u8 *)res = *(volatile __u8 *)p; break;
81608- case 2: *(__u16 *)res = *(volatile __u16 *)p; break;
81609- case 4: *(__u32 *)res = *(volatile __u32 *)p; break;
81610+ case 1: *(__u8 *)res = *(const volatile __u8 *)p; break;
81611+ case 2: *(__u16 *)res = *(const volatile __u16 *)p; break;
81612+ case 4: *(__u32 *)res = *(const volatile __u32 *)p; break;
81613 #ifdef CONFIG_64BIT
81614- case 8: *(__u64 *)res = *(volatile __u64 *)p; break;
81615+ case 8: *(__u64 *)res = *(const volatile __u64 *)p; break;
81616 #endif
81617 default:
81618 barrier();
81619- __builtin_memcpy((void *)res, (const void *)p, size);
81620+ __builtin_memcpy(res, (const void *)p, size);
81621 data_access_exceeds_word_size();
81622 barrier();
81623 }
81624 }
81625
81626-static __always_inline void __write_once_size(volatile void *p, void *res, int size)
81627+static __always_inline void __write_once_size(volatile void *p, const void *res, int size)
81628 {
81629 switch (size) {
81630- case 1: *(volatile __u8 *)p = *(__u8 *)res; break;
81631- case 2: *(volatile __u16 *)p = *(__u16 *)res; break;
81632- case 4: *(volatile __u32 *)p = *(__u32 *)res; break;
81633+ case 1: *(volatile __u8 *)p = *(const __u8 *)res; break;
81634+ case 2: *(volatile __u16 *)p = *(const __u16 *)res; break;
81635+ case 4: *(volatile __u32 *)p = *(const __u32 *)res; break;
81636 #ifdef CONFIG_64BIT
81637- case 8: *(volatile __u64 *)p = *(__u64 *)res; break;
81638+ case 8: *(volatile __u64 *)p = *(const __u64 *)res; break;
81639 #endif
81640 default:
81641 barrier();
81642- __builtin_memcpy((void *)p, (const void *)res, size);
81643+ __builtin_memcpy((void *)p, res, size);
81644 data_access_exceeds_word_size();
81645 barrier();
81646 }
81647@@ -364,6 +386,34 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
81648 # define __attribute_const__ /* unimplemented */
81649 #endif
81650
81651+#ifndef __randomize_layout
81652+# define __randomize_layout
81653+#endif
81654+
81655+#ifndef __no_randomize_layout
81656+# define __no_randomize_layout
81657+#endif
81658+
81659+#ifndef __no_const
81660+# define __no_const
81661+#endif
81662+
81663+#ifndef __do_const
81664+# define __do_const
81665+#endif
81666+
81667+#ifndef __size_overflow
81668+# define __size_overflow(...)
81669+#endif
81670+
81671+#ifndef __intentional_overflow
81672+# define __intentional_overflow(...)
81673+#endif
81674+
81675+#ifndef __latent_entropy
81676+# define __latent_entropy
81677+#endif
81678+
81679 /*
81680 * Tell gcc if a function is cold. The compiler will assume any path
81681 * directly leading to the call is unlikely.
81682@@ -373,6 +423,22 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
81683 #define __cold
81684 #endif
81685
81686+#ifndef __alloc_size
81687+#define __alloc_size(...)
81688+#endif
81689+
81690+#ifndef __bos
81691+#define __bos(ptr, arg)
81692+#endif
81693+
81694+#ifndef __bos0
81695+#define __bos0(ptr)
81696+#endif
81697+
81698+#ifndef __bos1
81699+#define __bos1(ptr)
81700+#endif
81701+
81702 /* Simple shorthand for a section definition */
81703 #ifndef __section
81704 # define __section(S) __attribute__ ((__section__(#S)))
81705@@ -387,6 +453,8 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
81706 # define __same_type(a, b) __builtin_types_compatible_p(typeof(a), typeof(b))
81707 #endif
81708
81709+#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))
81710+
81711 /* Is this type a native word size -- useful for atomic operations */
81712 #ifndef __native_word
81713 # define __native_word(t) (sizeof(t) == sizeof(char) || sizeof(t) == sizeof(short) || sizeof(t) == sizeof(int) || sizeof(t) == sizeof(long))
81714@@ -466,8 +534,9 @@ static __always_inline void __write_once_size(volatile void *p, void *res, int s
81715 */
81716 #define __ACCESS_ONCE(x) ({ \
81717 __maybe_unused typeof(x) __var = (__force typeof(x)) 0; \
81718- (volatile typeof(x) *)&(x); })
81719+ (volatile const typeof(x) *)&(x); })
81720 #define ACCESS_ONCE(x) (*__ACCESS_ONCE(x))
81721+#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
81722
81723 /* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */
81724 #ifdef CONFIG_KPROBES
81725diff --git a/include/linux/completion.h b/include/linux/completion.h
81726index 5d5aaae..0ea9b84 100644
81727--- a/include/linux/completion.h
81728+++ b/include/linux/completion.h
81729@@ -90,16 +90,16 @@ static inline void reinit_completion(struct completion *x)
81730
81731 extern void wait_for_completion(struct completion *);
81732 extern void wait_for_completion_io(struct completion *);
81733-extern int wait_for_completion_interruptible(struct completion *x);
81734-extern int wait_for_completion_killable(struct completion *x);
81735+extern int wait_for_completion_interruptible(struct completion *x) __intentional_overflow(-1);
81736+extern int wait_for_completion_killable(struct completion *x) __intentional_overflow(-1);
81737 extern unsigned long wait_for_completion_timeout(struct completion *x,
81738- unsigned long timeout);
81739+ unsigned long timeout) __intentional_overflow(-1);
81740 extern unsigned long wait_for_completion_io_timeout(struct completion *x,
81741- unsigned long timeout);
81742+ unsigned long timeout) __intentional_overflow(-1);
81743 extern long wait_for_completion_interruptible_timeout(
81744- struct completion *x, unsigned long timeout);
81745+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
81746 extern long wait_for_completion_killable_timeout(
81747- struct completion *x, unsigned long timeout);
81748+ struct completion *x, unsigned long timeout) __intentional_overflow(-1);
81749 extern bool try_wait_for_completion(struct completion *x);
81750 extern bool completion_done(struct completion *x);
81751
81752diff --git a/include/linux/configfs.h b/include/linux/configfs.h
81753index 34025df..d94bbbc 100644
81754--- a/include/linux/configfs.h
81755+++ b/include/linux/configfs.h
81756@@ -125,7 +125,7 @@ struct configfs_attribute {
81757 const char *ca_name;
81758 struct module *ca_owner;
81759 umode_t ca_mode;
81760-};
81761+} __do_const;
81762
81763 /*
81764 * Users often need to create attribute structures for their configurable
81765diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
81766index 2ee4888..0451f5e 100644
81767--- a/include/linux/cpufreq.h
81768+++ b/include/linux/cpufreq.h
81769@@ -207,6 +207,7 @@ struct global_attr {
81770 ssize_t (*store)(struct kobject *a, struct attribute *b,
81771 const char *c, size_t count);
81772 };
81773+typedef struct global_attr __no_const global_attr_no_const;
81774
81775 #define define_one_global_ro(_name) \
81776 static struct global_attr _name = \
81777@@ -278,7 +279,7 @@ struct cpufreq_driver {
81778 bool boost_supported;
81779 bool boost_enabled;
81780 int (*set_boost)(int state);
81781-};
81782+} __do_const;
81783
81784 /* flags */
81785 #define CPUFREQ_STICKY (1 << 0) /* driver isn't removed even if
81786diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h
81787index 9c5e892..feb34e0 100644
81788--- a/include/linux/cpuidle.h
81789+++ b/include/linux/cpuidle.h
81790@@ -59,7 +59,8 @@ struct cpuidle_state {
81791 void (*enter_freeze) (struct cpuidle_device *dev,
81792 struct cpuidle_driver *drv,
81793 int index);
81794-};
81795+} __do_const;
81796+typedef struct cpuidle_state __no_const cpuidle_state_no_const;
81797
81798 /* Idle State Flags */
81799 #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */
81800@@ -227,7 +228,7 @@ struct cpuidle_governor {
81801 void (*reflect) (struct cpuidle_device *dev, int index);
81802
81803 struct module *owner;
81804-};
81805+} __do_const;
81806
81807 #ifdef CONFIG_CPU_IDLE
81808 extern int cpuidle_register_governor(struct cpuidle_governor *gov);
81809diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h
81810index 086549a..a572d94 100644
81811--- a/include/linux/cpumask.h
81812+++ b/include/linux/cpumask.h
81813@@ -126,17 +126,17 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
81814 }
81815
81816 /* Valid inputs for n are -1 and 0. */
81817-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
81818+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
81819 {
81820 return n+1;
81821 }
81822
81823-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
81824+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
81825 {
81826 return n+1;
81827 }
81828
81829-static inline unsigned int cpumask_next_and(int n,
81830+static inline unsigned int __intentional_overflow(-1) cpumask_next_and(int n,
81831 const struct cpumask *srcp,
81832 const struct cpumask *andp)
81833 {
81834@@ -182,7 +182,7 @@ static inline unsigned int cpumask_first(const struct cpumask *srcp)
81835 *
81836 * Returns >= nr_cpu_ids if no further cpus set.
81837 */
81838-static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
81839+static inline unsigned int __intentional_overflow(-1) cpumask_next(int n, const struct cpumask *srcp)
81840 {
81841 /* -1 is a legal arg here. */
81842 if (n != -1)
81843@@ -197,7 +197,7 @@ static inline unsigned int cpumask_next(int n, const struct cpumask *srcp)
81844 *
81845 * Returns >= nr_cpu_ids if no further cpus unset.
81846 */
81847-static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
81848+static inline unsigned int __intentional_overflow(-1) cpumask_next_zero(int n, const struct cpumask *srcp)
81849 {
81850 /* -1 is a legal arg here. */
81851 if (n != -1)
81852@@ -205,7 +205,7 @@ static inline unsigned int cpumask_next_zero(int n, const struct cpumask *srcp)
81853 return find_next_zero_bit(cpumask_bits(srcp), nr_cpumask_bits, n+1);
81854 }
81855
81856-int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *);
81857+int cpumask_next_and(int n, const struct cpumask *, const struct cpumask *) __intentional_overflow(-1);
81858 int cpumask_any_but(const struct cpumask *mask, unsigned int cpu);
81859 int cpumask_set_cpu_local_first(int i, int numa_node, cpumask_t *dstp);
81860
81861@@ -472,7 +472,7 @@ static inline bool cpumask_full(const struct cpumask *srcp)
81862 * cpumask_weight - Count of bits in *srcp
81863 * @srcp: the cpumask to count bits (< nr_cpu_ids) in.
81864 */
81865-static inline unsigned int cpumask_weight(const struct cpumask *srcp)
81866+static inline unsigned int __intentional_overflow(-1) cpumask_weight(const struct cpumask *srcp)
81867 {
81868 return bitmap_weight(cpumask_bits(srcp), nr_cpumask_bits);
81869 }
81870diff --git a/include/linux/cred.h b/include/linux/cred.h
81871index 2fb2ca2..d6a3340 100644
81872--- a/include/linux/cred.h
81873+++ b/include/linux/cred.h
81874@@ -35,7 +35,7 @@ struct group_info {
81875 int nblocks;
81876 kgid_t small_block[NGROUPS_SMALL];
81877 kgid_t *blocks[0];
81878-};
81879+} __randomize_layout;
81880
81881 /**
81882 * get_group_info - Get a reference to a group info structure
81883@@ -137,7 +137,7 @@ struct cred {
81884 struct user_namespace *user_ns; /* user_ns the caps and keyrings are relative to. */
81885 struct group_info *group_info; /* supplementary groups for euid/fsgid */
81886 struct rcu_head rcu; /* RCU deletion hook */
81887-};
81888+} __randomize_layout;
81889
81890 extern void __put_cred(struct cred *);
81891 extern void exit_creds(struct task_struct *);
81892@@ -195,6 +195,9 @@ static inline void validate_creds_for_do_exit(struct task_struct *tsk)
81893 static inline void validate_process_creds(void)
81894 {
81895 }
81896+static inline void validate_task_creds(struct task_struct *task)
81897+{
81898+}
81899 #endif
81900
81901 /**
81902@@ -332,6 +335,7 @@ static inline void put_cred(const struct cred *_cred)
81903
81904 #define task_uid(task) (task_cred_xxx((task), uid))
81905 #define task_euid(task) (task_cred_xxx((task), euid))
81906+#define task_securebits(task) (task_cred_xxx((task), securebits))
81907
81908 #define current_cred_xxx(xxx) \
81909 ({ \
81910diff --git a/include/linux/crypto.h b/include/linux/crypto.h
81911index fb5ef16..05d1e59 100644
81912--- a/include/linux/crypto.h
81913+++ b/include/linux/crypto.h
81914@@ -626,7 +626,7 @@ struct cipher_tfm {
81915 const u8 *key, unsigned int keylen);
81916 void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
81917 void (*cit_decrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
81918-};
81919+} __no_const;
81920
81921 struct hash_tfm {
81922 int (*init)(struct hash_desc *desc);
81923@@ -647,13 +647,13 @@ struct compress_tfm {
81924 int (*cot_decompress)(struct crypto_tfm *tfm,
81925 const u8 *src, unsigned int slen,
81926 u8 *dst, unsigned int *dlen);
81927-};
81928+} __no_const;
81929
81930 struct rng_tfm {
81931 int (*rng_gen_random)(struct crypto_rng *tfm, u8 *rdata,
81932 unsigned int dlen);
81933 int (*rng_reset)(struct crypto_rng *tfm, u8 *seed, unsigned int slen);
81934-};
81935+} __no_const;
81936
81937 #define crt_ablkcipher crt_u.ablkcipher
81938 #define crt_aead crt_u.aead
81939diff --git a/include/linux/ctype.h b/include/linux/ctype.h
81940index 653589e..4ef254a 100644
81941--- a/include/linux/ctype.h
81942+++ b/include/linux/ctype.h
81943@@ -56,7 +56,7 @@ static inline unsigned char __toupper(unsigned char c)
81944 * Fast implementation of tolower() for internal usage. Do not use in your
81945 * code.
81946 */
81947-static inline char _tolower(const char c)
81948+static inline unsigned char _tolower(const unsigned char c)
81949 {
81950 return c | 0x20;
81951 }
81952diff --git a/include/linux/dcache.h b/include/linux/dcache.h
81953index d835879..c8e5b92 100644
81954--- a/include/linux/dcache.h
81955+++ b/include/linux/dcache.h
81956@@ -123,6 +123,9 @@ struct dentry {
81957 unsigned long d_time; /* used by d_revalidate */
81958 void *d_fsdata; /* fs-specific data */
81959
81960+#ifdef CONFIG_GRKERNSEC_CHROOT_RENAME
81961+ atomic_t chroot_refcnt; /* tracks use of directory in chroot */
81962+#endif
81963 struct list_head d_lru; /* LRU list */
81964 struct list_head d_child; /* child of parent list */
81965 struct list_head d_subdirs; /* our children */
81966@@ -133,7 +136,7 @@ struct dentry {
81967 struct hlist_node d_alias; /* inode alias list */
81968 struct rcu_head d_rcu;
81969 } d_u;
81970-};
81971+} __randomize_layout;
81972
81973 /*
81974 * dentry->d_lock spinlock nesting subclasses:
81975@@ -319,7 +322,7 @@ extern struct dentry *__d_lookup_rcu(const struct dentry *parent,
81976
81977 static inline unsigned d_count(const struct dentry *dentry)
81978 {
81979- return dentry->d_lockref.count;
81980+ return __lockref_read(&dentry->d_lockref);
81981 }
81982
81983 /*
81984@@ -347,7 +350,7 @@ extern char *dentry_path(struct dentry *, char *, int);
81985 static inline struct dentry *dget_dlock(struct dentry *dentry)
81986 {
81987 if (dentry)
81988- dentry->d_lockref.count++;
81989+ __lockref_inc(&dentry->d_lockref);
81990 return dentry;
81991 }
81992
81993diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
81994index 7925bf0..d5143d2 100644
81995--- a/include/linux/decompress/mm.h
81996+++ b/include/linux/decompress/mm.h
81997@@ -77,7 +77,7 @@ static void free(void *where)
81998 * warnings when not needed (indeed large_malloc / large_free are not
81999 * needed by inflate */
82000
82001-#define malloc(a) kmalloc(a, GFP_KERNEL)
82002+#define malloc(a) kmalloc((a), GFP_KERNEL)
82003 #define free(a) kfree(a)
82004
82005 #define large_malloc(a) vmalloc(a)
82006diff --git a/include/linux/devfreq.h b/include/linux/devfreq.h
82007index ce447f0..83c66bd 100644
82008--- a/include/linux/devfreq.h
82009+++ b/include/linux/devfreq.h
82010@@ -114,7 +114,7 @@ struct devfreq_governor {
82011 int (*get_target_freq)(struct devfreq *this, unsigned long *freq);
82012 int (*event_handler)(struct devfreq *devfreq,
82013 unsigned int event, void *data);
82014-};
82015+} __do_const;
82016
82017 /**
82018 * struct devfreq - Device devfreq structure
82019diff --git a/include/linux/device.h b/include/linux/device.h
82020index 0eb8ee2..c603b6a 100644
82021--- a/include/linux/device.h
82022+++ b/include/linux/device.h
82023@@ -311,7 +311,7 @@ struct subsys_interface {
82024 struct list_head node;
82025 int (*add_dev)(struct device *dev, struct subsys_interface *sif);
82026 int (*remove_dev)(struct device *dev, struct subsys_interface *sif);
82027-};
82028+} __do_const;
82029
82030 int subsys_interface_register(struct subsys_interface *sif);
82031 void subsys_interface_unregister(struct subsys_interface *sif);
82032@@ -507,7 +507,7 @@ struct device_type {
82033 void (*release)(struct device *dev);
82034
82035 const struct dev_pm_ops *pm;
82036-};
82037+} __do_const;
82038
82039 /* interface for exporting device attributes */
82040 struct device_attribute {
82041@@ -517,11 +517,12 @@ struct device_attribute {
82042 ssize_t (*store)(struct device *dev, struct device_attribute *attr,
82043 const char *buf, size_t count);
82044 };
82045+typedef struct device_attribute __no_const device_attribute_no_const;
82046
82047 struct dev_ext_attribute {
82048 struct device_attribute attr;
82049 void *var;
82050-};
82051+} __do_const;
82052
82053 ssize_t device_show_ulong(struct device *dev, struct device_attribute *attr,
82054 char *buf);
82055diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
82056index c3007cb..43efc8c 100644
82057--- a/include/linux/dma-mapping.h
82058+++ b/include/linux/dma-mapping.h
82059@@ -60,7 +60,7 @@ struct dma_map_ops {
82060 u64 (*get_required_mask)(struct device *dev);
82061 #endif
82062 int is_phys;
82063-};
82064+} __do_const;
82065
82066 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
82067
82068diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
82069index b6997a0..108be6c 100644
82070--- a/include/linux/dmaengine.h
82071+++ b/include/linux/dmaengine.h
82072@@ -1133,9 +1133,9 @@ struct dma_pinned_list {
82073 struct dma_pinned_list *dma_pin_iovec_pages(struct iovec *iov, size_t len);
82074 void dma_unpin_iovec_pages(struct dma_pinned_list* pinned_list);
82075
82076-dma_cookie_t dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
82077+dma_cookie_t __intentional_overflow(0) dma_memcpy_to_iovec(struct dma_chan *chan, struct iovec *iov,
82078 struct dma_pinned_list *pinned_list, unsigned char *kdata, size_t len);
82079-dma_cookie_t dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
82080+dma_cookie_t __intentional_overflow(0) dma_memcpy_pg_to_iovec(struct dma_chan *chan, struct iovec *iov,
82081 struct dma_pinned_list *pinned_list, struct page *page,
82082 unsigned int offset, size_t len);
82083
82084diff --git a/include/linux/efi.h b/include/linux/efi.h
82085index cf7e431..d239dce 100644
82086--- a/include/linux/efi.h
82087+++ b/include/linux/efi.h
82088@@ -1056,6 +1056,7 @@ struct efivar_operations {
82089 efi_set_variable_nonblocking_t *set_variable_nonblocking;
82090 efi_query_variable_store_t *query_variable_store;
82091 };
82092+typedef struct efivar_operations __no_const efivar_operations_no_const;
82093
82094 struct efivars {
82095 /*
82096diff --git a/include/linux/elf.h b/include/linux/elf.h
82097index 20fa8d8..3d0dd18 100644
82098--- a/include/linux/elf.h
82099+++ b/include/linux/elf.h
82100@@ -29,6 +29,7 @@ extern Elf32_Dyn _DYNAMIC [];
82101 #define elf_note elf32_note
82102 #define elf_addr_t Elf32_Off
82103 #define Elf_Half Elf32_Half
82104+#define elf_dyn Elf32_Dyn
82105
82106 #else
82107
82108@@ -39,6 +40,7 @@ extern Elf64_Dyn _DYNAMIC [];
82109 #define elf_note elf64_note
82110 #define elf_addr_t Elf64_Off
82111 #define Elf_Half Elf64_Half
82112+#define elf_dyn Elf64_Dyn
82113
82114 #endif
82115
82116diff --git a/include/linux/err.h b/include/linux/err.h
82117index a729120..6ede2c9 100644
82118--- a/include/linux/err.h
82119+++ b/include/linux/err.h
82120@@ -20,12 +20,12 @@
82121
82122 #define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
82123
82124-static inline void * __must_check ERR_PTR(long error)
82125+static inline void * __must_check __intentional_overflow(-1) ERR_PTR(long error)
82126 {
82127 return (void *) error;
82128 }
82129
82130-static inline long __must_check PTR_ERR(__force const void *ptr)
82131+static inline long __must_check __intentional_overflow(-1) PTR_ERR(__force const void *ptr)
82132 {
82133 return (long) ptr;
82134 }
82135diff --git a/include/linux/extcon.h b/include/linux/extcon.h
82136index 36f49c4..a2a1f4c 100644
82137--- a/include/linux/extcon.h
82138+++ b/include/linux/extcon.h
82139@@ -135,7 +135,7 @@ struct extcon_dev {
82140 /* /sys/class/extcon/.../mutually_exclusive/... */
82141 struct attribute_group attr_g_muex;
82142 struct attribute **attrs_muex;
82143- struct device_attribute *d_attrs_muex;
82144+ device_attribute_no_const *d_attrs_muex;
82145 };
82146
82147 /**
82148diff --git a/include/linux/fb.h b/include/linux/fb.h
82149index 043f328..180ccbf 100644
82150--- a/include/linux/fb.h
82151+++ b/include/linux/fb.h
82152@@ -305,7 +305,8 @@ struct fb_ops {
82153 /* called at KDB enter and leave time to prepare the console */
82154 int (*fb_debug_enter)(struct fb_info *info);
82155 int (*fb_debug_leave)(struct fb_info *info);
82156-};
82157+} __do_const;
82158+typedef struct fb_ops __no_const fb_ops_no_const;
82159
82160 #ifdef CONFIG_FB_TILEBLITTING
82161 #define FB_TILE_CURSOR_NONE 0
82162diff --git a/include/linux/fdtable.h b/include/linux/fdtable.h
82163index 230f87b..1fd0485 100644
82164--- a/include/linux/fdtable.h
82165+++ b/include/linux/fdtable.h
82166@@ -100,7 +100,7 @@ struct files_struct *get_files_struct(struct task_struct *);
82167 void put_files_struct(struct files_struct *fs);
82168 void reset_files_struct(struct files_struct *);
82169 int unshare_files(struct files_struct **);
82170-struct files_struct *dup_fd(struct files_struct *, int *);
82171+struct files_struct *dup_fd(struct files_struct *, int *) __latent_entropy;
82172 void do_close_on_exec(struct files_struct *);
82173 int iterate_fd(struct files_struct *, unsigned,
82174 int (*)(const void *, struct file *, unsigned),
82175diff --git a/include/linux/frontswap.h b/include/linux/frontswap.h
82176index 8293262..2b3b8bd 100644
82177--- a/include/linux/frontswap.h
82178+++ b/include/linux/frontswap.h
82179@@ -11,7 +11,7 @@ struct frontswap_ops {
82180 int (*load)(unsigned, pgoff_t, struct page *);
82181 void (*invalidate_page)(unsigned, pgoff_t);
82182 void (*invalidate_area)(unsigned);
82183-};
82184+} __no_const;
82185
82186 extern bool frontswap_enabled;
82187 extern struct frontswap_ops *
82188diff --git a/include/linux/fs.h b/include/linux/fs.h
82189index 52cc449..58b25c9 100644
82190--- a/include/linux/fs.h
82191+++ b/include/linux/fs.h
82192@@ -410,7 +410,7 @@ struct address_space {
82193 spinlock_t private_lock; /* for use by the address_space */
82194 struct list_head private_list; /* ditto */
82195 void *private_data; /* ditto */
82196-} __attribute__((aligned(sizeof(long))));
82197+} __attribute__((aligned(sizeof(long)))) __randomize_layout;
82198 /*
82199 * On most architectures that alignment is already the case; but
82200 * must be enforced here for CRIS, to let the least significant bit
82201@@ -453,7 +453,7 @@ struct block_device {
82202 int bd_fsfreeze_count;
82203 /* Mutex for freeze */
82204 struct mutex bd_fsfreeze_mutex;
82205-};
82206+} __randomize_layout;
82207
82208 /*
82209 * Radix-tree tags, for tagging dirty and writeback pages within the pagecache
82210@@ -639,7 +639,7 @@ struct inode {
82211 #endif
82212
82213 void *i_private; /* fs or device private pointer */
82214-};
82215+} __randomize_layout;
82216
82217 static inline int inode_unhashed(struct inode *inode)
82218 {
82219@@ -834,7 +834,7 @@ struct file {
82220 struct list_head f_tfile_llink;
82221 #endif /* #ifdef CONFIG_EPOLL */
82222 struct address_space *f_mapping;
82223-} __attribute__((aligned(4))); /* lest something weird decides that 2 is OK */
82224+} __attribute__((aligned(4))) __randomize_layout; /* lest something weird decides that 2 is OK */
82225
82226 struct file_handle {
82227 __u32 handle_bytes;
82228@@ -962,7 +962,7 @@ struct file_lock {
82229 int state; /* state of grant or error if -ve */
82230 } afs;
82231 } fl_u;
82232-};
82233+} __randomize_layout;
82234
82235 struct file_lock_context {
82236 spinlock_t flc_lock;
82237@@ -1316,7 +1316,7 @@ struct super_block {
82238 * Indicates how deep in a filesystem stack this SB is
82239 */
82240 int s_stack_depth;
82241-};
82242+} __randomize_layout;
82243
82244 extern struct timespec current_fs_time(struct super_block *sb);
82245
82246@@ -1570,7 +1570,8 @@ struct file_operations {
82247 #ifndef CONFIG_MMU
82248 unsigned (*mmap_capabilities)(struct file *);
82249 #endif
82250-};
82251+} __do_const __randomize_layout;
82252+typedef struct file_operations __no_const file_operations_no_const;
82253
82254 struct inode_operations {
82255 struct dentry * (*lookup) (struct inode *,struct dentry *, unsigned int);
82256@@ -2918,4 +2919,14 @@ static inline bool dir_relax(struct inode *inode)
82257 return !IS_DEADDIR(inode);
82258 }
82259
82260+static inline bool is_sidechannel_device(const struct inode *inode)
82261+{
82262+#ifdef CONFIG_GRKERNSEC_DEVICE_SIDECHANNEL
82263+ umode_t mode = inode->i_mode;
82264+ return ((S_ISCHR(mode) || S_ISBLK(mode)) && (mode & (S_IROTH | S_IWOTH)));
82265+#else
82266+ return false;
82267+#endif
82268+}
82269+
82270 #endif /* _LINUX_FS_H */
82271diff --git a/include/linux/fs_struct.h b/include/linux/fs_struct.h
82272index 0efc3e6..fd23610 100644
82273--- a/include/linux/fs_struct.h
82274+++ b/include/linux/fs_struct.h
82275@@ -6,13 +6,13 @@
82276 #include <linux/seqlock.h>
82277
82278 struct fs_struct {
82279- int users;
82280+ atomic_t users;
82281 spinlock_t lock;
82282 seqcount_t seq;
82283 int umask;
82284 int in_exec;
82285 struct path root, pwd;
82286-};
82287+} __randomize_layout;
82288
82289 extern struct kmem_cache *fs_cachep;
82290
82291diff --git a/include/linux/fscache-cache.h b/include/linux/fscache-cache.h
82292index 7714849..a4a5c7a 100644
82293--- a/include/linux/fscache-cache.h
82294+++ b/include/linux/fscache-cache.h
82295@@ -113,7 +113,7 @@ struct fscache_operation {
82296 fscache_operation_release_t release;
82297 };
82298
82299-extern atomic_t fscache_op_debug_id;
82300+extern atomic_unchecked_t fscache_op_debug_id;
82301 extern void fscache_op_work_func(struct work_struct *work);
82302
82303 extern void fscache_enqueue_operation(struct fscache_operation *);
82304@@ -135,7 +135,7 @@ static inline void fscache_operation_init(struct fscache_operation *op,
82305 INIT_WORK(&op->work, fscache_op_work_func);
82306 atomic_set(&op->usage, 1);
82307 op->state = FSCACHE_OP_ST_INITIALISED;
82308- op->debug_id = atomic_inc_return(&fscache_op_debug_id);
82309+ op->debug_id = atomic_inc_return_unchecked(&fscache_op_debug_id);
82310 op->processor = processor;
82311 op->release = release;
82312 INIT_LIST_HEAD(&op->pend_link);
82313diff --git a/include/linux/fscache.h b/include/linux/fscache.h
82314index 115bb81..e7b812b 100644
82315--- a/include/linux/fscache.h
82316+++ b/include/linux/fscache.h
82317@@ -152,7 +152,7 @@ struct fscache_cookie_def {
82318 * - this is mandatory for any object that may have data
82319 */
82320 void (*now_uncached)(void *cookie_netfs_data);
82321-};
82322+} __do_const;
82323
82324 /*
82325 * fscache cached network filesystem type
82326diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
82327index 7ee1774..72505b8 100644
82328--- a/include/linux/fsnotify.h
82329+++ b/include/linux/fsnotify.h
82330@@ -197,6 +197,9 @@ static inline void fsnotify_access(struct file *file)
82331 struct inode *inode = file_inode(file);
82332 __u32 mask = FS_ACCESS;
82333
82334+ if (is_sidechannel_device(inode))
82335+ return;
82336+
82337 if (S_ISDIR(inode->i_mode))
82338 mask |= FS_ISDIR;
82339
82340@@ -215,6 +218,9 @@ static inline void fsnotify_modify(struct file *file)
82341 struct inode *inode = file_inode(file);
82342 __u32 mask = FS_MODIFY;
82343
82344+ if (is_sidechannel_device(inode))
82345+ return;
82346+
82347 if (S_ISDIR(inode->i_mode))
82348 mask |= FS_ISDIR;
82349
82350@@ -317,7 +323,7 @@ static inline void fsnotify_change(struct dentry *dentry, unsigned int ia_valid)
82351 */
82352 static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
82353 {
82354- return kstrdup(name, GFP_KERNEL);
82355+ return (const unsigned char *)kstrdup((const char *)name, GFP_KERNEL);
82356 }
82357
82358 /*
82359diff --git a/include/linux/genhd.h b/include/linux/genhd.h
82360index ec274e0..e678159 100644
82361--- a/include/linux/genhd.h
82362+++ b/include/linux/genhd.h
82363@@ -194,7 +194,7 @@ struct gendisk {
82364 struct kobject *slave_dir;
82365
82366 struct timer_rand_state *random;
82367- atomic_t sync_io; /* RAID */
82368+ atomic_unchecked_t sync_io; /* RAID */
82369 struct disk_events *ev;
82370 #ifdef CONFIG_BLK_DEV_INTEGRITY
82371 struct blk_integrity *integrity;
82372@@ -435,7 +435,7 @@ extern void disk_flush_events(struct gendisk *disk, unsigned int mask);
82373 extern unsigned int disk_clear_events(struct gendisk *disk, unsigned int mask);
82374
82375 /* drivers/char/random.c */
82376-extern void add_disk_randomness(struct gendisk *disk);
82377+extern void add_disk_randomness(struct gendisk *disk) __latent_entropy;
82378 extern void rand_initialize_disk(struct gendisk *disk);
82379
82380 static inline sector_t get_start_sect(struct block_device *bdev)
82381diff --git a/include/linux/genl_magic_func.h b/include/linux/genl_magic_func.h
82382index 667c311..abac2a7 100644
82383--- a/include/linux/genl_magic_func.h
82384+++ b/include/linux/genl_magic_func.h
82385@@ -246,7 +246,7 @@ const char *CONCAT_(GENL_MAGIC_FAMILY, _genl_cmd_to_str)(__u8 cmd)
82386 },
82387
82388 #define ZZZ_genl_ops CONCAT_(GENL_MAGIC_FAMILY, _genl_ops)
82389-static struct genl_ops ZZZ_genl_ops[] __read_mostly = {
82390+static struct genl_ops ZZZ_genl_ops[] = {
82391 #include GENL_MAGIC_INCLUDE_FILE
82392 };
82393
82394diff --git a/include/linux/gfp.h b/include/linux/gfp.h
82395index 51bd1e7..0486343 100644
82396--- a/include/linux/gfp.h
82397+++ b/include/linux/gfp.h
82398@@ -34,6 +34,13 @@ struct vm_area_struct;
82399 #define ___GFP_NO_KSWAPD 0x400000u
82400 #define ___GFP_OTHER_NODE 0x800000u
82401 #define ___GFP_WRITE 0x1000000u
82402+
82403+#ifdef CONFIG_PAX_USERCOPY_SLABS
82404+#define ___GFP_USERCOPY 0x2000000u
82405+#else
82406+#define ___GFP_USERCOPY 0
82407+#endif
82408+
82409 /* If the above are modified, __GFP_BITS_SHIFT may need updating */
82410
82411 /*
82412@@ -90,6 +97,7 @@ struct vm_area_struct;
82413 #define __GFP_NO_KSWAPD ((__force gfp_t)___GFP_NO_KSWAPD)
82414 #define __GFP_OTHER_NODE ((__force gfp_t)___GFP_OTHER_NODE) /* On behalf of other node */
82415 #define __GFP_WRITE ((__force gfp_t)___GFP_WRITE) /* Allocator intends to dirty page */
82416+#define __GFP_USERCOPY ((__force gfp_t)___GFP_USERCOPY)/* Allocator intends to copy page to/from userland */
82417
82418 /*
82419 * This may seem redundant, but it's a way of annotating false positives vs.
82420@@ -97,7 +105,7 @@ struct vm_area_struct;
82421 */
82422 #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK)
82423
82424-#define __GFP_BITS_SHIFT 25 /* Room for N __GFP_FOO bits */
82425+#define __GFP_BITS_SHIFT 26 /* Room for N __GFP_FOO bits */
82426 #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1))
82427
82428 /* This equals 0, but use constants in case they ever change */
82429@@ -152,6 +160,8 @@ struct vm_area_struct;
82430 /* 4GB DMA on some platforms */
82431 #define GFP_DMA32 __GFP_DMA32
82432
82433+#define GFP_USERCOPY __GFP_USERCOPY
82434+
82435 /* Convert GFP flags to their corresponding migrate type */
82436 static inline int gfpflags_to_migratetype(const gfp_t gfp_flags)
82437 {
82438diff --git a/include/linux/gracl.h b/include/linux/gracl.h
82439new file mode 100644
82440index 0000000..91858e4
82441--- /dev/null
82442+++ b/include/linux/gracl.h
82443@@ -0,0 +1,342 @@
82444+#ifndef GR_ACL_H
82445+#define GR_ACL_H
82446+
82447+#include <linux/grdefs.h>
82448+#include <linux/resource.h>
82449+#include <linux/capability.h>
82450+#include <linux/dcache.h>
82451+#include <asm/resource.h>
82452+
82453+/* Major status information */
82454+
82455+#define GR_VERSION "grsecurity 3.1"
82456+#define GRSECURITY_VERSION 0x3100
82457+
82458+enum {
82459+ GR_SHUTDOWN = 0,
82460+ GR_ENABLE = 1,
82461+ GR_SPROLE = 2,
82462+ GR_OLDRELOAD = 3,
82463+ GR_SEGVMOD = 4,
82464+ GR_STATUS = 5,
82465+ GR_UNSPROLE = 6,
82466+ GR_PASSSET = 7,
82467+ GR_SPROLEPAM = 8,
82468+ GR_RELOAD = 9,
82469+};
82470+
82471+/* Password setup definitions
82472+ * kernel/grhash.c */
82473+enum {
82474+ GR_PW_LEN = 128,
82475+ GR_SALT_LEN = 16,
82476+ GR_SHA_LEN = 32,
82477+};
82478+
82479+enum {
82480+ GR_SPROLE_LEN = 64,
82481+};
82482+
82483+enum {
82484+ GR_NO_GLOB = 0,
82485+ GR_REG_GLOB,
82486+ GR_CREATE_GLOB
82487+};
82488+
82489+#define GR_NLIMITS 32
82490+
82491+/* Begin Data Structures */
82492+
82493+struct sprole_pw {
82494+ unsigned char *rolename;
82495+ unsigned char salt[GR_SALT_LEN];
82496+ unsigned char sum[GR_SHA_LEN]; /* 256-bit SHA hash of the password */
82497+};
82498+
82499+struct name_entry {
82500+ __u32 key;
82501+ u64 inode;
82502+ dev_t device;
82503+ char *name;
82504+ __u16 len;
82505+ __u8 deleted;
82506+ struct name_entry *prev;
82507+ struct name_entry *next;
82508+};
82509+
82510+struct inodev_entry {
82511+ struct name_entry *nentry;
82512+ struct inodev_entry *prev;
82513+ struct inodev_entry *next;
82514+};
82515+
82516+struct acl_role_db {
82517+ struct acl_role_label **r_hash;
82518+ __u32 r_size;
82519+};
82520+
82521+struct inodev_db {
82522+ struct inodev_entry **i_hash;
82523+ __u32 i_size;
82524+};
82525+
82526+struct name_db {
82527+ struct name_entry **n_hash;
82528+ __u32 n_size;
82529+};
82530+
82531+struct crash_uid {
82532+ uid_t uid;
82533+ unsigned long expires;
82534+};
82535+
82536+struct gr_hash_struct {
82537+ void **table;
82538+ void **nametable;
82539+ void *first;
82540+ __u32 table_size;
82541+ __u32 used_size;
82542+ int type;
82543+};
82544+
82545+/* Userspace Grsecurity ACL data structures */
82546+
82547+struct acl_subject_label {
82548+ char *filename;
82549+ u64 inode;
82550+ dev_t device;
82551+ __u32 mode;
82552+ kernel_cap_t cap_mask;
82553+ kernel_cap_t cap_lower;
82554+ kernel_cap_t cap_invert_audit;
82555+
82556+ struct rlimit res[GR_NLIMITS];
82557+ __u32 resmask;
82558+
82559+ __u8 user_trans_type;
82560+ __u8 group_trans_type;
82561+ uid_t *user_transitions;
82562+ gid_t *group_transitions;
82563+ __u16 user_trans_num;
82564+ __u16 group_trans_num;
82565+
82566+ __u32 sock_families[2];
82567+ __u32 ip_proto[8];
82568+ __u32 ip_type;
82569+ struct acl_ip_label **ips;
82570+ __u32 ip_num;
82571+ __u32 inaddr_any_override;
82572+
82573+ __u32 crashes;
82574+ unsigned long expires;
82575+
82576+ struct acl_subject_label *parent_subject;
82577+ struct gr_hash_struct *hash;
82578+ struct acl_subject_label *prev;
82579+ struct acl_subject_label *next;
82580+
82581+ struct acl_object_label **obj_hash;
82582+ __u32 obj_hash_size;
82583+ __u16 pax_flags;
82584+};
82585+
82586+struct role_allowed_ip {
82587+ __u32 addr;
82588+ __u32 netmask;
82589+
82590+ struct role_allowed_ip *prev;
82591+ struct role_allowed_ip *next;
82592+};
82593+
82594+struct role_transition {
82595+ char *rolename;
82596+
82597+ struct role_transition *prev;
82598+ struct role_transition *next;
82599+};
82600+
82601+struct acl_role_label {
82602+ char *rolename;
82603+ uid_t uidgid;
82604+ __u16 roletype;
82605+
82606+ __u16 auth_attempts;
82607+ unsigned long expires;
82608+
82609+ struct acl_subject_label *root_label;
82610+ struct gr_hash_struct *hash;
82611+
82612+ struct acl_role_label *prev;
82613+ struct acl_role_label *next;
82614+
82615+ struct role_transition *transitions;
82616+ struct role_allowed_ip *allowed_ips;
82617+ uid_t *domain_children;
82618+ __u16 domain_child_num;
82619+
82620+ umode_t umask;
82621+
82622+ struct acl_subject_label **subj_hash;
82623+ __u32 subj_hash_size;
82624+};
82625+
82626+struct user_acl_role_db {
82627+ struct acl_role_label **r_table;
82628+ __u32 num_pointers; /* Number of allocations to track */
82629+ __u32 num_roles; /* Number of roles */
82630+ __u32 num_domain_children; /* Number of domain children */
82631+ __u32 num_subjects; /* Number of subjects */
82632+ __u32 num_objects; /* Number of objects */
82633+};
82634+
82635+struct acl_object_label {
82636+ char *filename;
82637+ u64 inode;
82638+ dev_t device;
82639+ __u32 mode;
82640+
82641+ struct acl_subject_label *nested;
82642+ struct acl_object_label *globbed;
82643+
82644+ /* next two structures not used */
82645+
82646+ struct acl_object_label *prev;
82647+ struct acl_object_label *next;
82648+};
82649+
82650+struct acl_ip_label {
82651+ char *iface;
82652+ __u32 addr;
82653+ __u32 netmask;
82654+ __u16 low, high;
82655+ __u8 mode;
82656+ __u32 type;
82657+ __u32 proto[8];
82658+
82659+ /* next two structures not used */
82660+
82661+ struct acl_ip_label *prev;
82662+ struct acl_ip_label *next;
82663+};
82664+
82665+struct gr_arg {
82666+ struct user_acl_role_db role_db;
82667+ unsigned char pw[GR_PW_LEN];
82668+ unsigned char salt[GR_SALT_LEN];
82669+ unsigned char sum[GR_SHA_LEN];
82670+ unsigned char sp_role[GR_SPROLE_LEN];
82671+ struct sprole_pw *sprole_pws;
82672+ dev_t segv_device;
82673+ u64 segv_inode;
82674+ uid_t segv_uid;
82675+ __u16 num_sprole_pws;
82676+ __u16 mode;
82677+};
82678+
82679+struct gr_arg_wrapper {
82680+ struct gr_arg *arg;
82681+ __u32 version;
82682+ __u32 size;
82683+};
82684+
82685+struct subject_map {
82686+ struct acl_subject_label *user;
82687+ struct acl_subject_label *kernel;
82688+ struct subject_map *prev;
82689+ struct subject_map *next;
82690+};
82691+
82692+struct acl_subj_map_db {
82693+ struct subject_map **s_hash;
82694+ __u32 s_size;
82695+};
82696+
82697+struct gr_policy_state {
82698+ struct sprole_pw **acl_special_roles;
82699+ __u16 num_sprole_pws;
82700+ struct acl_role_label *kernel_role;
82701+ struct acl_role_label *role_list;
82702+ struct acl_role_label *default_role;
82703+ struct acl_role_db acl_role_set;
82704+ struct acl_subj_map_db subj_map_set;
82705+ struct name_db name_set;
82706+ struct inodev_db inodev_set;
82707+};
82708+
82709+struct gr_alloc_state {
82710+ unsigned long alloc_stack_next;
82711+ unsigned long alloc_stack_size;
82712+ void **alloc_stack;
82713+};
82714+
82715+struct gr_reload_state {
82716+ struct gr_policy_state oldpolicy;
82717+ struct gr_alloc_state oldalloc;
82718+ struct gr_policy_state newpolicy;
82719+ struct gr_alloc_state newalloc;
82720+ struct gr_policy_state *oldpolicy_ptr;
82721+ struct gr_alloc_state *oldalloc_ptr;
82722+ unsigned char oldmode;
82723+};
82724+
82725+/* End Data Structures Section */
82726+
82727+/* Hash functions generated by empirical testing by Brad Spengler
82728+ Makes good use of the low bits of the inode. Generally 0-1 times
82729+ in loop for successful match. 0-3 for unsuccessful match.
82730+ Shift/add algorithm with modulus of table size and an XOR*/
82731+
82732+static __inline__ unsigned int
82733+gr_rhash(const uid_t uid, const __u16 type, const unsigned int sz)
82734+{
82735+ return ((((uid + type) << (16 + type)) ^ uid) % sz);
82736+}
82737+
82738+ static __inline__ unsigned int
82739+gr_shash(const struct acl_subject_label *userp, const unsigned int sz)
82740+{
82741+ return ((const unsigned long)userp % sz);
82742+}
82743+
82744+static __inline__ unsigned int
82745+gr_fhash(const u64 ino, const dev_t dev, const unsigned int sz)
82746+{
82747+ unsigned int rem;
82748+ div_u64_rem((ino + dev) ^ ((ino << 13) + (ino << 23) + (dev << 9)), sz, &rem);
82749+ return rem;
82750+}
82751+
82752+static __inline__ unsigned int
82753+gr_nhash(const char *name, const __u16 len, const unsigned int sz)
82754+{
82755+ return full_name_hash((const unsigned char *)name, len) % sz;
82756+}
82757+
82758+#define FOR_EACH_SUBJECT_START(role,subj,iter) \
82759+ subj = NULL; \
82760+ iter = 0; \
82761+ while (iter < role->subj_hash_size) { \
82762+ if (subj == NULL) \
82763+ subj = role->subj_hash[iter]; \
82764+ if (subj == NULL) { \
82765+ iter++; \
82766+ continue; \
82767+ }
82768+
82769+#define FOR_EACH_SUBJECT_END(subj,iter) \
82770+ subj = subj->next; \
82771+ if (subj == NULL) \
82772+ iter++; \
82773+ }
82774+
82775+
82776+#define FOR_EACH_NESTED_SUBJECT_START(role,subj) \
82777+ subj = role->hash->first; \
82778+ while (subj != NULL) {
82779+
82780+#define FOR_EACH_NESTED_SUBJECT_END(subj) \
82781+ subj = subj->next; \
82782+ }
82783+
82784+#endif
82785+
82786diff --git a/include/linux/gracl_compat.h b/include/linux/gracl_compat.h
82787new file mode 100644
82788index 0000000..af64092
82789--- /dev/null
82790+++ b/include/linux/gracl_compat.h
82791@@ -0,0 +1,156 @@
82792+#ifndef GR_ACL_COMPAT_H
82793+#define GR_ACL_COMPAT_H
82794+
82795+#include <linux/resource.h>
82796+#include <asm/resource.h>
82797+
82798+struct sprole_pw_compat {
82799+ compat_uptr_t rolename;
82800+ unsigned char salt[GR_SALT_LEN];
82801+ unsigned char sum[GR_SHA_LEN];
82802+};
82803+
82804+struct gr_hash_struct_compat {
82805+ compat_uptr_t table;
82806+ compat_uptr_t nametable;
82807+ compat_uptr_t first;
82808+ __u32 table_size;
82809+ __u32 used_size;
82810+ int type;
82811+};
82812+
82813+struct acl_subject_label_compat {
82814+ compat_uptr_t filename;
82815+ compat_u64 inode;
82816+ __u32 device;
82817+ __u32 mode;
82818+ kernel_cap_t cap_mask;
82819+ kernel_cap_t cap_lower;
82820+ kernel_cap_t cap_invert_audit;
82821+
82822+ struct compat_rlimit res[GR_NLIMITS];
82823+ __u32 resmask;
82824+
82825+ __u8 user_trans_type;
82826+ __u8 group_trans_type;
82827+ compat_uptr_t user_transitions;
82828+ compat_uptr_t group_transitions;
82829+ __u16 user_trans_num;
82830+ __u16 group_trans_num;
82831+
82832+ __u32 sock_families[2];
82833+ __u32 ip_proto[8];
82834+ __u32 ip_type;
82835+ compat_uptr_t ips;
82836+ __u32 ip_num;
82837+ __u32 inaddr_any_override;
82838+
82839+ __u32 crashes;
82840+ compat_ulong_t expires;
82841+
82842+ compat_uptr_t parent_subject;
82843+ compat_uptr_t hash;
82844+ compat_uptr_t prev;
82845+ compat_uptr_t next;
82846+
82847+ compat_uptr_t obj_hash;
82848+ __u32 obj_hash_size;
82849+ __u16 pax_flags;
82850+};
82851+
82852+struct role_allowed_ip_compat {
82853+ __u32 addr;
82854+ __u32 netmask;
82855+
82856+ compat_uptr_t prev;
82857+ compat_uptr_t next;
82858+};
82859+
82860+struct role_transition_compat {
82861+ compat_uptr_t rolename;
82862+
82863+ compat_uptr_t prev;
82864+ compat_uptr_t next;
82865+};
82866+
82867+struct acl_role_label_compat {
82868+ compat_uptr_t rolename;
82869+ uid_t uidgid;
82870+ __u16 roletype;
82871+
82872+ __u16 auth_attempts;
82873+ compat_ulong_t expires;
82874+
82875+ compat_uptr_t root_label;
82876+ compat_uptr_t hash;
82877+
82878+ compat_uptr_t prev;
82879+ compat_uptr_t next;
82880+
82881+ compat_uptr_t transitions;
82882+ compat_uptr_t allowed_ips;
82883+ compat_uptr_t domain_children;
82884+ __u16 domain_child_num;
82885+
82886+ umode_t umask;
82887+
82888+ compat_uptr_t subj_hash;
82889+ __u32 subj_hash_size;
82890+};
82891+
82892+struct user_acl_role_db_compat {
82893+ compat_uptr_t r_table;
82894+ __u32 num_pointers;
82895+ __u32 num_roles;
82896+ __u32 num_domain_children;
82897+ __u32 num_subjects;
82898+ __u32 num_objects;
82899+};
82900+
82901+struct acl_object_label_compat {
82902+ compat_uptr_t filename;
82903+ compat_u64 inode;
82904+ __u32 device;
82905+ __u32 mode;
82906+
82907+ compat_uptr_t nested;
82908+ compat_uptr_t globbed;
82909+
82910+ compat_uptr_t prev;
82911+ compat_uptr_t next;
82912+};
82913+
82914+struct acl_ip_label_compat {
82915+ compat_uptr_t iface;
82916+ __u32 addr;
82917+ __u32 netmask;
82918+ __u16 low, high;
82919+ __u8 mode;
82920+ __u32 type;
82921+ __u32 proto[8];
82922+
82923+ compat_uptr_t prev;
82924+ compat_uptr_t next;
82925+};
82926+
82927+struct gr_arg_compat {
82928+ struct user_acl_role_db_compat role_db;
82929+ unsigned char pw[GR_PW_LEN];
82930+ unsigned char salt[GR_SALT_LEN];
82931+ unsigned char sum[GR_SHA_LEN];
82932+ unsigned char sp_role[GR_SPROLE_LEN];
82933+ compat_uptr_t sprole_pws;
82934+ __u32 segv_device;
82935+ compat_u64 segv_inode;
82936+ uid_t segv_uid;
82937+ __u16 num_sprole_pws;
82938+ __u16 mode;
82939+};
82940+
82941+struct gr_arg_wrapper_compat {
82942+ compat_uptr_t arg;
82943+ __u32 version;
82944+ __u32 size;
82945+};
82946+
82947+#endif
82948diff --git a/include/linux/gralloc.h b/include/linux/gralloc.h
82949new file mode 100644
82950index 0000000..323ecf2
82951--- /dev/null
82952+++ b/include/linux/gralloc.h
82953@@ -0,0 +1,9 @@
82954+#ifndef __GRALLOC_H
82955+#define __GRALLOC_H
82956+
82957+void acl_free_all(void);
82958+int acl_alloc_stack_init(unsigned long size);
82959+void *acl_alloc(unsigned long len);
82960+void *acl_alloc_num(unsigned long num, unsigned long len);
82961+
82962+#endif
82963diff --git a/include/linux/grdefs.h b/include/linux/grdefs.h
82964new file mode 100644
82965index 0000000..be66033
82966--- /dev/null
82967+++ b/include/linux/grdefs.h
82968@@ -0,0 +1,140 @@
82969+#ifndef GRDEFS_H
82970+#define GRDEFS_H
82971+
82972+/* Begin grsecurity status declarations */
82973+
82974+enum {
82975+ GR_READY = 0x01,
82976+ GR_STATUS_INIT = 0x00 // disabled state
82977+};
82978+
82979+/* Begin ACL declarations */
82980+
82981+/* Role flags */
82982+
82983+enum {
82984+ GR_ROLE_USER = 0x0001,
82985+ GR_ROLE_GROUP = 0x0002,
82986+ GR_ROLE_DEFAULT = 0x0004,
82987+ GR_ROLE_SPECIAL = 0x0008,
82988+ GR_ROLE_AUTH = 0x0010,
82989+ GR_ROLE_NOPW = 0x0020,
82990+ GR_ROLE_GOD = 0x0040,
82991+ GR_ROLE_LEARN = 0x0080,
82992+ GR_ROLE_TPE = 0x0100,
82993+ GR_ROLE_DOMAIN = 0x0200,
82994+ GR_ROLE_PAM = 0x0400,
82995+ GR_ROLE_PERSIST = 0x0800
82996+};
82997+
82998+/* ACL Subject and Object mode flags */
82999+enum {
83000+ GR_DELETED = 0x80000000
83001+};
83002+
83003+/* ACL Object-only mode flags */
83004+enum {
83005+ GR_READ = 0x00000001,
83006+ GR_APPEND = 0x00000002,
83007+ GR_WRITE = 0x00000004,
83008+ GR_EXEC = 0x00000008,
83009+ GR_FIND = 0x00000010,
83010+ GR_INHERIT = 0x00000020,
83011+ GR_SETID = 0x00000040,
83012+ GR_CREATE = 0x00000080,
83013+ GR_DELETE = 0x00000100,
83014+ GR_LINK = 0x00000200,
83015+ GR_AUDIT_READ = 0x00000400,
83016+ GR_AUDIT_APPEND = 0x00000800,
83017+ GR_AUDIT_WRITE = 0x00001000,
83018+ GR_AUDIT_EXEC = 0x00002000,
83019+ GR_AUDIT_FIND = 0x00004000,
83020+ GR_AUDIT_INHERIT= 0x00008000,
83021+ GR_AUDIT_SETID = 0x00010000,
83022+ GR_AUDIT_CREATE = 0x00020000,
83023+ GR_AUDIT_DELETE = 0x00040000,
83024+ GR_AUDIT_LINK = 0x00080000,
83025+ GR_PTRACERD = 0x00100000,
83026+ GR_NOPTRACE = 0x00200000,
83027+ GR_SUPPRESS = 0x00400000,
83028+ GR_NOLEARN = 0x00800000,
83029+ GR_INIT_TRANSFER= 0x01000000
83030+};
83031+
83032+#define GR_AUDITS (GR_AUDIT_READ | GR_AUDIT_WRITE | GR_AUDIT_APPEND | GR_AUDIT_EXEC | \
83033+ GR_AUDIT_FIND | GR_AUDIT_INHERIT | GR_AUDIT_SETID | \
83034+ GR_AUDIT_CREATE | GR_AUDIT_DELETE | GR_AUDIT_LINK)
83035+
83036+/* ACL subject-only mode flags */
83037+enum {
83038+ GR_KILL = 0x00000001,
83039+ GR_VIEW = 0x00000002,
83040+ GR_PROTECTED = 0x00000004,
83041+ GR_LEARN = 0x00000008,
83042+ GR_OVERRIDE = 0x00000010,
83043+ /* just a placeholder, this mode is only used in userspace */
83044+ GR_DUMMY = 0x00000020,
83045+ GR_PROTSHM = 0x00000040,
83046+ GR_KILLPROC = 0x00000080,
83047+ GR_KILLIPPROC = 0x00000100,
83048+ /* just a placeholder, this mode is only used in userspace */
83049+ GR_NOTROJAN = 0x00000200,
83050+ GR_PROTPROCFD = 0x00000400,
83051+ GR_PROCACCT = 0x00000800,
83052+ GR_RELAXPTRACE = 0x00001000,
83053+ //GR_NESTED = 0x00002000,
83054+ GR_INHERITLEARN = 0x00004000,
83055+ GR_PROCFIND = 0x00008000,
83056+ GR_POVERRIDE = 0x00010000,
83057+ GR_KERNELAUTH = 0x00020000,
83058+ GR_ATSECURE = 0x00040000,
83059+ GR_SHMEXEC = 0x00080000
83060+};
83061+
83062+enum {
83063+ GR_PAX_ENABLE_SEGMEXEC = 0x0001,
83064+ GR_PAX_ENABLE_PAGEEXEC = 0x0002,
83065+ GR_PAX_ENABLE_MPROTECT = 0x0004,
83066+ GR_PAX_ENABLE_RANDMMAP = 0x0008,
83067+ GR_PAX_ENABLE_EMUTRAMP = 0x0010,
83068+ GR_PAX_DISABLE_SEGMEXEC = 0x0100,
83069+ GR_PAX_DISABLE_PAGEEXEC = 0x0200,
83070+ GR_PAX_DISABLE_MPROTECT = 0x0400,
83071+ GR_PAX_DISABLE_RANDMMAP = 0x0800,
83072+ GR_PAX_DISABLE_EMUTRAMP = 0x1000,
83073+};
83074+
83075+enum {
83076+ GR_ID_USER = 0x01,
83077+ GR_ID_GROUP = 0x02,
83078+};
83079+
83080+enum {
83081+ GR_ID_ALLOW = 0x01,
83082+ GR_ID_DENY = 0x02,
83083+};
83084+
83085+#define GR_CRASH_RES 31
83086+#define GR_UIDTABLE_MAX 500
83087+
83088+/* begin resource learning section */
83089+enum {
83090+ GR_RLIM_CPU_BUMP = 60,
83091+ GR_RLIM_FSIZE_BUMP = 50000,
83092+ GR_RLIM_DATA_BUMP = 10000,
83093+ GR_RLIM_STACK_BUMP = 1000,
83094+ GR_RLIM_CORE_BUMP = 10000,
83095+ GR_RLIM_RSS_BUMP = 500000,
83096+ GR_RLIM_NPROC_BUMP = 1,
83097+ GR_RLIM_NOFILE_BUMP = 5,
83098+ GR_RLIM_MEMLOCK_BUMP = 50000,
83099+ GR_RLIM_AS_BUMP = 500000,
83100+ GR_RLIM_LOCKS_BUMP = 2,
83101+ GR_RLIM_SIGPENDING_BUMP = 5,
83102+ GR_RLIM_MSGQUEUE_BUMP = 10000,
83103+ GR_RLIM_NICE_BUMP = 1,
83104+ GR_RLIM_RTPRIO_BUMP = 1,
83105+ GR_RLIM_RTTIME_BUMP = 1000000
83106+};
83107+
83108+#endif
83109diff --git a/include/linux/grinternal.h b/include/linux/grinternal.h
83110new file mode 100644
83111index 0000000..fb1de5d
83112--- /dev/null
83113+++ b/include/linux/grinternal.h
83114@@ -0,0 +1,230 @@
83115+#ifndef __GRINTERNAL_H
83116+#define __GRINTERNAL_H
83117+
83118+#ifdef CONFIG_GRKERNSEC
83119+
83120+#include <linux/fs.h>
83121+#include <linux/mnt_namespace.h>
83122+#include <linux/nsproxy.h>
83123+#include <linux/gracl.h>
83124+#include <linux/grdefs.h>
83125+#include <linux/grmsg.h>
83126+
83127+void gr_add_learn_entry(const char *fmt, ...)
83128+ __attribute__ ((format (printf, 1, 2)));
83129+__u32 gr_search_file(const struct dentry *dentry, const __u32 mode,
83130+ const struct vfsmount *mnt);
83131+__u32 gr_check_create(const struct dentry *new_dentry,
83132+ const struct dentry *parent,
83133+ const struct vfsmount *mnt, const __u32 mode);
83134+int gr_check_protected_task(const struct task_struct *task);
83135+__u32 to_gr_audit(const __u32 reqmode);
83136+int gr_set_acls(const int type);
83137+int gr_acl_is_enabled(void);
83138+char gr_roletype_to_char(void);
83139+
83140+void gr_handle_alertkill(struct task_struct *task);
83141+char *gr_to_filename(const struct dentry *dentry,
83142+ const struct vfsmount *mnt);
83143+char *gr_to_filename1(const struct dentry *dentry,
83144+ const struct vfsmount *mnt);
83145+char *gr_to_filename2(const struct dentry *dentry,
83146+ const struct vfsmount *mnt);
83147+char *gr_to_filename3(const struct dentry *dentry,
83148+ const struct vfsmount *mnt);
83149+
83150+extern int grsec_enable_ptrace_readexec;
83151+extern int grsec_enable_harden_ptrace;
83152+extern int grsec_enable_link;
83153+extern int grsec_enable_fifo;
83154+extern int grsec_enable_execve;
83155+extern int grsec_enable_shm;
83156+extern int grsec_enable_execlog;
83157+extern int grsec_enable_signal;
83158+extern int grsec_enable_audit_ptrace;
83159+extern int grsec_enable_forkfail;
83160+extern int grsec_enable_time;
83161+extern int grsec_enable_rofs;
83162+extern int grsec_deny_new_usb;
83163+extern int grsec_enable_chroot_shmat;
83164+extern int grsec_enable_chroot_mount;
83165+extern int grsec_enable_chroot_double;
83166+extern int grsec_enable_chroot_pivot;
83167+extern int grsec_enable_chroot_chdir;
83168+extern int grsec_enable_chroot_chmod;
83169+extern int grsec_enable_chroot_mknod;
83170+extern int grsec_enable_chroot_fchdir;
83171+extern int grsec_enable_chroot_nice;
83172+extern int grsec_enable_chroot_execlog;
83173+extern int grsec_enable_chroot_caps;
83174+extern int grsec_enable_chroot_rename;
83175+extern int grsec_enable_chroot_sysctl;
83176+extern int grsec_enable_chroot_unix;
83177+extern int grsec_enable_symlinkown;
83178+extern kgid_t grsec_symlinkown_gid;
83179+extern int grsec_enable_tpe;
83180+extern kgid_t grsec_tpe_gid;
83181+extern int grsec_enable_tpe_all;
83182+extern int grsec_enable_tpe_invert;
83183+extern int grsec_enable_socket_all;
83184+extern kgid_t grsec_socket_all_gid;
83185+extern int grsec_enable_socket_client;
83186+extern kgid_t grsec_socket_client_gid;
83187+extern int grsec_enable_socket_server;
83188+extern kgid_t grsec_socket_server_gid;
83189+extern kgid_t grsec_audit_gid;
83190+extern int grsec_enable_group;
83191+extern int grsec_enable_log_rwxmaps;
83192+extern int grsec_enable_mount;
83193+extern int grsec_enable_chdir;
83194+extern int grsec_resource_logging;
83195+extern int grsec_enable_blackhole;
83196+extern int grsec_lastack_retries;
83197+extern int grsec_enable_brute;
83198+extern int grsec_enable_harden_ipc;
83199+extern int grsec_lock;
83200+
83201+extern spinlock_t grsec_alert_lock;
83202+extern unsigned long grsec_alert_wtime;
83203+extern unsigned long grsec_alert_fyet;
83204+
83205+extern spinlock_t grsec_audit_lock;
83206+
83207+extern rwlock_t grsec_exec_file_lock;
83208+
83209+#define gr_task_fullpath(tsk) ((tsk)->exec_file ? \
83210+ gr_to_filename2((tsk)->exec_file->f_path.dentry, \
83211+ (tsk)->exec_file->f_path.mnt) : "/")
83212+
83213+#define gr_parent_task_fullpath(tsk) ((tsk)->real_parent->exec_file ? \
83214+ gr_to_filename3((tsk)->real_parent->exec_file->f_path.dentry, \
83215+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
83216+
83217+#define gr_task_fullpath0(tsk) ((tsk)->exec_file ? \
83218+ gr_to_filename((tsk)->exec_file->f_path.dentry, \
83219+ (tsk)->exec_file->f_path.mnt) : "/")
83220+
83221+#define gr_parent_task_fullpath0(tsk) ((tsk)->real_parent->exec_file ? \
83222+ gr_to_filename1((tsk)->real_parent->exec_file->f_path.dentry, \
83223+ (tsk)->real_parent->exec_file->f_path.mnt) : "/")
83224+
83225+#define proc_is_chrooted(tsk_a) ((tsk_a)->gr_is_chrooted)
83226+
83227+#define have_same_root(tsk_a,tsk_b) ((tsk_a)->gr_chroot_dentry == (tsk_b)->gr_chroot_dentry)
83228+
83229+static inline bool gr_is_same_file(const struct file *file1, const struct file *file2)
83230+{
83231+ if (file1 && file2) {
83232+ const struct inode *inode1 = file1->f_path.dentry->d_inode;
83233+ const struct inode *inode2 = file2->f_path.dentry->d_inode;
83234+ if (inode1->i_ino == inode2->i_ino && inode1->i_sb->s_dev == inode2->i_sb->s_dev)
83235+ return true;
83236+ }
83237+
83238+ return false;
83239+}
83240+
83241+#define GR_CHROOT_CAPS {{ \
83242+ CAP_TO_MASK(CAP_LINUX_IMMUTABLE) | CAP_TO_MASK(CAP_NET_ADMIN) | \
83243+ CAP_TO_MASK(CAP_SYS_MODULE) | CAP_TO_MASK(CAP_SYS_RAWIO) | \
83244+ CAP_TO_MASK(CAP_SYS_PACCT) | CAP_TO_MASK(CAP_SYS_ADMIN) | \
83245+ CAP_TO_MASK(CAP_SYS_BOOT) | CAP_TO_MASK(CAP_SYS_TIME) | \
83246+ CAP_TO_MASK(CAP_NET_RAW) | CAP_TO_MASK(CAP_SYS_TTY_CONFIG) | \
83247+ CAP_TO_MASK(CAP_IPC_OWNER) | CAP_TO_MASK(CAP_SETFCAP), \
83248+ CAP_TO_MASK(CAP_SYSLOG) | CAP_TO_MASK(CAP_MAC_ADMIN) }}
83249+
83250+#define security_learn(normal_msg,args...) \
83251+({ \
83252+ read_lock(&grsec_exec_file_lock); \
83253+ gr_add_learn_entry(normal_msg "\n", ## args); \
83254+ read_unlock(&grsec_exec_file_lock); \
83255+})
83256+
83257+enum {
83258+ GR_DO_AUDIT,
83259+ GR_DONT_AUDIT,
83260+ /* used for non-audit messages that we shouldn't kill the task on */
83261+ GR_DONT_AUDIT_GOOD
83262+};
83263+
83264+enum {
83265+ GR_TTYSNIFF,
83266+ GR_RBAC,
83267+ GR_RBAC_STR,
83268+ GR_STR_RBAC,
83269+ GR_RBAC_MODE2,
83270+ GR_RBAC_MODE3,
83271+ GR_FILENAME,
83272+ GR_SYSCTL_HIDDEN,
83273+ GR_NOARGS,
83274+ GR_ONE_INT,
83275+ GR_ONE_INT_TWO_STR,
83276+ GR_ONE_STR,
83277+ GR_STR_INT,
83278+ GR_TWO_STR_INT,
83279+ GR_TWO_INT,
83280+ GR_TWO_U64,
83281+ GR_THREE_INT,
83282+ GR_FIVE_INT_TWO_STR,
83283+ GR_TWO_STR,
83284+ GR_THREE_STR,
83285+ GR_FOUR_STR,
83286+ GR_STR_FILENAME,
83287+ GR_FILENAME_STR,
83288+ GR_FILENAME_TWO_INT,
83289+ GR_FILENAME_TWO_INT_STR,
83290+ GR_TEXTREL,
83291+ GR_PTRACE,
83292+ GR_RESOURCE,
83293+ GR_CAP,
83294+ GR_SIG,
83295+ GR_SIG2,
83296+ GR_CRASH1,
83297+ GR_CRASH2,
83298+ GR_PSACCT,
83299+ GR_RWXMAP,
83300+ GR_RWXMAPVMA
83301+};
83302+
83303+#define gr_log_hidden_sysctl(audit, msg, str) gr_log_varargs(audit, msg, GR_SYSCTL_HIDDEN, str)
83304+#define gr_log_ttysniff(audit, msg, task) gr_log_varargs(audit, msg, GR_TTYSNIFF, task)
83305+#define gr_log_fs_rbac_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_RBAC, dentry, mnt)
83306+#define gr_log_fs_rbac_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_RBAC_STR, dentry, mnt, str)
83307+#define gr_log_fs_str_rbac(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_RBAC, str, dentry, mnt)
83308+#define gr_log_fs_rbac_mode2(audit, msg, dentry, mnt, str1, str2) gr_log_varargs(audit, msg, GR_RBAC_MODE2, dentry, mnt, str1, str2)
83309+#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)
83310+#define gr_log_fs_generic(audit, msg, dentry, mnt) gr_log_varargs(audit, msg, GR_FILENAME, dentry, mnt)
83311+#define gr_log_noargs(audit, msg) gr_log_varargs(audit, msg, GR_NOARGS)
83312+#define gr_log_int(audit, msg, num) gr_log_varargs(audit, msg, GR_ONE_INT, num)
83313+#define gr_log_int_str2(audit, msg, num, str1, str2) gr_log_varargs(audit, msg, GR_ONE_INT_TWO_STR, num, str1, str2)
83314+#define gr_log_str(audit, msg, str) gr_log_varargs(audit, msg, GR_ONE_STR, str)
83315+#define gr_log_str_int(audit, msg, str, num) gr_log_varargs(audit, msg, GR_STR_INT, str, num)
83316+#define gr_log_int_int(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_INT, num1, num2)
83317+#define gr_log_two_u64(audit, msg, num1, num2) gr_log_varargs(audit, msg, GR_TWO_U64, num1, num2)
83318+#define gr_log_int3(audit, msg, num1, num2, num3) gr_log_varargs(audit, msg, GR_THREE_INT, num1, num2, num3)
83319+#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)
83320+#define gr_log_str_str(audit, msg, str1, str2) gr_log_varargs(audit, msg, GR_TWO_STR, str1, str2)
83321+#define gr_log_str2_int(audit, msg, str1, str2, num) gr_log_varargs(audit, msg, GR_TWO_STR_INT, str1, str2, num)
83322+#define gr_log_str3(audit, msg, str1, str2, str3) gr_log_varargs(audit, msg, GR_THREE_STR, str1, str2, str3)
83323+#define gr_log_str4(audit, msg, str1, str2, str3, str4) gr_log_varargs(audit, msg, GR_FOUR_STR, str1, str2, str3, str4)
83324+#define gr_log_str_fs(audit, msg, str, dentry, mnt) gr_log_varargs(audit, msg, GR_STR_FILENAME, str, dentry, mnt)
83325+#define gr_log_fs_str(audit, msg, dentry, mnt, str) gr_log_varargs(audit, msg, GR_FILENAME_STR, dentry, mnt, str)
83326+#define gr_log_fs_int2(audit, msg, dentry, mnt, num1, num2) gr_log_varargs(audit, msg, GR_FILENAME_TWO_INT, dentry, mnt, num1, num2)
83327+#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)
83328+#define gr_log_textrel_ulong_ulong(audit, msg, file, ulong1, ulong2) gr_log_varargs(audit, msg, GR_TEXTREL, file, ulong1, ulong2)
83329+#define gr_log_ptrace(audit, msg, task) gr_log_varargs(audit, msg, GR_PTRACE, task)
83330+#define gr_log_res_ulong2_str(audit, msg, task, ulong1, str, ulong2) gr_log_varargs(audit, msg, GR_RESOURCE, task, ulong1, str, ulong2)
83331+#define gr_log_cap(audit, msg, task, str) gr_log_varargs(audit, msg, GR_CAP, task, str)
83332+#define gr_log_sig_addr(audit, msg, str, addr) gr_log_varargs(audit, msg, GR_SIG, str, addr)
83333+#define gr_log_sig_task(audit, msg, task, num) gr_log_varargs(audit, msg, GR_SIG2, task, num)
83334+#define gr_log_crash1(audit, msg, task, ulong) gr_log_varargs(audit, msg, GR_CRASH1, task, ulong)
83335+#define gr_log_crash2(audit, msg, task, ulong1) gr_log_varargs(audit, msg, GR_CRASH2, task, ulong1)
83336+#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)
83337+#define gr_log_rwxmap(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAP, str)
83338+#define gr_log_rwxmap_vma(audit, msg, str) gr_log_varargs(audit, msg, GR_RWXMAPVMA, str)
83339+
83340+void gr_log_varargs(int audit, const char *msg, int argtypes, ...);
83341+
83342+#endif
83343+
83344+#endif
83345diff --git a/include/linux/grmsg.h b/include/linux/grmsg.h
83346new file mode 100644
83347index 0000000..26ef560
83348--- /dev/null
83349+++ b/include/linux/grmsg.h
83350@@ -0,0 +1,118 @@
83351+#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"
83352+#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"
83353+#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
83354+#define GR_STOPMOD_MSG "denied modification of module state by "
83355+#define GR_ROFS_BLOCKWRITE_MSG "denied write to block device %.950s by "
83356+#define GR_ROFS_MOUNT_MSG "denied writable mount of %.950s by "
83357+#define GR_IOPERM_MSG "denied use of ioperm() by "
83358+#define GR_IOPL_MSG "denied use of iopl() by "
83359+#define GR_SHMAT_ACL_MSG "denied attach of shared memory of UID %u, PID %d, ID %u by "
83360+#define GR_UNIX_CHROOT_MSG "denied connect() to abstract AF_UNIX socket outside of chroot by "
83361+#define GR_SHMAT_CHROOT_MSG "denied attach of shared memory outside of chroot by "
83362+#define GR_MEM_READWRITE_MSG "denied access of range %Lx -> %Lx in /dev/mem by "
83363+#define GR_SYMLINK_MSG "not following symlink %.950s owned by %d.%d by "
83364+#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"
83365+#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"
83366+#define GR_HIDDEN_ACL_MSG "%s access to hidden file %.950s by "
83367+#define GR_OPEN_ACL_MSG "%s open of %.950s for%s%s by "
83368+#define GR_CREATE_ACL_MSG "%s create of %.950s for%s%s by "
83369+#define GR_FIFO_MSG "denied writing FIFO %.950s of %d.%d by "
83370+#define GR_MKNOD_CHROOT_MSG "denied mknod of %.950s from chroot by "
83371+#define GR_MKNOD_ACL_MSG "%s mknod of %.950s by "
83372+#define GR_UNIXCONNECT_ACL_MSG "%s connect() to the unix domain socket %.950s by "
83373+#define GR_TTYSNIFF_ACL_MSG "terminal being sniffed by IP:%pI4 %.480s[%.16s:%d], parent %.480s[%.16s:%d] against "
83374+#define GR_MKDIR_ACL_MSG "%s mkdir of %.950s by "
83375+#define GR_RMDIR_ACL_MSG "%s rmdir of %.950s by "
83376+#define GR_UNLINK_ACL_MSG "%s unlink of %.950s by "
83377+#define GR_SYMLINK_ACL_MSG "%s symlink from %.480s to %.480s by "
83378+#define GR_HARDLINK_MSG "denied hardlink of %.930s (owned by %d.%d) to %.30s for "
83379+#define GR_LINK_ACL_MSG "%s link of %.480s to %.480s by "
83380+#define GR_INHERIT_ACL_MSG "successful inherit of %.480s's ACL for %.480s by "
83381+#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
83382+#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
83383+#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
83384+#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
83385+#define GR_EXEC_TPE_MSG "denied untrusted exec (due to %.70s) of %.950s by "
83386+#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
83387+#define GR_SEGVNOSUID_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning execution for %lu seconds"
83388+#define GR_MOUNT_CHROOT_MSG "denied mount of %.256s as %.930s from chroot by "
83389+#define GR_PIVOT_CHROOT_MSG "denied pivot_root from chroot by "
83390+#define GR_TRUNCATE_ACL_MSG "%s truncate of %.950s by "
83391+#define GR_ATIME_ACL_MSG "%s access time change of %.950s by "
83392+#define GR_ACCESS_ACL_MSG "%s access of %.950s for%s%s%s by "
83393+#define GR_CHROOT_CHROOT_MSG "denied double chroot to %.950s by "
83394+#define GR_CHROOT_RENAME_MSG "denied bad rename of %.950s out of a chroot by "
83395+#define GR_CHMOD_CHROOT_MSG "denied chmod +s of %.950s by "
83396+#define GR_CHMOD_ACL_MSG "%s chmod of %.950s by "
83397+#define GR_CHROOT_FCHDIR_MSG "denied fchdir outside of chroot to %.950s by "
83398+#define GR_CHROOT_FHANDLE_MSG "denied use of file handles inside chroot by "
83399+#define GR_CHOWN_ACL_MSG "%s chown of %.950s by "
83400+#define GR_SETXATTR_ACL_MSG "%s setting extended attribute of %.950s by "
83401+#define GR_REMOVEXATTR_ACL_MSG "%s removing extended attribute of %.950s by "
83402+#define GR_WRITLIB_ACL_MSG "denied load of writable library %.950s by "
83403+#define GR_INITF_ACL_MSG "init_variables() failed %s by "
83404+#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"
83405+#define GR_DEV_ACL_MSG "/dev/grsec: %d bytes sent %d required, being fed garbage by "
83406+#define GR_SHUTS_ACL_MSG "shutdown auth success for "
83407+#define GR_SHUTF_ACL_MSG "shutdown auth failure for "
83408+#define GR_SHUTI_ACL_MSG "ignoring shutdown for disabled RBAC system for "
83409+#define GR_SEGVMODS_ACL_MSG "segvmod auth success for "
83410+#define GR_SEGVMODF_ACL_MSG "segvmod auth failure for "
83411+#define GR_SEGVMODI_ACL_MSG "ignoring segvmod for disabled RBAC system for "
83412+#define GR_ENABLE_ACL_MSG "%s RBAC system loaded by "
83413+#define GR_ENABLEF_ACL_MSG "unable to load %s for "
83414+#define GR_RELOADI_ACL_MSG "ignoring reload request for disabled RBAC system"
83415+#define GR_RELOAD_ACL_MSG "%s RBAC system reloaded by "
83416+#define GR_RELOADF_ACL_MSG "failed reload of %s for "
83417+#define GR_SPROLEI_ACL_MSG "ignoring change to special role for disabled RBAC system for "
83418+#define GR_SPROLES_ACL_MSG "successful change to special role %s (id %d) by "
83419+#define GR_SPROLEL_ACL_MSG "special role %s (id %d) exited by "
83420+#define GR_SPROLEF_ACL_MSG "special role %s failure for "
83421+#define GR_UNSPROLEI_ACL_MSG "ignoring unauth of special role for disabled RBAC system for "
83422+#define GR_UNSPROLES_ACL_MSG "successful unauth of special role %s (id %d) by "
83423+#define GR_INVMODE_ACL_MSG "invalid mode %d by "
83424+#define GR_PRIORITY_CHROOT_MSG "denied priority change of process (%.16s:%d) by "
83425+#define GR_FAILFORK_MSG "failed fork with errno %s by "
83426+#define GR_NICE_CHROOT_MSG "denied priority change by "
83427+#define GR_UNISIGLOG_MSG "%.32s occurred at %p in "
83428+#define GR_DUALSIGLOG_MSG "signal %d sent to " DEFAULTSECMSG " by "
83429+#define GR_SIG_ACL_MSG "denied send of signal %d to protected task " DEFAULTSECMSG " by "
83430+#define GR_SYSCTL_MSG "denied modification of grsecurity sysctl value : %.32s by "
83431+#define GR_SYSCTL_ACL_MSG "%s sysctl of %.950s for%s%s by "
83432+#define GR_TIME_MSG "time set by "
83433+#define GR_DEFACL_MSG "fatal: unable to find subject for (%.16s:%d), loaded by "
83434+#define GR_MMAP_ACL_MSG "%s executable mmap of %.950s by "
83435+#define GR_MPROTECT_ACL_MSG "%s executable mprotect of %.950s by "
83436+#define GR_SOCK_MSG "denied socket(%.16s,%.16s,%.16s) by "
83437+#define GR_SOCK_NOINET_MSG "denied socket(%.16s,%.16s,%d) by "
83438+#define GR_BIND_MSG "denied bind() by "
83439+#define GR_CONNECT_MSG "denied connect() by "
83440+#define GR_BIND_ACL_MSG "denied bind() to %pI4 port %u sock type %.16s protocol %.16s by "
83441+#define GR_CONNECT_ACL_MSG "denied connect() to %pI4 port %u sock type %.16s protocol %.16s by "
83442+#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"
83443+#define GR_EXEC_CHROOT_MSG "exec of %.980s within chroot by process "
83444+#define GR_CAP_ACL_MSG "use of %s denied for "
83445+#define GR_CAP_CHROOT_MSG "use of %s in chroot denied for "
83446+#define GR_CAP_ACL_MSG2 "use of %s permitted for "
83447+#define GR_USRCHANGE_ACL_MSG "change to uid %u denied for "
83448+#define GR_GRPCHANGE_ACL_MSG "change to gid %u denied for "
83449+#define GR_REMOUNT_AUDIT_MSG "remount of %.256s by "
83450+#define GR_UNMOUNT_AUDIT_MSG "unmount of %.256s by "
83451+#define GR_MOUNT_AUDIT_MSG "mount of %.256s to %.256s by "
83452+#define GR_CHDIR_AUDIT_MSG "chdir to %.980s by "
83453+#define GR_EXEC_AUDIT_MSG "exec of %.930s (%.128s) by "
83454+#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for "
83455+#define GR_RWXMMAP_MSG "denied RWX mmap of %.950s by "
83456+#define GR_RWXMPROTECT_MSG "denied RWX mprotect of %.950s by "
83457+#define GR_TEXTREL_AUDIT_MSG "denied text relocation in %.950s, VMA:0x%08lx 0x%08lx by "
83458+#define GR_PTGNUSTACK_MSG "denied marking stack executable as requested by PT_GNU_STACK marking in %.950s by "
83459+#define GR_VM86_MSG "denied use of vm86 by "
83460+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
83461+#define GR_PTRACE_READEXEC_MSG "denied ptrace of unreadable binary %.950s by "
83462+#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
83463+#define GR_BADPROCPID_MSG "denied read of sensitive /proc/pid/%s entry via fd passed across exec by "
83464+#define GR_SYMLINKOWNER_MSG "denied following symlink %.950s since symlink owner %u does not match target owner %u, by "
83465+#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 "
83466+#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 "
83467+#define GR_IPC_DENIED_MSG "denied %s of overly-permissive IPC object with creator uid %u by "
83468+#define GR_MSRWRITE_MSG "denied write to CPU MSR by "
83469diff --git a/include/linux/grsecurity.h b/include/linux/grsecurity.h
83470new file mode 100644
83471index 0000000..63c1850
83472--- /dev/null
83473+++ b/include/linux/grsecurity.h
83474@@ -0,0 +1,250 @@
83475+#ifndef GR_SECURITY_H
83476+#define GR_SECURITY_H
83477+#include <linux/fs.h>
83478+#include <linux/fs_struct.h>
83479+#include <linux/binfmts.h>
83480+#include <linux/gracl.h>
83481+
83482+/* notify of brain-dead configs */
83483+#if defined(CONFIG_GRKERNSEC_PROC_USER) && defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
83484+#error "CONFIG_GRKERNSEC_PROC_USER and CONFIG_GRKERNSEC_PROC_USERGROUP cannot both be enabled."
83485+#endif
83486+#if defined(CONFIG_GRKERNSEC_PROC) && !defined(CONFIG_GRKERNSEC_PROC_USER) && !defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
83487+#error "CONFIG_GRKERNSEC_PROC enabled, but neither CONFIG_GRKERNSEC_PROC_USER nor CONFIG_GRKERNSEC_PROC_USERGROUP enabled"
83488+#endif
83489+#if defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_PAGEEXEC) && !defined(CONFIG_PAX_SEGMEXEC) && !defined(CONFIG_PAX_KERNEXEC)
83490+#error "CONFIG_PAX_NOEXEC enabled, but PAGEEXEC, SEGMEXEC, and KERNEXEC are disabled."
83491+#endif
83492+#if defined(CONFIG_PAX_ASLR) && !defined(CONFIG_PAX_RANDKSTACK) && !defined(CONFIG_PAX_RANDUSTACK) && !defined(CONFIG_PAX_RANDMMAP)
83493+#error "CONFIG_PAX_ASLR enabled, but RANDKSTACK, RANDUSTACK, and RANDMMAP are disabled."
83494+#endif
83495+#if defined(CONFIG_PAX) && !defined(CONFIG_PAX_NOEXEC) && !defined(CONFIG_PAX_ASLR)
83496+#error "CONFIG_PAX enabled, but no PaX options are enabled."
83497+#endif
83498+
83499+int gr_handle_new_usb(void);
83500+
83501+void gr_handle_brute_attach(int dumpable);
83502+void gr_handle_brute_check(void);
83503+void gr_handle_kernel_exploit(void);
83504+
83505+char gr_roletype_to_char(void);
83506+
83507+int gr_proc_is_restricted(void);
83508+
83509+int gr_acl_enable_at_secure(void);
83510+
83511+int gr_check_user_change(kuid_t real, kuid_t effective, kuid_t fs);
83512+int gr_check_group_change(kgid_t real, kgid_t effective, kgid_t fs);
83513+
83514+int gr_learn_cap(const struct task_struct *task, const struct cred *cred, const int cap);
83515+
83516+void gr_del_task_from_ip_table(struct task_struct *p);
83517+
83518+int gr_pid_is_chrooted(struct task_struct *p);
83519+int gr_handle_chroot_fowner(struct pid *pid, enum pid_type type);
83520+int gr_handle_chroot_nice(void);
83521+int gr_handle_chroot_sysctl(const int op);
83522+int gr_handle_chroot_setpriority(struct task_struct *p,
83523+ const int niceval);
83524+int gr_chroot_fchdir(struct dentry *u_dentry, struct vfsmount *u_mnt);
83525+int gr_chroot_fhandle(void);
83526+int gr_handle_chroot_chroot(const struct dentry *dentry,
83527+ const struct vfsmount *mnt);
83528+void gr_handle_chroot_chdir(const struct path *path);
83529+int gr_handle_chroot_chmod(const struct dentry *dentry,
83530+ const struct vfsmount *mnt, const int mode);
83531+int gr_handle_chroot_mknod(const struct dentry *dentry,
83532+ const struct vfsmount *mnt, const int mode);
83533+int gr_handle_chroot_mount(const struct dentry *dentry,
83534+ const struct vfsmount *mnt,
83535+ const char *dev_name);
83536+int gr_handle_chroot_pivot(void);
83537+int gr_handle_chroot_unix(const pid_t pid);
83538+
83539+int gr_handle_rawio(const struct inode *inode);
83540+
83541+void gr_handle_ioperm(void);
83542+void gr_handle_iopl(void);
83543+void gr_handle_msr_write(void);
83544+
83545+umode_t gr_acl_umask(void);
83546+
83547+int gr_tpe_allow(const struct file *file);
83548+
83549+void gr_set_chroot_entries(struct task_struct *task, const struct path *path);
83550+void gr_clear_chroot_entries(struct task_struct *task);
83551+
83552+void gr_log_forkfail(const int retval);
83553+void gr_log_timechange(void);
83554+void gr_log_signal(const int sig, const void *addr, const struct task_struct *t);
83555+void gr_log_chdir(const struct dentry *dentry,
83556+ const struct vfsmount *mnt);
83557+void gr_log_chroot_exec(const struct dentry *dentry,
83558+ const struct vfsmount *mnt);
83559+void gr_log_remount(const char *devname, const int retval);
83560+void gr_log_unmount(const char *devname, const int retval);
83561+void gr_log_mount(const char *from, struct path *to, const int retval);
83562+void gr_log_textrel(struct vm_area_struct *vma);
83563+void gr_log_ptgnustack(struct file *file);
83564+void gr_log_rwxmmap(struct file *file);
83565+void gr_log_rwxmprotect(struct vm_area_struct *vma);
83566+
83567+int gr_handle_follow_link(const struct inode *parent,
83568+ const struct inode *inode,
83569+ const struct dentry *dentry,
83570+ const struct vfsmount *mnt);
83571+int gr_handle_fifo(const struct dentry *dentry,
83572+ const struct vfsmount *mnt,
83573+ const struct dentry *dir, const int flag,
83574+ const int acc_mode);
83575+int gr_handle_hardlink(const struct dentry *dentry,
83576+ const struct vfsmount *mnt,
83577+ struct inode *inode,
83578+ const int mode, const struct filename *to);
83579+
83580+int gr_is_capable(const int cap);
83581+int gr_is_capable_nolog(const int cap);
83582+int gr_task_is_capable(const struct task_struct *task, const struct cred *cred, const int cap);
83583+int gr_task_is_capable_nolog(const struct task_struct *task, const int cap);
83584+
83585+void gr_copy_label(struct task_struct *tsk);
83586+void gr_handle_crash(struct task_struct *task, const int sig);
83587+int gr_handle_signal(const struct task_struct *p, const int sig);
83588+int gr_check_crash_uid(const kuid_t uid);
83589+int gr_check_protected_task(const struct task_struct *task);
83590+int gr_check_protected_task_fowner(struct pid *pid, enum pid_type type);
83591+int gr_acl_handle_mmap(const struct file *file,
83592+ const unsigned long prot);
83593+int gr_acl_handle_mprotect(const struct file *file,
83594+ const unsigned long prot);
83595+int gr_check_hidden_task(const struct task_struct *tsk);
83596+__u32 gr_acl_handle_truncate(const struct dentry *dentry,
83597+ const struct vfsmount *mnt);
83598+__u32 gr_acl_handle_utime(const struct dentry *dentry,
83599+ const struct vfsmount *mnt);
83600+__u32 gr_acl_handle_access(const struct dentry *dentry,
83601+ const struct vfsmount *mnt, const int fmode);
83602+__u32 gr_acl_handle_chmod(const struct dentry *dentry,
83603+ const struct vfsmount *mnt, umode_t *mode);
83604+__u32 gr_acl_handle_chown(const struct dentry *dentry,
83605+ const struct vfsmount *mnt);
83606+__u32 gr_acl_handle_setxattr(const struct dentry *dentry,
83607+ const struct vfsmount *mnt);
83608+__u32 gr_acl_handle_removexattr(const struct dentry *dentry,
83609+ const struct vfsmount *mnt);
83610+int gr_handle_ptrace(struct task_struct *task, const long request);
83611+int gr_handle_proc_ptrace(struct task_struct *task);
83612+__u32 gr_acl_handle_execve(const struct dentry *dentry,
83613+ const struct vfsmount *mnt);
83614+int gr_check_crash_exec(const struct file *filp);
83615+int gr_acl_is_enabled(void);
83616+void gr_set_role_label(struct task_struct *task, const kuid_t uid,
83617+ const kgid_t gid);
83618+int gr_set_proc_label(const struct dentry *dentry,
83619+ const struct vfsmount *mnt,
83620+ const int unsafe_flags);
83621+__u32 gr_acl_handle_hidden_file(const struct dentry *dentry,
83622+ const struct vfsmount *mnt);
83623+__u32 gr_acl_handle_open(const struct dentry *dentry,
83624+ const struct vfsmount *mnt, int acc_mode);
83625+__u32 gr_acl_handle_creat(const struct dentry *dentry,
83626+ const struct dentry *p_dentry,
83627+ const struct vfsmount *p_mnt,
83628+ int open_flags, int acc_mode, const int imode);
83629+void gr_handle_create(const struct dentry *dentry,
83630+ const struct vfsmount *mnt);
83631+void gr_handle_proc_create(const struct dentry *dentry,
83632+ const struct inode *inode);
83633+__u32 gr_acl_handle_mknod(const struct dentry *new_dentry,
83634+ const struct dentry *parent_dentry,
83635+ const struct vfsmount *parent_mnt,
83636+ const int mode);
83637+__u32 gr_acl_handle_mkdir(const struct dentry *new_dentry,
83638+ const struct dentry *parent_dentry,
83639+ const struct vfsmount *parent_mnt);
83640+__u32 gr_acl_handle_rmdir(const struct dentry *dentry,
83641+ const struct vfsmount *mnt);
83642+void gr_handle_delete(const u64 ino, const dev_t dev);
83643+__u32 gr_acl_handle_unlink(const struct dentry *dentry,
83644+ const struct vfsmount *mnt);
83645+__u32 gr_acl_handle_symlink(const struct dentry *new_dentry,
83646+ const struct dentry *parent_dentry,
83647+ const struct vfsmount *parent_mnt,
83648+ const struct filename *from);
83649+__u32 gr_acl_handle_link(const struct dentry *new_dentry,
83650+ const struct dentry *parent_dentry,
83651+ const struct vfsmount *parent_mnt,
83652+ const struct dentry *old_dentry,
83653+ const struct vfsmount *old_mnt, const struct filename *to);
83654+int gr_handle_symlink_owner(const struct path *link, const struct inode *target);
83655+int gr_acl_handle_rename(struct dentry *new_dentry,
83656+ struct dentry *parent_dentry,
83657+ const struct vfsmount *parent_mnt,
83658+ struct dentry *old_dentry,
83659+ struct inode *old_parent_inode,
83660+ struct vfsmount *old_mnt, const struct filename *newname, unsigned int flags);
83661+void gr_handle_rename(struct inode *old_dir, struct inode *new_dir,
83662+ struct dentry *old_dentry,
83663+ struct dentry *new_dentry,
83664+ struct vfsmount *mnt, const __u8 replace, unsigned int flags);
83665+__u32 gr_check_link(const struct dentry *new_dentry,
83666+ const struct dentry *parent_dentry,
83667+ const struct vfsmount *parent_mnt,
83668+ const struct dentry *old_dentry,
83669+ const struct vfsmount *old_mnt);
83670+int gr_acl_handle_filldir(const struct file *file, const char *name,
83671+ const unsigned int namelen, const u64 ino);
83672+
83673+__u32 gr_acl_handle_unix(const struct dentry *dentry,
83674+ const struct vfsmount *mnt);
83675+void gr_acl_handle_exit(void);
83676+void gr_acl_handle_psacct(struct task_struct *task, const long code);
83677+int gr_acl_handle_procpidmem(const struct task_struct *task);
83678+int gr_handle_rofs_mount(struct dentry *dentry, struct vfsmount *mnt, int mnt_flags);
83679+int gr_handle_rofs_blockwrite(struct dentry *dentry, struct vfsmount *mnt, int acc_mode);
83680+void gr_audit_ptrace(struct task_struct *task);
83681+dev_t gr_get_dev_from_dentry(struct dentry *dentry);
83682+u64 gr_get_ino_from_dentry(struct dentry *dentry);
83683+void gr_put_exec_file(struct task_struct *task);
83684+
83685+int gr_ptrace_readexec(struct file *file, int unsafe_flags);
83686+
83687+void gr_inc_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
83688+void gr_dec_chroot_refcnts(struct dentry *dentry, struct vfsmount *mnt);
83689+int gr_bad_chroot_rename(struct dentry *olddentry, struct vfsmount *oldmnt,
83690+ struct dentry *newdentry, struct vfsmount *newmnt);
83691+
83692+#ifdef CONFIG_GRKERNSEC_RESLOG
83693+extern void gr_log_resource(const struct task_struct *task, const int res,
83694+ const unsigned long wanted, const int gt);
83695+#else
83696+static inline void gr_log_resource(const struct task_struct *task, const int res,
83697+ const unsigned long wanted, const int gt)
83698+{
83699+}
83700+#endif
83701+
83702+#ifdef CONFIG_GRKERNSEC
83703+void task_grsec_rbac(struct seq_file *m, struct task_struct *p);
83704+void gr_handle_vm86(void);
83705+void gr_handle_mem_readwrite(u64 from, u64 to);
83706+
83707+void gr_log_badprocpid(const char *entry);
83708+
83709+extern int grsec_enable_dmesg;
83710+extern int grsec_disable_privio;
83711+
83712+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
83713+extern kgid_t grsec_proc_gid;
83714+#endif
83715+
83716+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
83717+extern int grsec_enable_chroot_findtask;
83718+#endif
83719+#ifdef CONFIG_GRKERNSEC_SETXID
83720+extern int grsec_enable_setxid;
83721+#endif
83722+#endif
83723+
83724+#endif
83725diff --git a/include/linux/grsock.h b/include/linux/grsock.h
83726new file mode 100644
83727index 0000000..e7ffaaf
83728--- /dev/null
83729+++ b/include/linux/grsock.h
83730@@ -0,0 +1,19 @@
83731+#ifndef __GRSOCK_H
83732+#define __GRSOCK_H
83733+
83734+extern void gr_attach_curr_ip(const struct sock *sk);
83735+extern int gr_handle_sock_all(const int family, const int type,
83736+ const int protocol);
83737+extern int gr_handle_sock_server(const struct sockaddr *sck);
83738+extern int gr_handle_sock_server_other(const struct sock *sck);
83739+extern int gr_handle_sock_client(const struct sockaddr *sck);
83740+extern int gr_search_connect(struct socket * sock,
83741+ struct sockaddr_in * addr);
83742+extern int gr_search_bind(struct socket * sock,
83743+ struct sockaddr_in * addr);
83744+extern int gr_search_listen(struct socket * sock);
83745+extern int gr_search_accept(struct socket * sock);
83746+extern int gr_search_socket(const int domain, const int type,
83747+ const int protocol);
83748+
83749+#endif
83750diff --git a/include/linux/highmem.h b/include/linux/highmem.h
83751index 9286a46..373f27f 100644
83752--- a/include/linux/highmem.h
83753+++ b/include/linux/highmem.h
83754@@ -189,6 +189,18 @@ static inline void clear_highpage(struct page *page)
83755 kunmap_atomic(kaddr);
83756 }
83757
83758+static inline void sanitize_highpage(struct page *page)
83759+{
83760+ void *kaddr;
83761+ unsigned long flags;
83762+
83763+ local_irq_save(flags);
83764+ kaddr = kmap_atomic(page);
83765+ clear_page(kaddr);
83766+ kunmap_atomic(kaddr);
83767+ local_irq_restore(flags);
83768+}
83769+
83770 static inline void zero_user_segments(struct page *page,
83771 unsigned start1, unsigned end1,
83772 unsigned start2, unsigned end2)
83773diff --git a/include/linux/hwmon-sysfs.h b/include/linux/hwmon-sysfs.h
83774index 1c7b89a..7dda400 100644
83775--- a/include/linux/hwmon-sysfs.h
83776+++ b/include/linux/hwmon-sysfs.h
83777@@ -25,7 +25,8 @@
83778 struct sensor_device_attribute{
83779 struct device_attribute dev_attr;
83780 int index;
83781-};
83782+} __do_const;
83783+typedef struct sensor_device_attribute __no_const sensor_device_attribute_no_const;
83784 #define to_sensor_dev_attr(_dev_attr) \
83785 container_of(_dev_attr, struct sensor_device_attribute, dev_attr)
83786
83787@@ -41,7 +42,8 @@ struct sensor_device_attribute_2 {
83788 struct device_attribute dev_attr;
83789 u8 index;
83790 u8 nr;
83791-};
83792+} __do_const;
83793+typedef struct sensor_device_attribute_2 __no_const sensor_device_attribute_2_no_const;
83794 #define to_sensor_dev_attr_2(_dev_attr) \
83795 container_of(_dev_attr, struct sensor_device_attribute_2, dev_attr)
83796
83797diff --git a/include/linux/i2c.h b/include/linux/i2c.h
83798index f17da50..2f8b203 100644
83799--- a/include/linux/i2c.h
83800+++ b/include/linux/i2c.h
83801@@ -409,6 +409,7 @@ struct i2c_algorithm {
83802 int (*unreg_slave)(struct i2c_client *client);
83803 #endif
83804 };
83805+typedef struct i2c_algorithm __no_const i2c_algorithm_no_const;
83806
83807 /**
83808 * struct i2c_bus_recovery_info - I2C bus recovery information
83809diff --git a/include/linux/if_pppox.h b/include/linux/if_pppox.h
83810index aff7ad8..3942bbd 100644
83811--- a/include/linux/if_pppox.h
83812+++ b/include/linux/if_pppox.h
83813@@ -76,7 +76,7 @@ struct pppox_proto {
83814 int (*ioctl)(struct socket *sock, unsigned int cmd,
83815 unsigned long arg);
83816 struct module *owner;
83817-};
83818+} __do_const;
83819
83820 extern int register_pppox_proto(int proto_num, const struct pppox_proto *pp);
83821 extern void unregister_pppox_proto(int proto_num);
83822diff --git a/include/linux/init.h b/include/linux/init.h
83823index 2df8e8d..3e1280d 100644
83824--- a/include/linux/init.h
83825+++ b/include/linux/init.h
83826@@ -37,9 +37,17 @@
83827 * section.
83828 */
83829
83830+#define add_init_latent_entropy __latent_entropy
83831+
83832+#ifdef CONFIG_MEMORY_HOTPLUG
83833+#define add_meminit_latent_entropy
83834+#else
83835+#define add_meminit_latent_entropy __latent_entropy
83836+#endif
83837+
83838 /* These are for everybody (although not all archs will actually
83839 discard it in modules) */
83840-#define __init __section(.init.text) __cold notrace
83841+#define __init __section(.init.text) __cold notrace add_init_latent_entropy
83842 #define __initdata __section(.init.data)
83843 #define __initconst __constsection(.init.rodata)
83844 #define __exitdata __section(.exit.data)
83845@@ -100,7 +108,7 @@
83846 #define __cpuexitconst
83847
83848 /* Used for MEMORY_HOTPLUG */
83849-#define __meminit __section(.meminit.text) __cold notrace
83850+#define __meminit __section(.meminit.text) __cold notrace add_meminit_latent_entropy
83851 #define __meminitdata __section(.meminit.data)
83852 #define __meminitconst __constsection(.meminit.rodata)
83853 #define __memexit __section(.memexit.text) __exitused __cold notrace
83854diff --git a/include/linux/init_task.h b/include/linux/init_task.h
83855index 696d223..6d6b39f 100644
83856--- a/include/linux/init_task.h
83857+++ b/include/linux/init_task.h
83858@@ -158,6 +158,12 @@ extern struct task_group root_task_group;
83859
83860 #define INIT_TASK_COMM "swapper"
83861
83862+#ifdef CONFIG_X86
83863+#define INIT_TASK_THREAD_INFO .tinfo = INIT_THREAD_INFO,
83864+#else
83865+#define INIT_TASK_THREAD_INFO
83866+#endif
83867+
83868 #ifdef CONFIG_RT_MUTEXES
83869 # define INIT_RT_MUTEXES(tsk) \
83870 .pi_waiters = RB_ROOT, \
83871@@ -224,6 +230,7 @@ extern struct task_group root_task_group;
83872 RCU_POINTER_INITIALIZER(cred, &init_cred), \
83873 .comm = INIT_TASK_COMM, \
83874 .thread = INIT_THREAD, \
83875+ INIT_TASK_THREAD_INFO \
83876 .fs = &init_fs, \
83877 .files = &init_files, \
83878 .signal = &init_signals, \
83879diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
83880index 2e88580..f6a99a0 100644
83881--- a/include/linux/interrupt.h
83882+++ b/include/linux/interrupt.h
83883@@ -420,8 +420,8 @@ extern const char * const softirq_to_name[NR_SOFTIRQS];
83884
83885 struct softirq_action
83886 {
83887- void (*action)(struct softirq_action *);
83888-};
83889+ void (*action)(void);
83890+} __no_const;
83891
83892 asmlinkage void do_softirq(void);
83893 asmlinkage void __do_softirq(void);
83894@@ -435,7 +435,7 @@ static inline void do_softirq_own_stack(void)
83895 }
83896 #endif
83897
83898-extern void open_softirq(int nr, void (*action)(struct softirq_action *));
83899+extern void open_softirq(int nr, void (*action)(void));
83900 extern void softirq_init(void);
83901 extern void __raise_softirq_irqoff(unsigned int nr);
83902
83903diff --git a/include/linux/iommu.h b/include/linux/iommu.h
83904index 38daa45..4de4317 100644
83905--- a/include/linux/iommu.h
83906+++ b/include/linux/iommu.h
83907@@ -147,7 +147,7 @@ struct iommu_ops {
83908
83909 unsigned long pgsize_bitmap;
83910 void *priv;
83911-};
83912+} __do_const;
83913
83914 #define IOMMU_GROUP_NOTIFY_ADD_DEVICE 1 /* Device added */
83915 #define IOMMU_GROUP_NOTIFY_DEL_DEVICE 2 /* Pre Device removed */
83916diff --git a/include/linux/ioport.h b/include/linux/ioport.h
83917index 2c525022..345b106 100644
83918--- a/include/linux/ioport.h
83919+++ b/include/linux/ioport.h
83920@@ -161,7 +161,7 @@ struct resource *lookup_resource(struct resource *root, resource_size_t start);
83921 int adjust_resource(struct resource *res, resource_size_t start,
83922 resource_size_t size);
83923 resource_size_t resource_alignment(struct resource *res);
83924-static inline resource_size_t resource_size(const struct resource *res)
83925+static inline resource_size_t __intentional_overflow(-1) resource_size(const struct resource *res)
83926 {
83927 return res->end - res->start + 1;
83928 }
83929diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
83930index 1eee6bc..9cf4912 100644
83931--- a/include/linux/ipc_namespace.h
83932+++ b/include/linux/ipc_namespace.h
83933@@ -60,7 +60,7 @@ struct ipc_namespace {
83934 struct user_namespace *user_ns;
83935
83936 struct ns_common ns;
83937-};
83938+} __randomize_layout;
83939
83940 extern struct ipc_namespace init_ipc_ns;
83941 extern atomic_t nr_ipc_ns;
83942diff --git a/include/linux/irq.h b/include/linux/irq.h
83943index d09ec7a..f373eb5 100644
83944--- a/include/linux/irq.h
83945+++ b/include/linux/irq.h
83946@@ -364,7 +364,8 @@ struct irq_chip {
83947 void (*irq_write_msi_msg)(struct irq_data *data, struct msi_msg *msg);
83948
83949 unsigned long flags;
83950-};
83951+} __do_const;
83952+typedef struct irq_chip __no_const irq_chip_no_const;
83953
83954 /*
83955 * irq_chip specific flags
83956diff --git a/include/linux/irqchip/arm-gic.h b/include/linux/irqchip/arm-gic.h
83957index 71d706d..817cdec 100644
83958--- a/include/linux/irqchip/arm-gic.h
83959+++ b/include/linux/irqchip/arm-gic.h
83960@@ -95,7 +95,7 @@
83961
83962 struct device_node;
83963
83964-extern struct irq_chip gic_arch_extn;
83965+extern irq_chip_no_const gic_arch_extn;
83966
83967 void gic_init_bases(unsigned int, int, void __iomem *, void __iomem *,
83968 u32 offset, struct device_node *);
83969diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
83970index dd1109f..4f4fdda 100644
83971--- a/include/linux/irqdesc.h
83972+++ b/include/linux/irqdesc.h
83973@@ -61,7 +61,7 @@ struct irq_desc {
83974 unsigned int irq_count; /* For detecting broken IRQs */
83975 unsigned long last_unhandled; /* Aging timer for unhandled count */
83976 unsigned int irqs_unhandled;
83977- atomic_t threads_handled;
83978+ atomic_unchecked_t threads_handled;
83979 int threads_handled_last;
83980 raw_spinlock_t lock;
83981 struct cpumask *percpu_enabled;
83982diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h
83983index c367cbd..c9b79e6 100644
83984--- a/include/linux/jiffies.h
83985+++ b/include/linux/jiffies.h
83986@@ -280,20 +280,20 @@ extern unsigned long preset_lpj;
83987 /*
83988 * Convert various time units to each other:
83989 */
83990-extern unsigned int jiffies_to_msecs(const unsigned long j);
83991-extern unsigned int jiffies_to_usecs(const unsigned long j);
83992+extern unsigned int jiffies_to_msecs(const unsigned long j) __intentional_overflow(-1);
83993+extern unsigned int jiffies_to_usecs(const unsigned long j) __intentional_overflow(-1);
83994
83995-static inline u64 jiffies_to_nsecs(const unsigned long j)
83996+static inline u64 __intentional_overflow(-1) jiffies_to_nsecs(const unsigned long j)
83997 {
83998 return (u64)jiffies_to_usecs(j) * NSEC_PER_USEC;
83999 }
84000
84001-extern unsigned long msecs_to_jiffies(const unsigned int m);
84002-extern unsigned long usecs_to_jiffies(const unsigned int u);
84003+extern unsigned long msecs_to_jiffies(const unsigned int m) __intentional_overflow(-1);
84004+extern unsigned long usecs_to_jiffies(const unsigned int u) __intentional_overflow(-1);
84005 extern unsigned long timespec_to_jiffies(const struct timespec *value);
84006 extern void jiffies_to_timespec(const unsigned long jiffies,
84007- struct timespec *value);
84008-extern unsigned long timeval_to_jiffies(const struct timeval *value);
84009+ struct timespec *value) __intentional_overflow(-1);
84010+extern unsigned long timeval_to_jiffies(const struct timeval *value) __intentional_overflow(-1);
84011 extern void jiffies_to_timeval(const unsigned long jiffies,
84012 struct timeval *value);
84013
84014diff --git a/include/linux/kallsyms.h b/include/linux/kallsyms.h
84015index 6883e19..e854fcb 100644
84016--- a/include/linux/kallsyms.h
84017+++ b/include/linux/kallsyms.h
84018@@ -15,7 +15,8 @@
84019
84020 struct module;
84021
84022-#ifdef CONFIG_KALLSYMS
84023+#if !defined(__INCLUDED_BY_HIDESYM) || !defined(CONFIG_KALLSYMS)
84024+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
84025 /* Lookup the address for a symbol. Returns 0 if not found. */
84026 unsigned long kallsyms_lookup_name(const char *name);
84027
84028@@ -106,6 +107,21 @@ static inline int lookup_symbol_attrs(unsigned long addr, unsigned long *size, u
84029 /* Stupid that this does nothing, but I didn't create this mess. */
84030 #define __print_symbol(fmt, addr)
84031 #endif /*CONFIG_KALLSYMS*/
84032+#else /* when included by kallsyms.c, vsnprintf.c, kprobes.c, or
84033+ arch/x86/kernel/dumpstack.c, with HIDESYM enabled */
84034+extern unsigned long kallsyms_lookup_name(const char *name);
84035+extern void __print_symbol(const char *fmt, unsigned long address);
84036+extern int sprint_backtrace(char *buffer, unsigned long address);
84037+extern int sprint_symbol(char *buffer, unsigned long address);
84038+extern int sprint_symbol_no_offset(char *buffer, unsigned long address);
84039+const char *kallsyms_lookup(unsigned long addr,
84040+ unsigned long *symbolsize,
84041+ unsigned long *offset,
84042+ char **modname, char *namebuf);
84043+extern int kallsyms_lookup_size_offset(unsigned long addr,
84044+ unsigned long *symbolsize,
84045+ unsigned long *offset);
84046+#endif
84047
84048 /* This macro allows us to keep printk typechecking */
84049 static __printf(1, 2)
84050diff --git a/include/linux/kernel.h b/include/linux/kernel.h
84051index d6d630d..feea1f5 100644
84052--- a/include/linux/kernel.h
84053+++ b/include/linux/kernel.h
84054@@ -378,7 +378,7 @@ static inline int __must_check kstrtos32_from_user(const char __user *s, size_t
84055 /* Obsolete, do not use. Use kstrto<foo> instead */
84056
84057 extern unsigned long simple_strtoul(const char *,char **,unsigned int);
84058-extern long simple_strtol(const char *,char **,unsigned int);
84059+extern long simple_strtol(const char *,char **,unsigned int) __intentional_overflow(-1);
84060 extern unsigned long long simple_strtoull(const char *,char **,unsigned int);
84061 extern long long simple_strtoll(const char *,char **,unsigned int);
84062
84063diff --git a/include/linux/key-type.h b/include/linux/key-type.h
84064index ff9f1d3..6712be5 100644
84065--- a/include/linux/key-type.h
84066+++ b/include/linux/key-type.h
84067@@ -152,7 +152,7 @@ struct key_type {
84068 /* internal fields */
84069 struct list_head link; /* link in types list */
84070 struct lock_class_key lock_class; /* key->sem lock class */
84071-};
84072+} __do_const;
84073
84074 extern struct key_type key_type_keyring;
84075
84076diff --git a/include/linux/kgdb.h b/include/linux/kgdb.h
84077index e465bb1..19f605fd 100644
84078--- a/include/linux/kgdb.h
84079+++ b/include/linux/kgdb.h
84080@@ -52,7 +52,7 @@ extern int kgdb_connected;
84081 extern int kgdb_io_module_registered;
84082
84083 extern atomic_t kgdb_setting_breakpoint;
84084-extern atomic_t kgdb_cpu_doing_single_step;
84085+extern atomic_unchecked_t kgdb_cpu_doing_single_step;
84086
84087 extern struct task_struct *kgdb_usethread;
84088 extern struct task_struct *kgdb_contthread;
84089@@ -254,7 +254,7 @@ struct kgdb_arch {
84090 void (*correct_hw_break)(void);
84091
84092 void (*enable_nmi)(bool on);
84093-};
84094+} __do_const;
84095
84096 /**
84097 * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
84098@@ -279,7 +279,7 @@ struct kgdb_io {
84099 void (*pre_exception) (void);
84100 void (*post_exception) (void);
84101 int is_console;
84102-};
84103+} __do_const;
84104
84105 extern struct kgdb_arch arch_kgdb_ops;
84106
84107diff --git a/include/linux/kmemleak.h b/include/linux/kmemleak.h
84108index e705467..a92471d 100644
84109--- a/include/linux/kmemleak.h
84110+++ b/include/linux/kmemleak.h
84111@@ -27,7 +27,7 @@
84112
84113 extern void kmemleak_init(void) __ref;
84114 extern void kmemleak_alloc(const void *ptr, size_t size, int min_count,
84115- gfp_t gfp) __ref;
84116+ gfp_t gfp) __ref __size_overflow(2);
84117 extern void kmemleak_alloc_percpu(const void __percpu *ptr, size_t size) __ref;
84118 extern void kmemleak_free(const void *ptr) __ref;
84119 extern void kmemleak_free_part(const void *ptr, size_t size) __ref;
84120@@ -62,7 +62,7 @@ static inline void kmemleak_erase(void **ptr)
84121 static inline void kmemleak_init(void)
84122 {
84123 }
84124-static inline void kmemleak_alloc(const void *ptr, size_t size, int min_count,
84125+static inline void __size_overflow(2) kmemleak_alloc(const void *ptr, size_t size, int min_count,
84126 gfp_t gfp)
84127 {
84128 }
84129diff --git a/include/linux/kmod.h b/include/linux/kmod.h
84130index 0555cc6..40116ce 100644
84131--- a/include/linux/kmod.h
84132+++ b/include/linux/kmod.h
84133@@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysctl */
84134 * usually useless though. */
84135 extern __printf(2, 3)
84136 int __request_module(bool wait, const char *name, ...);
84137+extern __printf(3, 4)
84138+int ___request_module(bool wait, char *param_name, const char *name, ...);
84139 #define request_module(mod...) __request_module(true, mod)
84140 #define request_module_nowait(mod...) __request_module(false, mod)
84141 #define try_then_request_module(x, mod...) \
84142@@ -57,6 +59,9 @@ struct subprocess_info {
84143 struct work_struct work;
84144 struct completion *complete;
84145 char *path;
84146+#ifdef CONFIG_GRKERNSEC
84147+ char *origpath;
84148+#endif
84149 char **argv;
84150 char **envp;
84151 int wait;
84152diff --git a/include/linux/kobject.h b/include/linux/kobject.h
84153index 2d61b90..a1d0a13 100644
84154--- a/include/linux/kobject.h
84155+++ b/include/linux/kobject.h
84156@@ -118,7 +118,7 @@ struct kobj_type {
84157 struct attribute **default_attrs;
84158 const struct kobj_ns_type_operations *(*child_ns_type)(struct kobject *kobj);
84159 const void *(*namespace)(struct kobject *kobj);
84160-};
84161+} __do_const;
84162
84163 struct kobj_uevent_env {
84164 char *argv[3];
84165@@ -142,6 +142,7 @@ struct kobj_attribute {
84166 ssize_t (*store)(struct kobject *kobj, struct kobj_attribute *attr,
84167 const char *buf, size_t count);
84168 };
84169+typedef struct kobj_attribute __no_const kobj_attribute_no_const;
84170
84171 extern const struct sysfs_ops kobj_sysfs_ops;
84172
84173@@ -169,7 +170,7 @@ struct kset {
84174 spinlock_t list_lock;
84175 struct kobject kobj;
84176 const struct kset_uevent_ops *uevent_ops;
84177-};
84178+} __randomize_layout;
84179
84180 extern void kset_init(struct kset *kset);
84181 extern int __must_check kset_register(struct kset *kset);
84182diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
84183index df32d25..fb52e27 100644
84184--- a/include/linux/kobject_ns.h
84185+++ b/include/linux/kobject_ns.h
84186@@ -44,7 +44,7 @@ struct kobj_ns_type_operations {
84187 const void *(*netlink_ns)(struct sock *sk);
84188 const void *(*initial_ns)(void);
84189 void (*drop_ns)(void *);
84190-};
84191+} __do_const;
84192
84193 int kobj_ns_type_register(const struct kobj_ns_type_operations *ops);
84194 int kobj_ns_type_registered(enum kobj_ns_type type);
84195diff --git a/include/linux/kref.h b/include/linux/kref.h
84196index 484604d..0f6c5b6 100644
84197--- a/include/linux/kref.h
84198+++ b/include/linux/kref.h
84199@@ -68,7 +68,7 @@ static inline void kref_get(struct kref *kref)
84200 static inline int kref_sub(struct kref *kref, unsigned int count,
84201 void (*release)(struct kref *kref))
84202 {
84203- WARN_ON(release == NULL);
84204+ BUG_ON(release == NULL);
84205
84206 if (atomic_sub_and_test((int) count, &kref->refcount)) {
84207 release(kref);
84208diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
84209index d12b210..d91fd76 100644
84210--- a/include/linux/kvm_host.h
84211+++ b/include/linux/kvm_host.h
84212@@ -455,7 +455,7 @@ static inline void kvm_irqfd_exit(void)
84213 {
84214 }
84215 #endif
84216-int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align,
84217+int kvm_init(const void *opaque, unsigned vcpu_size, unsigned vcpu_align,
84218 struct module *module);
84219 void kvm_exit(void);
84220
84221@@ -633,7 +633,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu,
84222 struct kvm_guest_debug *dbg);
84223 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
84224
84225-int kvm_arch_init(void *opaque);
84226+int kvm_arch_init(const void *opaque);
84227 void kvm_arch_exit(void);
84228
84229 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
84230diff --git a/include/linux/libata.h b/include/linux/libata.h
84231index 6b08cc1..248c5e9 100644
84232--- a/include/linux/libata.h
84233+++ b/include/linux/libata.h
84234@@ -980,7 +980,7 @@ struct ata_port_operations {
84235 * fields must be pointers.
84236 */
84237 const struct ata_port_operations *inherits;
84238-};
84239+} __do_const;
84240
84241 struct ata_port_info {
84242 unsigned long flags;
84243diff --git a/include/linux/linkage.h b/include/linux/linkage.h
84244index a6a42dd..6c5ebce 100644
84245--- a/include/linux/linkage.h
84246+++ b/include/linux/linkage.h
84247@@ -36,6 +36,7 @@
84248 #endif
84249
84250 #define __page_aligned_data __section(.data..page_aligned) __aligned(PAGE_SIZE)
84251+#define __page_aligned_rodata __read_only __aligned(PAGE_SIZE)
84252 #define __page_aligned_bss __section(.bss..page_aligned) __aligned(PAGE_SIZE)
84253
84254 /*
84255diff --git a/include/linux/list.h b/include/linux/list.h
84256index feb773c..98f3075 100644
84257--- a/include/linux/list.h
84258+++ b/include/linux/list.h
84259@@ -113,6 +113,19 @@ extern void __list_del_entry(struct list_head *entry);
84260 extern void list_del(struct list_head *entry);
84261 #endif
84262
84263+extern void __pax_list_add(struct list_head *new,
84264+ struct list_head *prev,
84265+ struct list_head *next);
84266+static inline void pax_list_add(struct list_head *new, struct list_head *head)
84267+{
84268+ __pax_list_add(new, head, head->next);
84269+}
84270+static inline void pax_list_add_tail(struct list_head *new, struct list_head *head)
84271+{
84272+ __pax_list_add(new, head->prev, head);
84273+}
84274+extern void pax_list_del(struct list_head *entry);
84275+
84276 /**
84277 * list_replace - replace old entry by new one
84278 * @old : the element to be replaced
84279@@ -146,6 +159,8 @@ static inline void list_del_init(struct list_head *entry)
84280 INIT_LIST_HEAD(entry);
84281 }
84282
84283+extern void pax_list_del_init(struct list_head *entry);
84284+
84285 /**
84286 * list_move - delete from one list and add as another's head
84287 * @list: the entry to move
84288diff --git a/include/linux/lockref.h b/include/linux/lockref.h
84289index b10b122..d37b3de 100644
84290--- a/include/linux/lockref.h
84291+++ b/include/linux/lockref.h
84292@@ -28,7 +28,7 @@ struct lockref {
84293 #endif
84294 struct {
84295 spinlock_t lock;
84296- int count;
84297+ atomic_t count;
84298 };
84299 };
84300 };
84301@@ -43,9 +43,29 @@ extern void lockref_mark_dead(struct lockref *);
84302 extern int lockref_get_not_dead(struct lockref *);
84303
84304 /* Must be called under spinlock for reliable results */
84305-static inline int __lockref_is_dead(const struct lockref *l)
84306+static inline int __lockref_is_dead(const struct lockref *lockref)
84307 {
84308- return ((int)l->count < 0);
84309+ return atomic_read(&lockref->count) < 0;
84310+}
84311+
84312+static inline int __lockref_read(const struct lockref *lockref)
84313+{
84314+ return atomic_read(&lockref->count);
84315+}
84316+
84317+static inline void __lockref_set(struct lockref *lockref, int count)
84318+{
84319+ atomic_set(&lockref->count, count);
84320+}
84321+
84322+static inline void __lockref_inc(struct lockref *lockref)
84323+{
84324+ atomic_inc(&lockref->count);
84325+}
84326+
84327+static inline void __lockref_dec(struct lockref *lockref)
84328+{
84329+ atomic_dec(&lockref->count);
84330 }
84331
84332 #endif /* __LINUX_LOCKREF_H */
84333diff --git a/include/linux/math64.h b/include/linux/math64.h
84334index c45c089..298841c 100644
84335--- a/include/linux/math64.h
84336+++ b/include/linux/math64.h
84337@@ -15,7 +15,7 @@
84338 * This is commonly provided by 32bit archs to provide an optimized 64bit
84339 * divide.
84340 */
84341-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
84342+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
84343 {
84344 *remainder = dividend % divisor;
84345 return dividend / divisor;
84346@@ -42,7 +42,7 @@ static inline u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder)
84347 /**
84348 * div64_u64 - unsigned 64bit divide with 64bit divisor
84349 */
84350-static inline u64 div64_u64(u64 dividend, u64 divisor)
84351+static inline u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
84352 {
84353 return dividend / divisor;
84354 }
84355@@ -61,7 +61,7 @@ static inline s64 div64_s64(s64 dividend, s64 divisor)
84356 #define div64_ul(x, y) div_u64((x), (y))
84357
84358 #ifndef div_u64_rem
84359-static inline u64 div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
84360+static inline u64 __intentional_overflow(-1) div_u64_rem(u64 dividend, u32 divisor, u32 *remainder)
84361 {
84362 *remainder = do_div(dividend, divisor);
84363 return dividend;
84364@@ -77,7 +77,7 @@ extern u64 div64_u64_rem(u64 dividend, u64 divisor, u64 *remainder);
84365 #endif
84366
84367 #ifndef div64_u64
84368-extern u64 div64_u64(u64 dividend, u64 divisor);
84369+extern u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor);
84370 #endif
84371
84372 #ifndef div64_s64
84373@@ -94,7 +94,7 @@ extern s64 div64_s64(s64 dividend, s64 divisor);
84374 * divide.
84375 */
84376 #ifndef div_u64
84377-static inline u64 div_u64(u64 dividend, u32 divisor)
84378+static inline u64 __intentional_overflow(-1) div_u64(u64 dividend, u32 divisor)
84379 {
84380 u32 remainder;
84381 return div_u64_rem(dividend, divisor, &remainder);
84382diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h
84383index 3d385c8..deacb6a 100644
84384--- a/include/linux/mempolicy.h
84385+++ b/include/linux/mempolicy.h
84386@@ -91,6 +91,10 @@ static inline struct mempolicy *mpol_dup(struct mempolicy *pol)
84387 }
84388
84389 #define vma_policy(vma) ((vma)->vm_policy)
84390+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
84391+{
84392+ vma->vm_policy = pol;
84393+}
84394
84395 static inline void mpol_get(struct mempolicy *pol)
84396 {
84397@@ -229,6 +233,9 @@ static inline void mpol_free_shared_policy(struct shared_policy *p)
84398 }
84399
84400 #define vma_policy(vma) NULL
84401+static inline void set_vma_policy(struct vm_area_struct *vma, struct mempolicy *pol)
84402+{
84403+}
84404
84405 static inline int
84406 vma_dup_policy(struct vm_area_struct *src, struct vm_area_struct *dst)
84407diff --git a/include/linux/mm.h b/include/linux/mm.h
84408index 47a9392..ef645bc 100644
84409--- a/include/linux/mm.h
84410+++ b/include/linux/mm.h
84411@@ -135,6 +135,11 @@ extern unsigned int kobjsize(const void *objp);
84412
84413 #define VM_DONTCOPY 0x00020000 /* Do not copy this vma on fork */
84414 #define VM_DONTEXPAND 0x00040000 /* Cannot expand with mremap() */
84415+
84416+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
84417+#define VM_PAGEEXEC 0x00080000 /* vma->vm_page_prot needs special handling */
84418+#endif
84419+
84420 #define VM_ACCOUNT 0x00100000 /* Is a VM accounted object */
84421 #define VM_NORESERVE 0x00200000 /* should the VM suppress accounting */
84422 #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */
84423@@ -254,8 +259,8 @@ struct vm_operations_struct {
84424 /* called by access_process_vm when get_user_pages() fails, typically
84425 * for use by special VMAs that can switch between memory and hardware
84426 */
84427- int (*access)(struct vm_area_struct *vma, unsigned long addr,
84428- void *buf, int len, int write);
84429+ ssize_t (*access)(struct vm_area_struct *vma, unsigned long addr,
84430+ void *buf, size_t len, int write);
84431
84432 /* Called by the /proc/PID/maps code to ask the vma whether it
84433 * has a special name. Returning non-NULL will also cause this
84434@@ -293,6 +298,7 @@ struct vm_operations_struct {
84435 struct page *(*find_special_page)(struct vm_area_struct *vma,
84436 unsigned long addr);
84437 };
84438+typedef struct vm_operations_struct __no_const vm_operations_struct_no_const;
84439
84440 struct mmu_gather;
84441 struct inode;
84442@@ -1213,8 +1219,8 @@ int follow_pfn(struct vm_area_struct *vma, unsigned long address,
84443 unsigned long *pfn);
84444 int follow_phys(struct vm_area_struct *vma, unsigned long address,
84445 unsigned int flags, unsigned long *prot, resource_size_t *phys);
84446-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
84447- void *buf, int len, int write);
84448+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
84449+ void *buf, size_t len, int write);
84450
84451 static inline void unmap_shared_mapping_range(struct address_space *mapping,
84452 loff_t const holebegin, loff_t const holelen)
84453@@ -1254,9 +1260,9 @@ static inline int fixup_user_fault(struct task_struct *tsk,
84454 }
84455 #endif
84456
84457-extern int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write);
84458-extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
84459- void *buf, int len, int write);
84460+extern ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write);
84461+extern ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
84462+ void *buf, size_t len, int write);
84463
84464 long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
84465 unsigned long start, unsigned long nr_pages,
84466@@ -1299,34 +1305,6 @@ int set_page_dirty_lock(struct page *page);
84467 int clear_page_dirty_for_io(struct page *page);
84468 int get_cmdline(struct task_struct *task, char *buffer, int buflen);
84469
84470-/* Is the vma a continuation of the stack vma above it? */
84471-static inline int vma_growsdown(struct vm_area_struct *vma, unsigned long addr)
84472-{
84473- return vma && (vma->vm_end == addr) && (vma->vm_flags & VM_GROWSDOWN);
84474-}
84475-
84476-static inline int stack_guard_page_start(struct vm_area_struct *vma,
84477- unsigned long addr)
84478-{
84479- return (vma->vm_flags & VM_GROWSDOWN) &&
84480- (vma->vm_start == addr) &&
84481- !vma_growsdown(vma->vm_prev, addr);
84482-}
84483-
84484-/* Is the vma a continuation of the stack vma below it? */
84485-static inline int vma_growsup(struct vm_area_struct *vma, unsigned long addr)
84486-{
84487- return vma && (vma->vm_start == addr) && (vma->vm_flags & VM_GROWSUP);
84488-}
84489-
84490-static inline int stack_guard_page_end(struct vm_area_struct *vma,
84491- unsigned long addr)
84492-{
84493- return (vma->vm_flags & VM_GROWSUP) &&
84494- (vma->vm_end == addr) &&
84495- !vma_growsup(vma->vm_next, addr);
84496-}
84497-
84498 extern struct task_struct *task_of_stack(struct task_struct *task,
84499 struct vm_area_struct *vma, bool in_group);
84500
84501@@ -1449,8 +1427,15 @@ static inline int __pud_alloc(struct mm_struct *mm, pgd_t *pgd,
84502 {
84503 return 0;
84504 }
84505+
84506+static inline int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd,
84507+ unsigned long address)
84508+{
84509+ return 0;
84510+}
84511 #else
84512 int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
84513+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address);
84514 #endif
84515
84516 #if defined(__PAGETABLE_PMD_FOLDED) || !defined(CONFIG_MMU)
84517@@ -1460,6 +1445,12 @@ static inline int __pmd_alloc(struct mm_struct *mm, pud_t *pud,
84518 return 0;
84519 }
84520
84521+static inline int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud,
84522+ unsigned long address)
84523+{
84524+ return 0;
84525+}
84526+
84527 static inline void mm_nr_pmds_init(struct mm_struct *mm) {}
84528
84529 static inline unsigned long mm_nr_pmds(struct mm_struct *mm)
84530@@ -1472,6 +1463,7 @@ static inline void mm_dec_nr_pmds(struct mm_struct *mm) {}
84531
84532 #else
84533 int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address);
84534+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address);
84535
84536 static inline void mm_nr_pmds_init(struct mm_struct *mm)
84537 {
84538@@ -1509,11 +1501,23 @@ static inline pud_t *pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long a
84539 NULL: pud_offset(pgd, address);
84540 }
84541
84542+static inline pud_t *pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
84543+{
84544+ return (unlikely(pgd_none(*pgd)) && __pud_alloc_kernel(mm, pgd, address))?
84545+ NULL: pud_offset(pgd, address);
84546+}
84547+
84548 static inline pmd_t *pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
84549 {
84550 return (unlikely(pud_none(*pud)) && __pmd_alloc(mm, pud, address))?
84551 NULL: pmd_offset(pud, address);
84552 }
84553+
84554+static inline pmd_t *pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
84555+{
84556+ return (unlikely(pud_none(*pud)) && __pmd_alloc_kernel(mm, pud, address))?
84557+ NULL: pmd_offset(pud, address);
84558+}
84559 #endif /* CONFIG_MMU && !__ARCH_HAS_4LEVEL_HACK */
84560
84561 #if USE_SPLIT_PTE_PTLOCKS
84562@@ -1890,12 +1894,23 @@ extern struct vm_area_struct *copy_vma(struct vm_area_struct **,
84563 bool *need_rmap_locks);
84564 extern void exit_mmap(struct mm_struct *);
84565
84566+#if defined(CONFIG_GRKERNSEC) && (defined(CONFIG_GRKERNSEC_RESLOG) || !defined(CONFIG_GRKERNSEC_NO_RBAC))
84567+extern void gr_learn_resource(const struct task_struct *task, const int res,
84568+ const unsigned long wanted, const int gt);
84569+#else
84570+static inline void gr_learn_resource(const struct task_struct *task, const int res,
84571+ const unsigned long wanted, const int gt)
84572+{
84573+}
84574+#endif
84575+
84576 static inline int check_data_rlimit(unsigned long rlim,
84577 unsigned long new,
84578 unsigned long start,
84579 unsigned long end_data,
84580 unsigned long start_data)
84581 {
84582+ gr_learn_resource(current, RLIMIT_DATA, (new - start) + (end_data - start_data), 1);
84583 if (rlim < RLIM_INFINITY) {
84584 if (((new - start) + (end_data - start_data)) > rlim)
84585 return -ENOSPC;
84586@@ -1920,7 +1935,7 @@ extern int install_special_mapping(struct mm_struct *mm,
84587 unsigned long addr, unsigned long len,
84588 unsigned long flags, struct page **pages);
84589
84590-extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
84591+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long) __intentional_overflow(-1);
84592
84593 extern unsigned long mmap_region(struct file *file, unsigned long addr,
84594 unsigned long len, vm_flags_t vm_flags, unsigned long pgoff);
84595@@ -1928,6 +1943,7 @@ extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
84596 unsigned long len, unsigned long prot, unsigned long flags,
84597 unsigned long pgoff, unsigned long *populate);
84598 extern int do_munmap(struct mm_struct *, unsigned long, size_t);
84599+extern int __do_munmap(struct mm_struct *, unsigned long, size_t);
84600
84601 #ifdef CONFIG_MMU
84602 extern int __mm_populate(unsigned long addr, unsigned long len,
84603@@ -1956,10 +1972,11 @@ struct vm_unmapped_area_info {
84604 unsigned long high_limit;
84605 unsigned long align_mask;
84606 unsigned long align_offset;
84607+ unsigned long threadstack_offset;
84608 };
84609
84610-extern unsigned long unmapped_area(struct vm_unmapped_area_info *info);
84611-extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
84612+extern unsigned long unmapped_area(const struct vm_unmapped_area_info *info);
84613+extern unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info);
84614
84615 /*
84616 * Search for an unmapped address range.
84617@@ -1971,7 +1988,7 @@ extern unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info);
84618 * - satisfies (begin_addr & align_mask) == (align_offset & align_mask)
84619 */
84620 static inline unsigned long
84621-vm_unmapped_area(struct vm_unmapped_area_info *info)
84622+vm_unmapped_area(const struct vm_unmapped_area_info *info)
84623 {
84624 if (!(info->flags & VM_UNMAPPED_AREA_TOPDOWN))
84625 return unmapped_area(info);
84626@@ -2033,6 +2050,10 @@ extern struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long add
84627 extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr,
84628 struct vm_area_struct **pprev);
84629
84630+extern struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma);
84631+extern __must_check long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma);
84632+extern void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl);
84633+
84634 /* Look up the first VMA which intersects the interval start_addr..end_addr-1,
84635 NULL if none. Assume start_addr < end_addr. */
84636 static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr)
84637@@ -2062,10 +2083,10 @@ static inline struct vm_area_struct *find_exact_vma(struct mm_struct *mm,
84638 }
84639
84640 #ifdef CONFIG_MMU
84641-pgprot_t vm_get_page_prot(unsigned long vm_flags);
84642+pgprot_t vm_get_page_prot(vm_flags_t vm_flags);
84643 void vma_set_page_prot(struct vm_area_struct *vma);
84644 #else
84645-static inline pgprot_t vm_get_page_prot(unsigned long vm_flags)
84646+static inline pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
84647 {
84648 return __pgprot(0);
84649 }
84650@@ -2127,6 +2148,11 @@ void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
84651 static inline void vm_stat_account(struct mm_struct *mm,
84652 unsigned long flags, struct file *file, long pages)
84653 {
84654+
84655+#ifdef CONFIG_PAX_RANDMMAP
84656+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
84657+#endif
84658+
84659 mm->total_vm += pages;
84660 }
84661 #endif /* CONFIG_PROC_FS */
84662@@ -2229,7 +2255,7 @@ extern int unpoison_memory(unsigned long pfn);
84663 extern int sysctl_memory_failure_early_kill;
84664 extern int sysctl_memory_failure_recovery;
84665 extern void shake_page(struct page *p, int access);
84666-extern atomic_long_t num_poisoned_pages;
84667+extern atomic_long_unchecked_t num_poisoned_pages;
84668 extern int soft_offline_page(struct page *page, int flags);
84669
84670 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLBFS)
84671@@ -2280,5 +2306,11 @@ void __init setup_nr_node_ids(void);
84672 static inline void setup_nr_node_ids(void) {}
84673 #endif
84674
84675+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
84676+extern void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot);
84677+#else
84678+static inline void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot) {}
84679+#endif
84680+
84681 #endif /* __KERNEL__ */
84682 #endif /* _LINUX_MM_H */
84683diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
84684index 199a03a..7328440 100644
84685--- a/include/linux/mm_types.h
84686+++ b/include/linux/mm_types.h
84687@@ -313,7 +313,9 @@ struct vm_area_struct {
84688 #ifdef CONFIG_NUMA
84689 struct mempolicy *vm_policy; /* NUMA policy for the VMA */
84690 #endif
84691-};
84692+
84693+ struct vm_area_struct *vm_mirror;/* PaX: mirror vma or NULL */
84694+} __randomize_layout;
84695
84696 struct core_thread {
84697 struct task_struct *task;
84698@@ -464,7 +466,25 @@ struct mm_struct {
84699 /* address of the bounds directory */
84700 void __user *bd_addr;
84701 #endif
84702-};
84703+
84704+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
84705+ unsigned long pax_flags;
84706+#endif
84707+
84708+#ifdef CONFIG_PAX_DLRESOLVE
84709+ unsigned long call_dl_resolve;
84710+#endif
84711+
84712+#if defined(CONFIG_PPC32) && defined(CONFIG_PAX_EMUSIGRT)
84713+ unsigned long call_syscall;
84714+#endif
84715+
84716+#ifdef CONFIG_PAX_ASLR
84717+ unsigned long delta_mmap; /* randomized offset */
84718+ unsigned long delta_stack; /* randomized offset */
84719+#endif
84720+
84721+} __randomize_layout;
84722
84723 static inline void mm_init_cpumask(struct mm_struct *mm)
84724 {
84725diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
84726index 160448f..7b332b7 100644
84727--- a/include/linux/mmc/core.h
84728+++ b/include/linux/mmc/core.h
84729@@ -79,7 +79,7 @@ struct mmc_command {
84730 #define mmc_cmd_type(cmd) ((cmd)->flags & MMC_CMD_MASK)
84731
84732 unsigned int retries; /* max number of retries */
84733- unsigned int error; /* command error */
84734+ int error; /* command error */
84735
84736 /*
84737 * Standard errno values are used for errors, but some have specific
84738diff --git a/include/linux/mmiotrace.h b/include/linux/mmiotrace.h
84739index c5d5278..f0b68c8 100644
84740--- a/include/linux/mmiotrace.h
84741+++ b/include/linux/mmiotrace.h
84742@@ -46,7 +46,7 @@ extern int kmmio_handler(struct pt_regs *regs, unsigned long addr);
84743 /* Called from ioremap.c */
84744 extern void mmiotrace_ioremap(resource_size_t offset, unsigned long size,
84745 void __iomem *addr);
84746-extern void mmiotrace_iounmap(volatile void __iomem *addr);
84747+extern void mmiotrace_iounmap(const volatile void __iomem *addr);
84748
84749 /* For anyone to insert markers. Remember trailing newline. */
84750 extern __printf(1, 2) int mmiotrace_printk(const char *fmt, ...);
84751@@ -66,7 +66,7 @@ static inline void mmiotrace_ioremap(resource_size_t offset,
84752 {
84753 }
84754
84755-static inline void mmiotrace_iounmap(volatile void __iomem *addr)
84756+static inline void mmiotrace_iounmap(const volatile void __iomem *addr)
84757 {
84758 }
84759
84760diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
84761index 2782df4..abe756e 100644
84762--- a/include/linux/mmzone.h
84763+++ b/include/linux/mmzone.h
84764@@ -526,7 +526,7 @@ struct zone {
84765
84766 ZONE_PADDING(_pad3_)
84767 /* Zone statistics */
84768- atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
84769+ atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
84770 } ____cacheline_internodealigned_in_smp;
84771
84772 enum zone_flags {
84773diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h
84774index e530533..c9620c7 100644
84775--- a/include/linux/mod_devicetable.h
84776+++ b/include/linux/mod_devicetable.h
84777@@ -139,7 +139,7 @@ struct usb_device_id {
84778 #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200
84779 #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400
84780
84781-#define HID_ANY_ID (~0)
84782+#define HID_ANY_ID (~0U)
84783 #define HID_BUS_ANY 0xffff
84784 #define HID_GROUP_ANY 0x0000
84785
84786@@ -470,7 +470,7 @@ struct dmi_system_id {
84787 const char *ident;
84788 struct dmi_strmatch matches[4];
84789 void *driver_data;
84790-};
84791+} __do_const;
84792 /*
84793 * struct dmi_device_id appears during expansion of
84794 * "MODULE_DEVICE_TABLE(dmi, x)". Compiler doesn't look inside it
84795diff --git a/include/linux/module.h b/include/linux/module.h
84796index b03485b..a26974f 100644
84797--- a/include/linux/module.h
84798+++ b/include/linux/module.h
84799@@ -17,9 +17,11 @@
84800 #include <linux/moduleparam.h>
84801 #include <linux/jump_label.h>
84802 #include <linux/export.h>
84803+#include <linux/fs.h>
84804
84805 #include <linux/percpu.h>
84806 #include <asm/module.h>
84807+#include <asm/pgtable.h>
84808
84809 /* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
84810 #define MODULE_SIG_STRING "~Module signature appended~\n"
84811@@ -42,7 +44,7 @@ struct module_kobject {
84812 struct kobject *drivers_dir;
84813 struct module_param_attrs *mp;
84814 struct completion *kobj_completion;
84815-};
84816+} __randomize_layout;
84817
84818 struct module_attribute {
84819 struct attribute attr;
84820@@ -54,12 +56,13 @@ struct module_attribute {
84821 int (*test)(struct module *);
84822 void (*free)(struct module *);
84823 };
84824+typedef struct module_attribute __no_const module_attribute_no_const;
84825
84826 struct module_version_attribute {
84827 struct module_attribute mattr;
84828 const char *module_name;
84829 const char *version;
84830-} __attribute__ ((__aligned__(sizeof(void *))));
84831+} __do_const __attribute__ ((__aligned__(sizeof(void *))));
84832
84833 extern ssize_t __modver_version_show(struct module_attribute *,
84834 struct module_kobject *, char *);
84835@@ -221,7 +224,7 @@ struct module {
84836
84837 /* Sysfs stuff. */
84838 struct module_kobject mkobj;
84839- struct module_attribute *modinfo_attrs;
84840+ module_attribute_no_const *modinfo_attrs;
84841 const char *version;
84842 const char *srcversion;
84843 struct kobject *holders_dir;
84844@@ -270,19 +273,16 @@ struct module {
84845 int (*init)(void);
84846
84847 /* If this is non-NULL, vfree after init() returns */
84848- void *module_init;
84849+ void *module_init_rx, *module_init_rw;
84850
84851 /* Here is the actual code + data, vfree'd on unload. */
84852- void *module_core;
84853+ void *module_core_rx, *module_core_rw;
84854
84855 /* Here are the sizes of the init and core sections */
84856- unsigned int init_size, core_size;
84857+ unsigned int init_size_rw, core_size_rw;
84858
84859 /* The size of the executable code in each section. */
84860- unsigned int init_text_size, core_text_size;
84861-
84862- /* Size of RO sections of the module (text+rodata) */
84863- unsigned int init_ro_size, core_ro_size;
84864+ unsigned int init_size_rx, core_size_rx;
84865
84866 /* Arch-specific module values */
84867 struct mod_arch_specific arch;
84868@@ -338,6 +338,10 @@ struct module {
84869 #ifdef CONFIG_EVENT_TRACING
84870 struct ftrace_event_call **trace_events;
84871 unsigned int num_trace_events;
84872+ struct file_operations trace_id;
84873+ struct file_operations trace_enable;
84874+ struct file_operations trace_format;
84875+ struct file_operations trace_filter;
84876 #endif
84877 #ifdef CONFIG_FTRACE_MCOUNT_RECORD
84878 unsigned int num_ftrace_callsites;
84879@@ -365,7 +369,7 @@ struct module {
84880 ctor_fn_t *ctors;
84881 unsigned int num_ctors;
84882 #endif
84883-};
84884+} __randomize_layout;
84885 #ifndef MODULE_ARCH_INIT
84886 #define MODULE_ARCH_INIT {}
84887 #endif
84888@@ -386,18 +390,48 @@ bool is_module_address(unsigned long addr);
84889 bool is_module_percpu_address(unsigned long addr);
84890 bool is_module_text_address(unsigned long addr);
84891
84892+static inline int within_module_range(unsigned long addr, void *start, unsigned long size)
84893+{
84894+
84895+#ifdef CONFIG_PAX_KERNEXEC
84896+ if (ktla_ktva(addr) >= (unsigned long)start &&
84897+ ktla_ktva(addr) < (unsigned long)start + size)
84898+ return 1;
84899+#endif
84900+
84901+ return ((void *)addr >= start && (void *)addr < start + size);
84902+}
84903+
84904+static inline int within_module_core_rx(unsigned long addr, const struct module *mod)
84905+{
84906+ return within_module_range(addr, mod->module_core_rx, mod->core_size_rx);
84907+}
84908+
84909+static inline int within_module_core_rw(unsigned long addr, const struct module *mod)
84910+{
84911+ return within_module_range(addr, mod->module_core_rw, mod->core_size_rw);
84912+}
84913+
84914+static inline int within_module_init_rx(unsigned long addr, const struct module *mod)
84915+{
84916+ return within_module_range(addr, mod->module_init_rx, mod->init_size_rx);
84917+}
84918+
84919+static inline int within_module_init_rw(unsigned long addr, const struct module *mod)
84920+{
84921+ return within_module_range(addr, mod->module_init_rw, mod->init_size_rw);
84922+}
84923+
84924 static inline bool within_module_core(unsigned long addr,
84925 const struct module *mod)
84926 {
84927- return (unsigned long)mod->module_core <= addr &&
84928- addr < (unsigned long)mod->module_core + mod->core_size;
84929+ return within_module_core_rx(addr, mod) || within_module_core_rw(addr, mod);
84930 }
84931
84932 static inline bool within_module_init(unsigned long addr,
84933 const struct module *mod)
84934 {
84935- return (unsigned long)mod->module_init <= addr &&
84936- addr < (unsigned long)mod->module_init + mod->init_size;
84937+ return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod);
84938 }
84939
84940 static inline bool within_module(unsigned long addr, const struct module *mod)
84941diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
84942index 4d0cb9b..3169ac7 100644
84943--- a/include/linux/moduleloader.h
84944+++ b/include/linux/moduleloader.h
84945@@ -25,9 +25,21 @@ unsigned int arch_mod_section_prepend(struct module *mod, unsigned int section);
84946 sections. Returns NULL on failure. */
84947 void *module_alloc(unsigned long size);
84948
84949+#ifdef CONFIG_PAX_KERNEXEC
84950+void *module_alloc_exec(unsigned long size);
84951+#else
84952+#define module_alloc_exec(x) module_alloc(x)
84953+#endif
84954+
84955 /* Free memory returned from module_alloc. */
84956 void module_memfree(void *module_region);
84957
84958+#ifdef CONFIG_PAX_KERNEXEC
84959+void module_memfree_exec(void *module_region);
84960+#else
84961+#define module_memfree_exec(x) module_memfree((x))
84962+#endif
84963+
84964 /*
84965 * Apply the given relocation to the (simplified) ELF. Return -error
84966 * or 0.
84967@@ -45,8 +57,10 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
84968 unsigned int relsec,
84969 struct module *me)
84970 {
84971+#ifdef CONFIG_MODULES
84972 printk(KERN_ERR "module %s: REL relocation unsupported\n",
84973 module_name(me));
84974+#endif
84975 return -ENOEXEC;
84976 }
84977 #endif
84978@@ -68,8 +82,10 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
84979 unsigned int relsec,
84980 struct module *me)
84981 {
84982+#ifdef CONFIG_MODULES
84983 printk(KERN_ERR "module %s: REL relocation unsupported\n",
84984 module_name(me));
84985+#endif
84986 return -ENOEXEC;
84987 }
84988 #endif
84989diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h
84990index 1c9effa..1160bdd 100644
84991--- a/include/linux/moduleparam.h
84992+++ b/include/linux/moduleparam.h
84993@@ -323,7 +323,7 @@ static inline void __kernel_param_unlock(void)
84994 * @len is usually just sizeof(string).
84995 */
84996 #define module_param_string(name, string, len, perm) \
84997- static const struct kparam_string __param_string_##name \
84998+ static const struct kparam_string __param_string_##name __used \
84999 = { len, string }; \
85000 __module_param_call(MODULE_PARAM_PREFIX, name, \
85001 &param_ops_string, \
85002@@ -467,7 +467,7 @@ extern int param_set_bint(const char *val, const struct kernel_param *kp);
85003 */
85004 #define module_param_array_named(name, array, type, nump, perm) \
85005 param_check_##type(name, &(array)[0]); \
85006- static const struct kparam_array __param_arr_##name \
85007+ static const struct kparam_array __param_arr_##name __used \
85008 = { .max = ARRAY_SIZE(array), .num = nump, \
85009 .ops = &param_ops_##type, \
85010 .elemsize = sizeof(array[0]), .elem = array }; \
85011diff --git a/include/linux/mount.h b/include/linux/mount.h
85012index 564beee..653be6f 100644
85013--- a/include/linux/mount.h
85014+++ b/include/linux/mount.h
85015@@ -67,7 +67,7 @@ struct vfsmount {
85016 struct dentry *mnt_root; /* root of the mounted tree */
85017 struct super_block *mnt_sb; /* pointer to superblock */
85018 int mnt_flags;
85019-};
85020+} __randomize_layout;
85021
85022 struct file; /* forward dec */
85023 struct path;
85024diff --git a/include/linux/namei.h b/include/linux/namei.h
85025index c899077..b9a2010 100644
85026--- a/include/linux/namei.h
85027+++ b/include/linux/namei.h
85028@@ -71,8 +71,8 @@ extern struct dentry *lock_rename(struct dentry *, struct dentry *);
85029 extern void unlock_rename(struct dentry *, struct dentry *);
85030
85031 extern void nd_jump_link(struct nameidata *nd, struct path *path);
85032-extern void nd_set_link(struct nameidata *nd, char *path);
85033-extern char *nd_get_link(struct nameidata *nd);
85034+extern void nd_set_link(struct nameidata *nd, const char *path);
85035+extern const char *nd_get_link(const struct nameidata *nd);
85036
85037 static inline void nd_terminate_link(void *name, size_t len, size_t maxlen)
85038 {
85039diff --git a/include/linux/net.h b/include/linux/net.h
85040index 17d8339..81656c0 100644
85041--- a/include/linux/net.h
85042+++ b/include/linux/net.h
85043@@ -192,7 +192,7 @@ struct net_proto_family {
85044 int (*create)(struct net *net, struct socket *sock,
85045 int protocol, int kern);
85046 struct module *owner;
85047-};
85048+} __do_const;
85049
85050 struct iovec;
85051 struct kvec;
85052diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
85053index 2787388..1dd8e88 100644
85054--- a/include/linux/netdevice.h
85055+++ b/include/linux/netdevice.h
85056@@ -1198,6 +1198,7 @@ struct net_device_ops {
85057 u8 state);
85058 #endif
85059 };
85060+typedef struct net_device_ops __no_const net_device_ops_no_const;
85061
85062 /**
85063 * enum net_device_priv_flags - &struct net_device priv_flags
85064@@ -1546,10 +1547,10 @@ struct net_device {
85065
85066 struct net_device_stats stats;
85067
85068- atomic_long_t rx_dropped;
85069- atomic_long_t tx_dropped;
85070+ atomic_long_unchecked_t rx_dropped;
85071+ atomic_long_unchecked_t tx_dropped;
85072
85073- atomic_t carrier_changes;
85074+ atomic_unchecked_t carrier_changes;
85075
85076 #ifdef CONFIG_WIRELESS_EXT
85077 const struct iw_handler_def * wireless_handlers;
85078diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
85079index 2517ece..0bbfcfb 100644
85080--- a/include/linux/netfilter.h
85081+++ b/include/linux/netfilter.h
85082@@ -85,7 +85,7 @@ struct nf_sockopt_ops {
85083 #endif
85084 /* Use the module struct to lock set/get code in place */
85085 struct module *owner;
85086-};
85087+} __do_const;
85088
85089 /* Function to register/unregister hook points. */
85090 int nf_register_hook(struct nf_hook_ops *reg);
85091diff --git a/include/linux/netfilter/nfnetlink.h b/include/linux/netfilter/nfnetlink.h
85092index e955d47..04a5338 100644
85093--- a/include/linux/netfilter/nfnetlink.h
85094+++ b/include/linux/netfilter/nfnetlink.h
85095@@ -19,7 +19,7 @@ struct nfnl_callback {
85096 const struct nlattr * const cda[]);
85097 const struct nla_policy *policy; /* netlink attribute policy */
85098 const u_int16_t attr_count; /* number of nlattr's */
85099-};
85100+} __do_const;
85101
85102 struct nfnetlink_subsystem {
85103 const char *name;
85104diff --git a/include/linux/netfilter/xt_gradm.h b/include/linux/netfilter/xt_gradm.h
85105new file mode 100644
85106index 0000000..33f4af8
85107--- /dev/null
85108+++ b/include/linux/netfilter/xt_gradm.h
85109@@ -0,0 +1,9 @@
85110+#ifndef _LINUX_NETFILTER_XT_GRADM_H
85111+#define _LINUX_NETFILTER_XT_GRADM_H 1
85112+
85113+struct xt_gradm_mtinfo {
85114+ __u16 flags;
85115+ __u16 invflags;
85116+};
85117+
85118+#endif
85119diff --git a/include/linux/nls.h b/include/linux/nls.h
85120index 520681b..2b7fabb 100644
85121--- a/include/linux/nls.h
85122+++ b/include/linux/nls.h
85123@@ -31,7 +31,7 @@ struct nls_table {
85124 const unsigned char *charset2upper;
85125 struct module *owner;
85126 struct nls_table *next;
85127-};
85128+} __do_const;
85129
85130 /* this value hold the maximum octet of charset */
85131 #define NLS_MAX_CHARSET_SIZE 6 /* for UTF-8 */
85132@@ -46,7 +46,7 @@ enum utf16_endian {
85133 /* nls_base.c */
85134 extern int __register_nls(struct nls_table *, struct module *);
85135 extern int unregister_nls(struct nls_table *);
85136-extern struct nls_table *load_nls(char *);
85137+extern struct nls_table *load_nls(const char *);
85138 extern void unload_nls(struct nls_table *);
85139 extern struct nls_table *load_nls_default(void);
85140 #define register_nls(nls) __register_nls((nls), THIS_MODULE)
85141diff --git a/include/linux/notifier.h b/include/linux/notifier.h
85142index d14a4c3..a078786 100644
85143--- a/include/linux/notifier.h
85144+++ b/include/linux/notifier.h
85145@@ -54,7 +54,8 @@ struct notifier_block {
85146 notifier_fn_t notifier_call;
85147 struct notifier_block __rcu *next;
85148 int priority;
85149-};
85150+} __do_const;
85151+typedef struct notifier_block __no_const notifier_block_no_const;
85152
85153 struct atomic_notifier_head {
85154 spinlock_t lock;
85155diff --git a/include/linux/oprofile.h b/include/linux/oprofile.h
85156index b2a0f15..4d7da32 100644
85157--- a/include/linux/oprofile.h
85158+++ b/include/linux/oprofile.h
85159@@ -138,9 +138,9 @@ int oprofilefs_create_ulong(struct dentry * root,
85160 int oprofilefs_create_ro_ulong(struct dentry * root,
85161 char const * name, ulong * val);
85162
85163-/** Create a file for read-only access to an atomic_t. */
85164+/** Create a file for read-only access to an atomic_unchecked_t. */
85165 int oprofilefs_create_ro_atomic(struct dentry * root,
85166- char const * name, atomic_t * val);
85167+ char const * name, atomic_unchecked_t * val);
85168
85169 /** create a directory */
85170 struct dentry *oprofilefs_mkdir(struct dentry *parent, char const *name);
85171diff --git a/include/linux/padata.h b/include/linux/padata.h
85172index 4386946..f50c615 100644
85173--- a/include/linux/padata.h
85174+++ b/include/linux/padata.h
85175@@ -129,7 +129,7 @@ struct parallel_data {
85176 struct padata_serial_queue __percpu *squeue;
85177 atomic_t reorder_objects;
85178 atomic_t refcnt;
85179- atomic_t seq_nr;
85180+ atomic_unchecked_t seq_nr;
85181 struct padata_cpumask cpumask;
85182 spinlock_t lock ____cacheline_aligned;
85183 unsigned int processed;
85184diff --git a/include/linux/path.h b/include/linux/path.h
85185index d137218..be0c176 100644
85186--- a/include/linux/path.h
85187+++ b/include/linux/path.h
85188@@ -1,13 +1,15 @@
85189 #ifndef _LINUX_PATH_H
85190 #define _LINUX_PATH_H
85191
85192+#include <linux/compiler.h>
85193+
85194 struct dentry;
85195 struct vfsmount;
85196
85197 struct path {
85198 struct vfsmount *mnt;
85199 struct dentry *dentry;
85200-};
85201+} __randomize_layout;
85202
85203 extern void path_get(const struct path *);
85204 extern void path_put(const struct path *);
85205diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
85206index 8c78950..0d74ed9 100644
85207--- a/include/linux/pci_hotplug.h
85208+++ b/include/linux/pci_hotplug.h
85209@@ -71,7 +71,8 @@ struct hotplug_slot_ops {
85210 int (*get_latch_status) (struct hotplug_slot *slot, u8 *value);
85211 int (*get_adapter_status) (struct hotplug_slot *slot, u8 *value);
85212 int (*reset_slot) (struct hotplug_slot *slot, int probe);
85213-};
85214+} __do_const;
85215+typedef struct hotplug_slot_ops __no_const hotplug_slot_ops_no_const;
85216
85217 /**
85218 * struct hotplug_slot_info - used to notify the hotplug pci core of the state of the slot
85219diff --git a/include/linux/percpu.h b/include/linux/percpu.h
85220index caebf2a..4c3ae9d 100644
85221--- a/include/linux/percpu.h
85222+++ b/include/linux/percpu.h
85223@@ -34,7 +34,7 @@
85224 * preallocate for this. Keep PERCPU_DYNAMIC_RESERVE equal to or
85225 * larger than PERCPU_DYNAMIC_EARLY_SIZE.
85226 */
85227-#define PERCPU_DYNAMIC_EARLY_SLOTS 128
85228+#define PERCPU_DYNAMIC_EARLY_SLOTS 256
85229 #define PERCPU_DYNAMIC_EARLY_SIZE (12 << 10)
85230
85231 /*
85232diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
85233index 2b62198..2b74233 100644
85234--- a/include/linux/perf_event.h
85235+++ b/include/linux/perf_event.h
85236@@ -343,8 +343,8 @@ struct perf_event {
85237
85238 enum perf_event_active_state state;
85239 unsigned int attach_state;
85240- local64_t count;
85241- atomic64_t child_count;
85242+ local64_t count; /* PaX: fix it one day */
85243+ atomic64_unchecked_t child_count;
85244
85245 /*
85246 * These are the total time in nanoseconds that the event
85247@@ -395,8 +395,8 @@ struct perf_event {
85248 * These accumulate total time (in nanoseconds) that children
85249 * events have been enabled and running, respectively.
85250 */
85251- atomic64_t child_total_time_enabled;
85252- atomic64_t child_total_time_running;
85253+ atomic64_unchecked_t child_total_time_enabled;
85254+ atomic64_unchecked_t child_total_time_running;
85255
85256 /*
85257 * Protect attach/detach and child_list:
85258@@ -752,7 +752,7 @@ static inline void perf_callchain_store(struct perf_callchain_entry *entry, u64
85259 entry->ip[entry->nr++] = ip;
85260 }
85261
85262-extern int sysctl_perf_event_paranoid;
85263+extern int sysctl_perf_event_legitimately_concerned;
85264 extern int sysctl_perf_event_mlock;
85265 extern int sysctl_perf_event_sample_rate;
85266 extern int sysctl_perf_cpu_time_max_percent;
85267@@ -767,19 +767,24 @@ extern int perf_cpu_time_max_percent_handler(struct ctl_table *table, int write,
85268 loff_t *ppos);
85269
85270
85271+static inline bool perf_paranoid_any(void)
85272+{
85273+ return sysctl_perf_event_legitimately_concerned > 2;
85274+}
85275+
85276 static inline bool perf_paranoid_tracepoint_raw(void)
85277 {
85278- return sysctl_perf_event_paranoid > -1;
85279+ return sysctl_perf_event_legitimately_concerned > -1;
85280 }
85281
85282 static inline bool perf_paranoid_cpu(void)
85283 {
85284- return sysctl_perf_event_paranoid > 0;
85285+ return sysctl_perf_event_legitimately_concerned > 0;
85286 }
85287
85288 static inline bool perf_paranoid_kernel(void)
85289 {
85290- return sysctl_perf_event_paranoid > 1;
85291+ return sysctl_perf_event_legitimately_concerned > 1;
85292 }
85293
85294 extern void perf_event_init(void);
85295@@ -912,7 +917,7 @@ struct perf_pmu_events_attr {
85296 struct device_attribute attr;
85297 u64 id;
85298 const char *event_str;
85299-};
85300+} __do_const;
85301
85302 ssize_t perf_event_sysfs_show(struct device *dev, struct device_attribute *attr,
85303 char *page);
85304diff --git a/include/linux/pid_namespace.h b/include/linux/pid_namespace.h
85305index 918b117..7af374b7 100644
85306--- a/include/linux/pid_namespace.h
85307+++ b/include/linux/pid_namespace.h
85308@@ -45,7 +45,7 @@ struct pid_namespace {
85309 int hide_pid;
85310 int reboot; /* group exit code if this pidns was rebooted */
85311 struct ns_common ns;
85312-};
85313+} __randomize_layout;
85314
85315 extern struct pid_namespace init_pid_ns;
85316
85317diff --git a/include/linux/pipe_fs_i.h b/include/linux/pipe_fs_i.h
85318index eb8b8ac..62649e1 100644
85319--- a/include/linux/pipe_fs_i.h
85320+++ b/include/linux/pipe_fs_i.h
85321@@ -47,10 +47,10 @@ struct pipe_inode_info {
85322 struct mutex mutex;
85323 wait_queue_head_t wait;
85324 unsigned int nrbufs, curbuf, buffers;
85325- unsigned int readers;
85326- unsigned int writers;
85327- unsigned int files;
85328- unsigned int waiting_writers;
85329+ atomic_t readers;
85330+ atomic_t writers;
85331+ atomic_t files;
85332+ atomic_t waiting_writers;
85333 unsigned int r_counter;
85334 unsigned int w_counter;
85335 struct page *tmp_page;
85336diff --git a/include/linux/pm.h b/include/linux/pm.h
85337index e2f1be6..78a0506 100644
85338--- a/include/linux/pm.h
85339+++ b/include/linux/pm.h
85340@@ -608,6 +608,7 @@ struct dev_pm_domain {
85341 struct dev_pm_ops ops;
85342 void (*detach)(struct device *dev, bool power_off);
85343 };
85344+typedef struct dev_pm_domain __no_const dev_pm_domain_no_const;
85345
85346 /*
85347 * The PM_EVENT_ messages are also used by drivers implementing the legacy
85348diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
85349index 080e778..cbdaef7 100644
85350--- a/include/linux/pm_domain.h
85351+++ b/include/linux/pm_domain.h
85352@@ -39,11 +39,11 @@ struct gpd_dev_ops {
85353 int (*save_state)(struct device *dev);
85354 int (*restore_state)(struct device *dev);
85355 bool (*active_wakeup)(struct device *dev);
85356-};
85357+} __no_const;
85358
85359 struct gpd_cpuidle_data {
85360 unsigned int saved_exit_latency;
85361- struct cpuidle_state *idle_state;
85362+ cpuidle_state_no_const *idle_state;
85363 };
85364
85365 struct generic_pm_domain {
85366diff --git a/include/linux/pm_runtime.h b/include/linux/pm_runtime.h
85367index 30e84d4..22278b4 100644
85368--- a/include/linux/pm_runtime.h
85369+++ b/include/linux/pm_runtime.h
85370@@ -115,7 +115,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev)
85371
85372 static inline void pm_runtime_mark_last_busy(struct device *dev)
85373 {
85374- ACCESS_ONCE(dev->power.last_busy) = jiffies;
85375+ ACCESS_ONCE_RW(dev->power.last_busy) = jiffies;
85376 }
85377
85378 static inline bool pm_runtime_is_irq_safe(struct device *dev)
85379diff --git a/include/linux/pnp.h b/include/linux/pnp.h
85380index 6512e9c..ec27fa2 100644
85381--- a/include/linux/pnp.h
85382+++ b/include/linux/pnp.h
85383@@ -298,7 +298,7 @@ static inline void pnp_set_drvdata(struct pnp_dev *pdev, void *data)
85384 struct pnp_fixup {
85385 char id[7];
85386 void (*quirk_function) (struct pnp_dev * dev); /* fixup function */
85387-};
85388+} __do_const;
85389
85390 /* config parameters */
85391 #define PNP_CONFIG_NORMAL 0x0001
85392diff --git a/include/linux/poison.h b/include/linux/poison.h
85393index 2110a81..13a11bb 100644
85394--- a/include/linux/poison.h
85395+++ b/include/linux/poison.h
85396@@ -19,8 +19,8 @@
85397 * under normal circumstances, used to verify that nobody uses
85398 * non-initialized list entries.
85399 */
85400-#define LIST_POISON1 ((void *) 0x00100100 + POISON_POINTER_DELTA)
85401-#define LIST_POISON2 ((void *) 0x00200200 + POISON_POINTER_DELTA)
85402+#define LIST_POISON1 ((void *) (long)0xFFFFFF01)
85403+#define LIST_POISON2 ((void *) (long)0xFFFFFF02)
85404
85405 /********** include/linux/timer.h **********/
85406 /*
85407diff --git a/include/linux/power/smartreflex.h b/include/linux/power/smartreflex.h
85408index d8b187c3..9a9257a 100644
85409--- a/include/linux/power/smartreflex.h
85410+++ b/include/linux/power/smartreflex.h
85411@@ -238,7 +238,7 @@ struct omap_sr_class_data {
85412 int (*notify)(struct omap_sr *sr, u32 status);
85413 u8 notify_flags;
85414 u8 class_type;
85415-};
85416+} __do_const;
85417
85418 /**
85419 * struct omap_sr_nvalue_table - Smartreflex n-target value info
85420diff --git a/include/linux/ppp-comp.h b/include/linux/ppp-comp.h
85421index 4ea1d37..80f4b33 100644
85422--- a/include/linux/ppp-comp.h
85423+++ b/include/linux/ppp-comp.h
85424@@ -84,7 +84,7 @@ struct compressor {
85425 struct module *owner;
85426 /* Extra skb space needed by the compressor algorithm */
85427 unsigned int comp_extra;
85428-};
85429+} __do_const;
85430
85431 /*
85432 * The return value from decompress routine is the length of the
85433diff --git a/include/linux/preempt.h b/include/linux/preempt.h
85434index de83b4e..c4b997d 100644
85435--- a/include/linux/preempt.h
85436+++ b/include/linux/preempt.h
85437@@ -27,11 +27,16 @@ extern void preempt_count_sub(int val);
85438 #define preempt_count_dec_and_test() __preempt_count_dec_and_test()
85439 #endif
85440
85441+#define raw_preempt_count_add(val) __preempt_count_add(val)
85442+#define raw_preempt_count_sub(val) __preempt_count_sub(val)
85443+
85444 #define __preempt_count_inc() __preempt_count_add(1)
85445 #define __preempt_count_dec() __preempt_count_sub(1)
85446
85447 #define preempt_count_inc() preempt_count_add(1)
85448+#define raw_preempt_count_inc() raw_preempt_count_add(1)
85449 #define preempt_count_dec() preempt_count_sub(1)
85450+#define raw_preempt_count_dec() raw_preempt_count_sub(1)
85451
85452 #ifdef CONFIG_PREEMPT_COUNT
85453
85454@@ -41,6 +46,12 @@ do { \
85455 barrier(); \
85456 } while (0)
85457
85458+#define raw_preempt_disable() \
85459+do { \
85460+ raw_preempt_count_inc(); \
85461+ barrier(); \
85462+} while (0)
85463+
85464 #define sched_preempt_enable_no_resched() \
85465 do { \
85466 barrier(); \
85467@@ -49,6 +60,12 @@ do { \
85468
85469 #define preempt_enable_no_resched() sched_preempt_enable_no_resched()
85470
85471+#define raw_preempt_enable_no_resched() \
85472+do { \
85473+ barrier(); \
85474+ raw_preempt_count_dec(); \
85475+} while (0)
85476+
85477 #ifdef CONFIG_PREEMPT
85478 #define preempt_enable() \
85479 do { \
85480@@ -113,8 +130,10 @@ do { \
85481 * region.
85482 */
85483 #define preempt_disable() barrier()
85484+#define raw_preempt_disable() barrier()
85485 #define sched_preempt_enable_no_resched() barrier()
85486 #define preempt_enable_no_resched() barrier()
85487+#define raw_preempt_enable_no_resched() barrier()
85488 #define preempt_enable() barrier()
85489 #define preempt_check_resched() do { } while (0)
85490
85491@@ -128,11 +147,13 @@ do { \
85492 /*
85493 * Modules have no business playing preemption tricks.
85494 */
85495+#ifndef CONFIG_PAX_KERNEXEC
85496 #undef sched_preempt_enable_no_resched
85497 #undef preempt_enable_no_resched
85498 #undef preempt_enable_no_resched_notrace
85499 #undef preempt_check_resched
85500 #endif
85501+#endif
85502
85503 #define preempt_set_need_resched() \
85504 do { \
85505diff --git a/include/linux/printk.h b/include/linux/printk.h
85506index baa3f97..168cff1 100644
85507--- a/include/linux/printk.h
85508+++ b/include/linux/printk.h
85509@@ -121,6 +121,7 @@ void early_printk(const char *s, ...) { }
85510 #endif
85511
85512 typedef int(*printk_func_t)(const char *fmt, va_list args);
85513+extern int kptr_restrict;
85514
85515 #ifdef CONFIG_PRINTK
85516 asmlinkage __printf(5, 0)
85517@@ -156,7 +157,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
85518
85519 extern int printk_delay_msec;
85520 extern int dmesg_restrict;
85521-extern int kptr_restrict;
85522
85523 extern void wake_up_klogd(void);
85524
85525diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h
85526index b97bf2e..f14c92d4 100644
85527--- a/include/linux/proc_fs.h
85528+++ b/include/linux/proc_fs.h
85529@@ -17,8 +17,11 @@ extern void proc_flush_task(struct task_struct *);
85530 extern struct proc_dir_entry *proc_symlink(const char *,
85531 struct proc_dir_entry *, const char *);
85532 extern struct proc_dir_entry *proc_mkdir(const char *, struct proc_dir_entry *);
85533+extern struct proc_dir_entry *proc_mkdir_restrict(const char *, struct proc_dir_entry *);
85534 extern struct proc_dir_entry *proc_mkdir_data(const char *, umode_t,
85535 struct proc_dir_entry *, void *);
85536+extern struct proc_dir_entry *proc_mkdir_data_restrict(const char *, umode_t,
85537+ struct proc_dir_entry *, void *);
85538 extern struct proc_dir_entry *proc_mkdir_mode(const char *, umode_t,
85539 struct proc_dir_entry *);
85540
85541@@ -34,6 +37,19 @@ static inline struct proc_dir_entry *proc_create(
85542 return proc_create_data(name, mode, parent, proc_fops, NULL);
85543 }
85544
85545+static inline struct proc_dir_entry *proc_create_grsec(const char *name, umode_t mode,
85546+ struct proc_dir_entry *parent, const struct file_operations *proc_fops)
85547+{
85548+#ifdef CONFIG_GRKERNSEC_PROC_USER
85549+ return proc_create_data(name, S_IRUSR, parent, proc_fops, NULL);
85550+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
85551+ return proc_create_data(name, S_IRUSR | S_IRGRP, parent, proc_fops, NULL);
85552+#else
85553+ return proc_create_data(name, mode, parent, proc_fops, NULL);
85554+#endif
85555+}
85556+
85557+
85558 extern void proc_set_size(struct proc_dir_entry *, loff_t);
85559 extern void proc_set_user(struct proc_dir_entry *, kuid_t, kgid_t);
85560 extern void *PDE_DATA(const struct inode *);
85561@@ -56,8 +72,12 @@ static inline struct proc_dir_entry *proc_symlink(const char *name,
85562 struct proc_dir_entry *parent,const char *dest) { return NULL;}
85563 static inline struct proc_dir_entry *proc_mkdir(const char *name,
85564 struct proc_dir_entry *parent) {return NULL;}
85565+static inline struct proc_dir_entry *proc_mkdir_restrict(const char *name,
85566+ struct proc_dir_entry *parent) { return NULL; }
85567 static inline struct proc_dir_entry *proc_mkdir_data(const char *name,
85568 umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
85569+static inline struct proc_dir_entry *proc_mkdir_data_restrict(const char *name,
85570+ umode_t mode, struct proc_dir_entry *parent, void *data) { return NULL; }
85571 static inline struct proc_dir_entry *proc_mkdir_mode(const char *name,
85572 umode_t mode, struct proc_dir_entry *parent) { return NULL; }
85573 #define proc_create(name, mode, parent, proc_fops) ({NULL;})
85574@@ -79,7 +99,7 @@ struct net;
85575 static inline struct proc_dir_entry *proc_net_mkdir(
85576 struct net *net, const char *name, struct proc_dir_entry *parent)
85577 {
85578- return proc_mkdir_data(name, 0, parent, net);
85579+ return proc_mkdir_data_restrict(name, 0, parent, net);
85580 }
85581
85582 #endif /* _LINUX_PROC_FS_H */
85583diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h
85584index 42dfc61..8113a99 100644
85585--- a/include/linux/proc_ns.h
85586+++ b/include/linux/proc_ns.h
85587@@ -16,7 +16,7 @@ struct proc_ns_operations {
85588 struct ns_common *(*get)(struct task_struct *task);
85589 void (*put)(struct ns_common *ns);
85590 int (*install)(struct nsproxy *nsproxy, struct ns_common *ns);
85591-};
85592+} __do_const __randomize_layout;
85593
85594 extern const struct proc_ns_operations netns_operations;
85595 extern const struct proc_ns_operations utsns_operations;
85596diff --git a/include/linux/quota.h b/include/linux/quota.h
85597index d534e8e..782e604 100644
85598--- a/include/linux/quota.h
85599+++ b/include/linux/quota.h
85600@@ -75,7 +75,7 @@ struct kqid { /* Type in which we store the quota identifier */
85601
85602 extern bool qid_eq(struct kqid left, struct kqid right);
85603 extern bool qid_lt(struct kqid left, struct kqid right);
85604-extern qid_t from_kqid(struct user_namespace *to, struct kqid qid);
85605+extern qid_t from_kqid(struct user_namespace *to, struct kqid qid) __intentional_overflow(-1);
85606 extern qid_t from_kqid_munged(struct user_namespace *to, struct kqid qid);
85607 extern bool qid_valid(struct kqid qid);
85608
85609diff --git a/include/linux/random.h b/include/linux/random.h
85610index b05856e..0a9f14e 100644
85611--- a/include/linux/random.h
85612+++ b/include/linux/random.h
85613@@ -9,9 +9,19 @@
85614 #include <uapi/linux/random.h>
85615
85616 extern void add_device_randomness(const void *, unsigned int);
85617+
85618+static inline void add_latent_entropy(void)
85619+{
85620+
85621+#ifdef LATENT_ENTROPY_PLUGIN
85622+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
85623+#endif
85624+
85625+}
85626+
85627 extern void add_input_randomness(unsigned int type, unsigned int code,
85628- unsigned int value);
85629-extern void add_interrupt_randomness(int irq, int irq_flags);
85630+ unsigned int value) __latent_entropy;
85631+extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
85632
85633 extern void get_random_bytes(void *buf, int nbytes);
85634 extern void get_random_bytes_arch(void *buf, int nbytes);
85635@@ -22,10 +32,10 @@ extern int random_int_secret_init(void);
85636 extern const struct file_operations random_fops, urandom_fops;
85637 #endif
85638
85639-unsigned int get_random_int(void);
85640+unsigned int __intentional_overflow(-1) get_random_int(void);
85641 unsigned long randomize_range(unsigned long start, unsigned long end, unsigned long len);
85642
85643-u32 prandom_u32(void);
85644+u32 prandom_u32(void) __intentional_overflow(-1);
85645 void prandom_bytes(void *buf, size_t nbytes);
85646 void prandom_seed(u32 seed);
85647 void prandom_reseed_late(void);
85648@@ -37,6 +47,11 @@ struct rnd_state {
85649 u32 prandom_u32_state(struct rnd_state *state);
85650 void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
85651
85652+static inline unsigned long __intentional_overflow(-1) pax_get_random_long(void)
85653+{
85654+ return prandom_u32() + (sizeof(long) > 4 ? (unsigned long)prandom_u32() << 32 : 0);
85655+}
85656+
85657 /**
85658 * prandom_u32_max - returns a pseudo-random number in interval [0, ep_ro)
85659 * @ep_ro: right open interval endpoint
85660@@ -49,7 +64,7 @@ void prandom_bytes_state(struct rnd_state *state, void *buf, size_t nbytes);
85661 *
85662 * Returns: pseudo-random number in interval [0, ep_ro)
85663 */
85664-static inline u32 prandom_u32_max(u32 ep_ro)
85665+static inline u32 __intentional_overflow(-1) prandom_u32_max(u32 ep_ro)
85666 {
85667 return (u32)(((u64) prandom_u32() * ep_ro) >> 32);
85668 }
85669diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
85670index 378c5ee..aa84a47 100644
85671--- a/include/linux/rbtree_augmented.h
85672+++ b/include/linux/rbtree_augmented.h
85673@@ -90,7 +90,9 @@ rbname ## _rotate(struct rb_node *rb_old, struct rb_node *rb_new) \
85674 old->rbaugmented = rbcompute(old); \
85675 } \
85676 rbstatic const struct rb_augment_callbacks rbname = { \
85677- rbname ## _propagate, rbname ## _copy, rbname ## _rotate \
85678+ .propagate = rbname ## _propagate, \
85679+ .copy = rbname ## _copy, \
85680+ .rotate = rbname ## _rotate \
85681 };
85682
85683
85684diff --git a/include/linux/rculist.h b/include/linux/rculist.h
85685index a18b16f..2683096 100644
85686--- a/include/linux/rculist.h
85687+++ b/include/linux/rculist.h
85688@@ -29,8 +29,8 @@
85689 */
85690 static inline void INIT_LIST_HEAD_RCU(struct list_head *list)
85691 {
85692- ACCESS_ONCE(list->next) = list;
85693- ACCESS_ONCE(list->prev) = list;
85694+ ACCESS_ONCE_RW(list->next) = list;
85695+ ACCESS_ONCE_RW(list->prev) = list;
85696 }
85697
85698 /*
85699@@ -59,6 +59,9 @@ void __list_add_rcu(struct list_head *new,
85700 struct list_head *prev, struct list_head *next);
85701 #endif
85702
85703+void __pax_list_add_rcu(struct list_head *new,
85704+ struct list_head *prev, struct list_head *next);
85705+
85706 /**
85707 * list_add_rcu - add a new entry to rcu-protected list
85708 * @new: new entry to be added
85709@@ -80,6 +83,11 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
85710 __list_add_rcu(new, head, head->next);
85711 }
85712
85713+static inline void pax_list_add_rcu(struct list_head *new, struct list_head *head)
85714+{
85715+ __pax_list_add_rcu(new, head, head->next);
85716+}
85717+
85718 /**
85719 * list_add_tail_rcu - add a new entry to rcu-protected list
85720 * @new: new entry to be added
85721@@ -102,6 +110,12 @@ static inline void list_add_tail_rcu(struct list_head *new,
85722 __list_add_rcu(new, head->prev, head);
85723 }
85724
85725+static inline void pax_list_add_tail_rcu(struct list_head *new,
85726+ struct list_head *head)
85727+{
85728+ __pax_list_add_rcu(new, head->prev, head);
85729+}
85730+
85731 /**
85732 * list_del_rcu - deletes entry from list without re-initialization
85733 * @entry: the element to delete from the list.
85734@@ -132,6 +146,8 @@ static inline void list_del_rcu(struct list_head *entry)
85735 entry->prev = LIST_POISON2;
85736 }
85737
85738+extern void pax_list_del_rcu(struct list_head *entry);
85739+
85740 /**
85741 * hlist_del_init_rcu - deletes entry from hash list with re-initialization
85742 * @n: the element to delete from the hash list.
85743diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
85744index 7809749..1cd9315 100644
85745--- a/include/linux/rcupdate.h
85746+++ b/include/linux/rcupdate.h
85747@@ -333,7 +333,7 @@ extern struct srcu_struct tasks_rcu_exit_srcu;
85748 do { \
85749 rcu_all_qs(); \
85750 if (ACCESS_ONCE((t)->rcu_tasks_holdout)) \
85751- ACCESS_ONCE((t)->rcu_tasks_holdout) = false; \
85752+ ACCESS_ONCE_RW((t)->rcu_tasks_holdout) = false; \
85753 } while (0)
85754 #else /* #ifdef CONFIG_TASKS_RCU */
85755 #define TASKS_RCU(x) do { } while (0)
85756diff --git a/include/linux/reboot.h b/include/linux/reboot.h
85757index 67fc8fc..a90f7d8 100644
85758--- a/include/linux/reboot.h
85759+++ b/include/linux/reboot.h
85760@@ -47,9 +47,9 @@ extern void do_kernel_restart(char *cmd);
85761 */
85762
85763 extern void migrate_to_reboot_cpu(void);
85764-extern void machine_restart(char *cmd);
85765-extern void machine_halt(void);
85766-extern void machine_power_off(void);
85767+extern void machine_restart(char *cmd) __noreturn;
85768+extern void machine_halt(void) __noreturn;
85769+extern void machine_power_off(void) __noreturn;
85770
85771 extern void machine_shutdown(void);
85772 struct pt_regs;
85773@@ -60,9 +60,9 @@ extern void machine_crash_shutdown(struct pt_regs *);
85774 */
85775
85776 extern void kernel_restart_prepare(char *cmd);
85777-extern void kernel_restart(char *cmd);
85778-extern void kernel_halt(void);
85779-extern void kernel_power_off(void);
85780+extern void kernel_restart(char *cmd) __noreturn;
85781+extern void kernel_halt(void) __noreturn;
85782+extern void kernel_power_off(void) __noreturn;
85783
85784 extern int C_A_D; /* for sysctl */
85785 void ctrl_alt_del(void);
85786@@ -76,7 +76,7 @@ extern int orderly_poweroff(bool force);
85787 * Emergency restart, callable from an interrupt handler.
85788 */
85789
85790-extern void emergency_restart(void);
85791+extern void emergency_restart(void) __noreturn;
85792 #include <asm/emergency-restart.h>
85793
85794 #endif /* _LINUX_REBOOT_H */
85795diff --git a/include/linux/regset.h b/include/linux/regset.h
85796index 8e0c9fe..ac4d221 100644
85797--- a/include/linux/regset.h
85798+++ b/include/linux/regset.h
85799@@ -161,7 +161,8 @@ struct user_regset {
85800 unsigned int align;
85801 unsigned int bias;
85802 unsigned int core_note_type;
85803-};
85804+} __do_const;
85805+typedef struct user_regset __no_const user_regset_no_const;
85806
85807 /**
85808 * struct user_regset_view - available regsets
85809diff --git a/include/linux/relay.h b/include/linux/relay.h
85810index d7c8359..818daf5 100644
85811--- a/include/linux/relay.h
85812+++ b/include/linux/relay.h
85813@@ -157,7 +157,7 @@ struct rchan_callbacks
85814 * The callback should return 0 if successful, negative if not.
85815 */
85816 int (*remove_buf_file)(struct dentry *dentry);
85817-};
85818+} __no_const;
85819
85820 /*
85821 * CONFIG_RELAY kernel API, kernel/relay.c
85822diff --git a/include/linux/rio.h b/include/linux/rio.h
85823index 6bda06f..bf39a9b 100644
85824--- a/include/linux/rio.h
85825+++ b/include/linux/rio.h
85826@@ -358,7 +358,7 @@ struct rio_ops {
85827 int (*map_inb)(struct rio_mport *mport, dma_addr_t lstart,
85828 u64 rstart, u32 size, u32 flags);
85829 void (*unmap_inb)(struct rio_mport *mport, dma_addr_t lstart);
85830-};
85831+} __no_const;
85832
85833 #define RIO_RESOURCE_MEM 0x00000100
85834 #define RIO_RESOURCE_DOORBELL 0x00000200
85835diff --git a/include/linux/rmap.h b/include/linux/rmap.h
85836index c4c559a..6ba9a26 100644
85837--- a/include/linux/rmap.h
85838+++ b/include/linux/rmap.h
85839@@ -154,8 +154,8 @@ static inline void anon_vma_unlock_read(struct anon_vma *anon_vma)
85840 void anon_vma_init(void); /* create anon_vma_cachep */
85841 int anon_vma_prepare(struct vm_area_struct *);
85842 void unlink_anon_vmas(struct vm_area_struct *);
85843-int anon_vma_clone(struct vm_area_struct *, struct vm_area_struct *);
85844-int anon_vma_fork(struct vm_area_struct *, struct vm_area_struct *);
85845+int anon_vma_clone(struct vm_area_struct *, const struct vm_area_struct *);
85846+int anon_vma_fork(struct vm_area_struct *, const struct vm_area_struct *);
85847
85848 static inline void anon_vma_merge(struct vm_area_struct *vma,
85849 struct vm_area_struct *next)
85850diff --git a/include/linux/scatterlist.h b/include/linux/scatterlist.h
85851index ed8f9e70..999bc96 100644
85852--- a/include/linux/scatterlist.h
85853+++ b/include/linux/scatterlist.h
85854@@ -1,6 +1,7 @@
85855 #ifndef _LINUX_SCATTERLIST_H
85856 #define _LINUX_SCATTERLIST_H
85857
85858+#include <linux/sched.h>
85859 #include <linux/string.h>
85860 #include <linux/bug.h>
85861 #include <linux/mm.h>
85862@@ -114,6 +115,12 @@ static inline void sg_set_buf(struct scatterlist *sg, const void *buf,
85863 #ifdef CONFIG_DEBUG_SG
85864 BUG_ON(!virt_addr_valid(buf));
85865 #endif
85866+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
85867+ if (object_starts_on_stack(buf)) {
85868+ void *adjbuf = buf - current->stack + current->lowmem_stack;
85869+ sg_set_page(sg, virt_to_page(adjbuf), buflen, offset_in_page(adjbuf));
85870+ } else
85871+#endif
85872 sg_set_page(sg, virt_to_page(buf), buflen, offset_in_page(buf));
85873 }
85874
85875diff --git a/include/linux/sched.h b/include/linux/sched.h
85876index 51348f7..8c8b0ba 100644
85877--- a/include/linux/sched.h
85878+++ b/include/linux/sched.h
85879@@ -133,6 +133,7 @@ struct fs_struct;
85880 struct perf_event_context;
85881 struct blk_plug;
85882 struct filename;
85883+struct linux_binprm;
85884
85885 #define VMACACHE_BITS 2
85886 #define VMACACHE_SIZE (1U << VMACACHE_BITS)
85887@@ -420,7 +421,7 @@ extern char __sched_text_start[], __sched_text_end[];
85888 extern int in_sched_functions(unsigned long addr);
85889
85890 #define MAX_SCHEDULE_TIMEOUT LONG_MAX
85891-extern signed long schedule_timeout(signed long timeout);
85892+extern signed long schedule_timeout(signed long timeout) __intentional_overflow(-1);
85893 extern signed long schedule_timeout_interruptible(signed long timeout);
85894 extern signed long schedule_timeout_killable(signed long timeout);
85895 extern signed long schedule_timeout_uninterruptible(signed long timeout);
85896@@ -438,6 +439,19 @@ struct nsproxy;
85897 struct user_namespace;
85898
85899 #ifdef CONFIG_MMU
85900+
85901+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
85902+extern unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags);
85903+#else
85904+static inline unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
85905+{
85906+ return 0;
85907+}
85908+#endif
85909+
85910+extern bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset);
85911+extern unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset);
85912+
85913 extern void arch_pick_mmap_layout(struct mm_struct *mm);
85914 extern unsigned long
85915 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
85916@@ -736,6 +750,17 @@ struct signal_struct {
85917 #ifdef CONFIG_TASKSTATS
85918 struct taskstats *stats;
85919 #endif
85920+
85921+#ifdef CONFIG_GRKERNSEC
85922+ u32 curr_ip;
85923+ u32 saved_ip;
85924+ u32 gr_saddr;
85925+ u32 gr_daddr;
85926+ u16 gr_sport;
85927+ u16 gr_dport;
85928+ u8 used_accept:1;
85929+#endif
85930+
85931 #ifdef CONFIG_AUDIT
85932 unsigned audit_tty;
85933 unsigned audit_tty_log_passwd;
85934@@ -762,7 +787,7 @@ struct signal_struct {
85935 struct mutex cred_guard_mutex; /* guard against foreign influences on
85936 * credential calculations
85937 * (notably. ptrace) */
85938-};
85939+} __randomize_layout;
85940
85941 /*
85942 * Bits in flags field of signal_struct.
85943@@ -815,6 +840,14 @@ struct user_struct {
85944 struct key *session_keyring; /* UID's default session keyring */
85945 #endif
85946
85947+#ifdef CONFIG_GRKERNSEC_KERN_LOCKOUT
85948+ unsigned char kernel_banned;
85949+#endif
85950+#ifdef CONFIG_GRKERNSEC_BRUTE
85951+ unsigned char suid_banned;
85952+ unsigned long suid_ban_expires;
85953+#endif
85954+
85955 /* Hash table maintenance information */
85956 struct hlist_node uidhash_node;
85957 kuid_t uid;
85958@@ -822,7 +855,7 @@ struct user_struct {
85959 #ifdef CONFIG_PERF_EVENTS
85960 atomic_long_t locked_vm;
85961 #endif
85962-};
85963+} __randomize_layout;
85964
85965 extern int uids_sysfs_init(void);
85966
85967@@ -1286,6 +1319,9 @@ enum perf_event_task_context {
85968 struct task_struct {
85969 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
85970 void *stack;
85971+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
85972+ void *lowmem_stack;
85973+#endif
85974 atomic_t usage;
85975 unsigned int flags; /* per process flags, defined below */
85976 unsigned int ptrace;
85977@@ -1419,8 +1455,8 @@ struct task_struct {
85978 struct list_head thread_node;
85979
85980 struct completion *vfork_done; /* for vfork() */
85981- int __user *set_child_tid; /* CLONE_CHILD_SETTID */
85982- int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
85983+ pid_t __user *set_child_tid; /* CLONE_CHILD_SETTID */
85984+ pid_t __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
85985
85986 cputime_t utime, stime, utimescaled, stimescaled;
85987 cputime_t gtime;
85988@@ -1445,11 +1481,6 @@ struct task_struct {
85989 struct task_cputime cputime_expires;
85990 struct list_head cpu_timers[3];
85991
85992-/* process credentials */
85993- const struct cred __rcu *real_cred; /* objective and real subjective task
85994- * credentials (COW) */
85995- const struct cred __rcu *cred; /* effective (overridable) subjective task
85996- * credentials (COW) */
85997 char comm[TASK_COMM_LEN]; /* executable name excluding path
85998 - access with [gs]et_task_comm (which lock
85999 it with task_lock())
86000@@ -1467,6 +1498,10 @@ struct task_struct {
86001 #endif
86002 /* CPU-specific state of this task */
86003 struct thread_struct thread;
86004+/* thread_info moved to task_struct */
86005+#ifdef CONFIG_X86
86006+ struct thread_info tinfo;
86007+#endif
86008 /* filesystem information */
86009 struct fs_struct *fs;
86010 /* open file information */
86011@@ -1541,6 +1576,10 @@ struct task_struct {
86012 gfp_t lockdep_reclaim_gfp;
86013 #endif
86014
86015+/* process credentials */
86016+ const struct cred __rcu *real_cred; /* objective and real subjective task
86017+ * credentials (COW) */
86018+
86019 /* journalling filesystem info */
86020 void *journal_info;
86021
86022@@ -1579,6 +1618,10 @@ struct task_struct {
86023 /* cg_list protected by css_set_lock and tsk->alloc_lock */
86024 struct list_head cg_list;
86025 #endif
86026+
86027+ const struct cred __rcu *cred; /* effective (overridable) subjective task
86028+ * credentials (COW) */
86029+
86030 #ifdef CONFIG_FUTEX
86031 struct robust_list_head __user *robust_list;
86032 #ifdef CONFIG_COMPAT
86033@@ -1690,7 +1733,7 @@ struct task_struct {
86034 * Number of functions that haven't been traced
86035 * because of depth overrun.
86036 */
86037- atomic_t trace_overrun;
86038+ atomic_unchecked_t trace_overrun;
86039 /* Pause for the tracing */
86040 atomic_t tracing_graph_pause;
86041 #endif
86042@@ -1718,7 +1761,78 @@ struct task_struct {
86043 #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
86044 unsigned long task_state_change;
86045 #endif
86046-};
86047+
86048+#ifdef CONFIG_GRKERNSEC
86049+ /* grsecurity */
86050+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
86051+ u64 exec_id;
86052+#endif
86053+#ifdef CONFIG_GRKERNSEC_SETXID
86054+ const struct cred *delayed_cred;
86055+#endif
86056+ struct dentry *gr_chroot_dentry;
86057+ struct acl_subject_label *acl;
86058+ struct acl_subject_label *tmpacl;
86059+ struct acl_role_label *role;
86060+ struct file *exec_file;
86061+ unsigned long brute_expires;
86062+ u16 acl_role_id;
86063+ u8 inherited;
86064+ /* is this the task that authenticated to the special role */
86065+ u8 acl_sp_role;
86066+ u8 is_writable;
86067+ u8 brute;
86068+ u8 gr_is_chrooted;
86069+#endif
86070+
86071+} __randomize_layout;
86072+
86073+#define MF_PAX_PAGEEXEC 0x01000000 /* Paging based non-executable pages */
86074+#define MF_PAX_EMUTRAMP 0x02000000 /* Emulate trampolines */
86075+#define MF_PAX_MPROTECT 0x04000000 /* Restrict mprotect() */
86076+#define MF_PAX_RANDMMAP 0x08000000 /* Randomize mmap() base */
86077+/*#define MF_PAX_RANDEXEC 0x10000000*/ /* Randomize ET_EXEC base */
86078+#define MF_PAX_SEGMEXEC 0x20000000 /* Segmentation based non-executable pages */
86079+
86080+#ifdef CONFIG_PAX_SOFTMODE
86081+extern int pax_softmode;
86082+#endif
86083+
86084+extern int pax_check_flags(unsigned long *);
86085+#define PAX_PARSE_FLAGS_FALLBACK (~0UL)
86086+
86087+/* if tsk != current then task_lock must be held on it */
86088+#if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
86089+static inline unsigned long pax_get_flags(struct task_struct *tsk)
86090+{
86091+ if (likely(tsk->mm))
86092+ return tsk->mm->pax_flags;
86093+ else
86094+ return 0UL;
86095+}
86096+
86097+/* if tsk != current then task_lock must be held on it */
86098+static inline long pax_set_flags(struct task_struct *tsk, unsigned long flags)
86099+{
86100+ if (likely(tsk->mm)) {
86101+ tsk->mm->pax_flags = flags;
86102+ return 0;
86103+ }
86104+ return -EINVAL;
86105+}
86106+#endif
86107+
86108+#ifdef CONFIG_PAX_HAVE_ACL_FLAGS
86109+extern void pax_set_initial_flags(struct linux_binprm *bprm);
86110+#elif defined(CONFIG_PAX_HOOK_ACL_FLAGS)
86111+extern void (*pax_set_initial_flags_func)(struct linux_binprm *bprm);
86112+#endif
86113+
86114+struct path;
86115+extern char *pax_get_path(const struct path *path, char *buf, int buflen);
86116+extern void pax_report_fault(struct pt_regs *regs, void *pc, void *sp);
86117+extern void pax_report_insns(struct pt_regs *regs, void *pc, void *sp);
86118+extern void pax_report_refcount_overflow(struct pt_regs *regs);
86119
86120 /* Future-safe accessor for struct task_struct's cpus_allowed. */
86121 #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
86122@@ -1801,7 +1915,7 @@ struct pid_namespace;
86123 pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type,
86124 struct pid_namespace *ns);
86125
86126-static inline pid_t task_pid_nr(struct task_struct *tsk)
86127+static inline pid_t task_pid_nr(const struct task_struct *tsk)
86128 {
86129 return tsk->pid;
86130 }
86131@@ -2169,6 +2283,25 @@ extern u64 sched_clock_cpu(int cpu);
86132
86133 extern void sched_clock_init(void);
86134
86135+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
86136+static inline void populate_stack(void)
86137+{
86138+ struct task_struct *curtask = current;
86139+ int c;
86140+ int *ptr = curtask->stack;
86141+ int *end = curtask->stack + THREAD_SIZE;
86142+
86143+ while (ptr < end) {
86144+ c = *(volatile int *)ptr;
86145+ ptr += PAGE_SIZE/sizeof(int);
86146+ }
86147+}
86148+#else
86149+static inline void populate_stack(void)
86150+{
86151+}
86152+#endif
86153+
86154 #ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
86155 static inline void sched_clock_tick(void)
86156 {
86157@@ -2302,7 +2435,9 @@ void yield(void);
86158 extern struct exec_domain default_exec_domain;
86159
86160 union thread_union {
86161+#ifndef CONFIG_X86
86162 struct thread_info thread_info;
86163+#endif
86164 unsigned long stack[THREAD_SIZE/sizeof(long)];
86165 };
86166
86167@@ -2335,6 +2470,7 @@ extern struct pid_namespace init_pid_ns;
86168 */
86169
86170 extern struct task_struct *find_task_by_vpid(pid_t nr);
86171+extern struct task_struct *find_task_by_vpid_unrestricted(pid_t nr);
86172 extern struct task_struct *find_task_by_pid_ns(pid_t nr,
86173 struct pid_namespace *ns);
86174
86175@@ -2499,7 +2635,7 @@ extern void __cleanup_sighand(struct sighand_struct *);
86176 extern void exit_itimers(struct signal_struct *);
86177 extern void flush_itimer_signals(void);
86178
86179-extern void do_group_exit(int);
86180+extern __noreturn void do_group_exit(int);
86181
86182 extern int do_execve(struct filename *,
86183 const char __user * const __user *,
86184@@ -2720,9 +2856,9 @@ static inline unsigned long *end_of_stack(struct task_struct *p)
86185 #define task_stack_end_corrupted(task) \
86186 (*(end_of_stack(task)) != STACK_END_MAGIC)
86187
86188-static inline int object_is_on_stack(void *obj)
86189+static inline int object_starts_on_stack(const void *obj)
86190 {
86191- void *stack = task_stack_page(current);
86192+ const void *stack = task_stack_page(current);
86193
86194 return (obj >= stack) && (obj < (stack + THREAD_SIZE));
86195 }
86196diff --git a/include/linux/sched/sysctl.h b/include/linux/sched/sysctl.h
86197index 596a0e0..bea77ec 100644
86198--- a/include/linux/sched/sysctl.h
86199+++ b/include/linux/sched/sysctl.h
86200@@ -34,6 +34,7 @@ enum { sysctl_hung_task_timeout_secs = 0 };
86201 #define DEFAULT_MAX_MAP_COUNT (USHRT_MAX - MAPCOUNT_ELF_CORE_MARGIN)
86202
86203 extern int sysctl_max_map_count;
86204+extern unsigned long sysctl_heap_stack_gap;
86205
86206 extern unsigned int sysctl_sched_latency;
86207 extern unsigned int sysctl_sched_min_granularity;
86208diff --git a/include/linux/security.h b/include/linux/security.h
86209index a1b7dbd..036f47f 100644
86210--- a/include/linux/security.h
86211+++ b/include/linux/security.h
86212@@ -27,6 +27,7 @@
86213 #include <linux/slab.h>
86214 #include <linux/err.h>
86215 #include <linux/string.h>
86216+#include <linux/grsecurity.h>
86217
86218 struct linux_binprm;
86219 struct cred;
86220@@ -116,8 +117,6 @@ struct seq_file;
86221
86222 extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);
86223
86224-void reset_security_ops(void);
86225-
86226 #ifdef CONFIG_MMU
86227 extern unsigned long mmap_min_addr;
86228 extern unsigned long dac_mmap_min_addr;
86229@@ -1756,7 +1755,7 @@ struct security_operations {
86230 struct audit_context *actx);
86231 void (*audit_rule_free) (void *lsmrule);
86232 #endif /* CONFIG_AUDIT */
86233-};
86234+} __randomize_layout;
86235
86236 /* prototypes */
86237 extern int security_init(void);
86238diff --git a/include/linux/semaphore.h b/include/linux/semaphore.h
86239index dc368b8..e895209 100644
86240--- a/include/linux/semaphore.h
86241+++ b/include/linux/semaphore.h
86242@@ -37,7 +37,7 @@ static inline void sema_init(struct semaphore *sem, int val)
86243 }
86244
86245 extern void down(struct semaphore *sem);
86246-extern int __must_check down_interruptible(struct semaphore *sem);
86247+extern int __must_check down_interruptible(struct semaphore *sem) __intentional_overflow(-1);
86248 extern int __must_check down_killable(struct semaphore *sem);
86249 extern int __must_check down_trylock(struct semaphore *sem);
86250 extern int __must_check down_timeout(struct semaphore *sem, long jiffies);
86251diff --git a/include/linux/seq_file.h b/include/linux/seq_file.h
86252index afbb1fd..e1d205d 100644
86253--- a/include/linux/seq_file.h
86254+++ b/include/linux/seq_file.h
86255@@ -27,6 +27,9 @@ struct seq_file {
86256 struct mutex lock;
86257 const struct seq_operations *op;
86258 int poll_event;
86259+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
86260+ u64 exec_id;
86261+#endif
86262 #ifdef CONFIG_USER_NS
86263 struct user_namespace *user_ns;
86264 #endif
86265@@ -39,6 +42,7 @@ struct seq_operations {
86266 void * (*next) (struct seq_file *m, void *v, loff_t *pos);
86267 int (*show) (struct seq_file *m, void *v);
86268 };
86269+typedef struct seq_operations __no_const seq_operations_no_const;
86270
86271 #define SEQ_SKIP 1
86272
86273@@ -111,6 +115,7 @@ void seq_pad(struct seq_file *m, char c);
86274
86275 char *mangle_path(char *s, const char *p, const char *esc);
86276 int seq_open(struct file *, const struct seq_operations *);
86277+int seq_open_restrict(struct file *, const struct seq_operations *);
86278 ssize_t seq_read(struct file *, char __user *, size_t, loff_t *);
86279 loff_t seq_lseek(struct file *, loff_t, int);
86280 int seq_release(struct inode *, struct file *);
86281@@ -128,6 +133,7 @@ int seq_path_root(struct seq_file *m, const struct path *path,
86282 const struct path *root, const char *esc);
86283
86284 int single_open(struct file *, int (*)(struct seq_file *, void *), void *);
86285+int single_open_restrict(struct file *, int (*)(struct seq_file *, void *), void *);
86286 int single_open_size(struct file *, int (*)(struct seq_file *, void *), void *, size_t);
86287 int single_release(struct inode *, struct file *);
86288 void *__seq_open_private(struct file *, const struct seq_operations *, int);
86289diff --git a/include/linux/shm.h b/include/linux/shm.h
86290index 6fb8016..ab4465e 100644
86291--- a/include/linux/shm.h
86292+++ b/include/linux/shm.h
86293@@ -22,6 +22,10 @@ struct shmid_kernel /* private to the kernel */
86294 /* The task created the shm object. NULL if the task is dead. */
86295 struct task_struct *shm_creator;
86296 struct list_head shm_clist; /* list by creator */
86297+#ifdef CONFIG_GRKERNSEC
86298+ u64 shm_createtime;
86299+ pid_t shm_lapid;
86300+#endif
86301 };
86302
86303 /* shm_mode upper byte flags */
86304diff --git a/include/linux/signal.h b/include/linux/signal.h
86305index ab1e039..ad4229e 100644
86306--- a/include/linux/signal.h
86307+++ b/include/linux/signal.h
86308@@ -289,7 +289,7 @@ static inline void allow_signal(int sig)
86309 * know it'll be handled, so that they don't get converted to
86310 * SIGKILL or just silently dropped.
86311 */
86312- kernel_sigaction(sig, (__force __sighandler_t)2);
86313+ kernel_sigaction(sig, (__force_user __sighandler_t)2);
86314 }
86315
86316 static inline void disallow_signal(int sig)
86317diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
86318index bdccc4b..e9f8670 100644
86319--- a/include/linux/skbuff.h
86320+++ b/include/linux/skbuff.h
86321@@ -771,7 +771,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t priority, int flags,
86322 int node);
86323 struct sk_buff *__build_skb(void *data, unsigned int frag_size);
86324 struct sk_buff *build_skb(void *data, unsigned int frag_size);
86325-static inline struct sk_buff *alloc_skb(unsigned int size,
86326+static inline struct sk_buff * __intentional_overflow(0) alloc_skb(unsigned int size,
86327 gfp_t priority)
86328 {
86329 return __alloc_skb(size, priority, 0, NUMA_NO_NODE);
86330@@ -1967,7 +1967,7 @@ static inline u32 skb_inner_network_header_len(const struct sk_buff *skb)
86331 return skb->inner_transport_header - skb->inner_network_header;
86332 }
86333
86334-static inline int skb_network_offset(const struct sk_buff *skb)
86335+static inline int __intentional_overflow(0) skb_network_offset(const struct sk_buff *skb)
86336 {
86337 return skb_network_header(skb) - skb->data;
86338 }
86339@@ -2027,7 +2027,7 @@ static inline int pskb_network_may_pull(struct sk_buff *skb, unsigned int len)
86340 * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
86341 */
86342 #ifndef NET_SKB_PAD
86343-#define NET_SKB_PAD max(32, L1_CACHE_BYTES)
86344+#define NET_SKB_PAD max(_AC(32,UL), L1_CACHE_BYTES)
86345 #endif
86346
86347 int ___pskb_trim(struct sk_buff *skb, unsigned int len);
86348@@ -2669,9 +2669,9 @@ struct sk_buff *skb_recv_datagram(struct sock *sk, unsigned flags, int noblock,
86349 int *err);
86350 unsigned int datagram_poll(struct file *file, struct socket *sock,
86351 struct poll_table_struct *wait);
86352-int skb_copy_datagram_iter(const struct sk_buff *from, int offset,
86353+int __intentional_overflow(0) skb_copy_datagram_iter(const struct sk_buff *from, int offset,
86354 struct iov_iter *to, int size);
86355-static inline int skb_copy_datagram_msg(const struct sk_buff *from, int offset,
86356+static inline int __intentional_overflow(2,4) skb_copy_datagram_msg(const struct sk_buff *from, int offset,
86357 struct msghdr *msg, int size)
86358 {
86359 return skb_copy_datagram_iter(from, offset, &msg->msg_iter, size);
86360@@ -3193,6 +3193,9 @@ static inline void nf_reset(struct sk_buff *skb)
86361 nf_bridge_put(skb->nf_bridge);
86362 skb->nf_bridge = NULL;
86363 #endif
86364+#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE)
86365+ skb->nf_trace = 0;
86366+#endif
86367 }
86368
86369 static inline void nf_reset_trace(struct sk_buff *skb)
86370diff --git a/include/linux/slab.h b/include/linux/slab.h
86371index 76f1fee..d95e6d2 100644
86372--- a/include/linux/slab.h
86373+++ b/include/linux/slab.h
86374@@ -14,15 +14,29 @@
86375 #include <linux/gfp.h>
86376 #include <linux/types.h>
86377 #include <linux/workqueue.h>
86378-
86379+#include <linux/err.h>
86380
86381 /*
86382 * Flags to pass to kmem_cache_create().
86383 * The ones marked DEBUG are only valid if CONFIG_SLAB_DEBUG is set.
86384 */
86385 #define SLAB_DEBUG_FREE 0x00000100UL /* DEBUG: Perform (expensive) checks on free */
86386+
86387+#ifdef CONFIG_PAX_USERCOPY_SLABS
86388+#define SLAB_USERCOPY 0x00000200UL /* PaX: Allow copying objs to/from userland */
86389+#else
86390+#define SLAB_USERCOPY 0x00000000UL
86391+#endif
86392+
86393 #define SLAB_RED_ZONE 0x00000400UL /* DEBUG: Red zone objs in a cache */
86394 #define SLAB_POISON 0x00000800UL /* DEBUG: Poison objects */
86395+
86396+#ifdef CONFIG_PAX_MEMORY_SANITIZE
86397+#define SLAB_NO_SANITIZE 0x00001000UL /* PaX: Do not sanitize objs on free */
86398+#else
86399+#define SLAB_NO_SANITIZE 0x00000000UL
86400+#endif
86401+
86402 #define SLAB_HWCACHE_ALIGN 0x00002000UL /* Align objs on cache lines */
86403 #define SLAB_CACHE_DMA 0x00004000UL /* Use GFP_DMA memory */
86404 #define SLAB_STORE_USER 0x00010000UL /* DEBUG: Store the last owner for bug hunting */
86405@@ -98,10 +112,13 @@
86406 * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can.
86407 * Both make kfree a no-op.
86408 */
86409-#define ZERO_SIZE_PTR ((void *)16)
86410+#define ZERO_SIZE_PTR \
86411+({ \
86412+ BUILD_BUG_ON(!(MAX_ERRNO & ~PAGE_MASK));\
86413+ (void *)(-MAX_ERRNO-1L); \
86414+})
86415
86416-#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) <= \
86417- (unsigned long)ZERO_SIZE_PTR)
86418+#define ZERO_OR_NULL_PTR(x) ((unsigned long)(x) - 1 >= (unsigned long)ZERO_SIZE_PTR - 1)
86419
86420 #include <linux/kmemleak.h>
86421 #include <linux/kasan.h>
86422@@ -143,6 +160,8 @@ void * __must_check krealloc(const void *, size_t, gfp_t);
86423 void kfree(const void *);
86424 void kzfree(const void *);
86425 size_t ksize(const void *);
86426+const char *check_heap_object(const void *ptr, unsigned long n);
86427+bool is_usercopy_object(const void *ptr);
86428
86429 /*
86430 * Some archs want to perform DMA into kmalloc caches and need a guaranteed
86431@@ -235,6 +254,10 @@ extern struct kmem_cache *kmalloc_caches[KMALLOC_SHIFT_HIGH + 1];
86432 extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
86433 #endif
86434
86435+#ifdef CONFIG_PAX_USERCOPY_SLABS
86436+extern struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
86437+#endif
86438+
86439 /*
86440 * Figure out which kmalloc slab an allocation of a certain size
86441 * belongs to.
86442@@ -243,7 +266,7 @@ extern struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
86443 * 2 = 120 .. 192 bytes
86444 * n = 2^(n-1) .. 2^n -1
86445 */
86446-static __always_inline int kmalloc_index(size_t size)
86447+static __always_inline __size_overflow(1) int kmalloc_index(size_t size)
86448 {
86449 if (!size)
86450 return 0;
86451@@ -286,15 +309,15 @@ static __always_inline int kmalloc_index(size_t size)
86452 }
86453 #endif /* !CONFIG_SLOB */
86454
86455-void *__kmalloc(size_t size, gfp_t flags);
86456+void *__kmalloc(size_t size, gfp_t flags) __alloc_size(1) __size_overflow(1);
86457 void *kmem_cache_alloc(struct kmem_cache *, gfp_t flags);
86458 void kmem_cache_free(struct kmem_cache *, void *);
86459
86460 #ifdef CONFIG_NUMA
86461-void *__kmalloc_node(size_t size, gfp_t flags, int node);
86462+void *__kmalloc_node(size_t size, gfp_t flags, int node) __alloc_size(1) __size_overflow(1);
86463 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
86464 #else
86465-static __always_inline void *__kmalloc_node(size_t size, gfp_t flags, int node)
86466+static __always_inline void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
86467 {
86468 return __kmalloc(size, flags);
86469 }
86470diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
86471index 33d0490..70a6313 100644
86472--- a/include/linux/slab_def.h
86473+++ b/include/linux/slab_def.h
86474@@ -40,7 +40,7 @@ struct kmem_cache {
86475 /* 4) cache creation/removal */
86476 const char *name;
86477 struct list_head list;
86478- int refcount;
86479+ atomic_t refcount;
86480 int object_size;
86481 int align;
86482
86483@@ -56,10 +56,14 @@ struct kmem_cache {
86484 unsigned long node_allocs;
86485 unsigned long node_frees;
86486 unsigned long node_overflow;
86487- atomic_t allochit;
86488- atomic_t allocmiss;
86489- atomic_t freehit;
86490- atomic_t freemiss;
86491+ atomic_unchecked_t allochit;
86492+ atomic_unchecked_t allocmiss;
86493+ atomic_unchecked_t freehit;
86494+ atomic_unchecked_t freemiss;
86495+#ifdef CONFIG_PAX_MEMORY_SANITIZE
86496+ atomic_unchecked_t sanitized;
86497+ atomic_unchecked_t not_sanitized;
86498+#endif
86499
86500 /*
86501 * If debugging is enabled, then the allocator can add additional
86502diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
86503index 3388511..6252f90 100644
86504--- a/include/linux/slub_def.h
86505+++ b/include/linux/slub_def.h
86506@@ -74,7 +74,7 @@ struct kmem_cache {
86507 struct kmem_cache_order_objects max;
86508 struct kmem_cache_order_objects min;
86509 gfp_t allocflags; /* gfp flags to use on each alloc */
86510- int refcount; /* Refcount for slab cache destroy */
86511+ atomic_t refcount; /* Refcount for slab cache destroy */
86512 void (*ctor)(void *);
86513 int inuse; /* Offset to metadata */
86514 int align; /* Alignment */
86515diff --git a/include/linux/smp.h b/include/linux/smp.h
86516index be91db2..3f23232 100644
86517--- a/include/linux/smp.h
86518+++ b/include/linux/smp.h
86519@@ -183,7 +183,9 @@ static inline void smp_init(void) { }
86520 #endif
86521
86522 #define get_cpu() ({ preempt_disable(); smp_processor_id(); })
86523+#define raw_get_cpu() ({ raw_preempt_disable(); raw_smp_processor_id(); })
86524 #define put_cpu() preempt_enable()
86525+#define raw_put_cpu_no_resched() raw_preempt_enable_no_resched()
86526
86527 /*
86528 * Callback to arch code if there's nosmp or maxcpus=0 on the
86529diff --git a/include/linux/sock_diag.h b/include/linux/sock_diag.h
86530index 46cca4c..3323536 100644
86531--- a/include/linux/sock_diag.h
86532+++ b/include/linux/sock_diag.h
86533@@ -11,7 +11,7 @@ struct sock;
86534 struct sock_diag_handler {
86535 __u8 family;
86536 int (*dump)(struct sk_buff *skb, struct nlmsghdr *nlh);
86537-};
86538+} __do_const;
86539
86540 int sock_diag_register(const struct sock_diag_handler *h);
86541 void sock_diag_unregister(const struct sock_diag_handler *h);
86542diff --git a/include/linux/sonet.h b/include/linux/sonet.h
86543index 680f9a3..f13aeb0 100644
86544--- a/include/linux/sonet.h
86545+++ b/include/linux/sonet.h
86546@@ -7,7 +7,7 @@
86547 #include <uapi/linux/sonet.h>
86548
86549 struct k_sonet_stats {
86550-#define __HANDLE_ITEM(i) atomic_t i
86551+#define __HANDLE_ITEM(i) atomic_unchecked_t i
86552 __SONET_ITEMS
86553 #undef __HANDLE_ITEM
86554 };
86555diff --git a/include/linux/sunrpc/addr.h b/include/linux/sunrpc/addr.h
86556index 07d8e53..dc934c9 100644
86557--- a/include/linux/sunrpc/addr.h
86558+++ b/include/linux/sunrpc/addr.h
86559@@ -23,9 +23,9 @@ static inline unsigned short rpc_get_port(const struct sockaddr *sap)
86560 {
86561 switch (sap->sa_family) {
86562 case AF_INET:
86563- return ntohs(((struct sockaddr_in *)sap)->sin_port);
86564+ return ntohs(((const struct sockaddr_in *)sap)->sin_port);
86565 case AF_INET6:
86566- return ntohs(((struct sockaddr_in6 *)sap)->sin6_port);
86567+ return ntohs(((const struct sockaddr_in6 *)sap)->sin6_port);
86568 }
86569 return 0;
86570 }
86571@@ -58,7 +58,7 @@ static inline bool __rpc_cmp_addr4(const struct sockaddr *sap1,
86572 static inline bool __rpc_copy_addr4(struct sockaddr *dst,
86573 const struct sockaddr *src)
86574 {
86575- const struct sockaddr_in *ssin = (struct sockaddr_in *) src;
86576+ const struct sockaddr_in *ssin = (const struct sockaddr_in *) src;
86577 struct sockaddr_in *dsin = (struct sockaddr_in *) dst;
86578
86579 dsin->sin_family = ssin->sin_family;
86580@@ -164,7 +164,7 @@ static inline u32 rpc_get_scope_id(const struct sockaddr *sa)
86581 if (sa->sa_family != AF_INET6)
86582 return 0;
86583
86584- return ((struct sockaddr_in6 *) sa)->sin6_scope_id;
86585+ return ((const struct sockaddr_in6 *) sa)->sin6_scope_id;
86586 }
86587
86588 #endif /* _LINUX_SUNRPC_ADDR_H */
86589diff --git a/include/linux/sunrpc/clnt.h b/include/linux/sunrpc/clnt.h
86590index 598ba80..d90cba6 100644
86591--- a/include/linux/sunrpc/clnt.h
86592+++ b/include/linux/sunrpc/clnt.h
86593@@ -100,7 +100,7 @@ struct rpc_procinfo {
86594 unsigned int p_timer; /* Which RTT timer to use */
86595 u32 p_statidx; /* Which procedure to account */
86596 const char * p_name; /* name of procedure */
86597-};
86598+} __do_const;
86599
86600 #ifdef __KERNEL__
86601
86602diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h
86603index fae6fb9..023fbcd 100644
86604--- a/include/linux/sunrpc/svc.h
86605+++ b/include/linux/sunrpc/svc.h
86606@@ -420,7 +420,7 @@ struct svc_procedure {
86607 unsigned int pc_count; /* call count */
86608 unsigned int pc_cachetype; /* cache info (NFS) */
86609 unsigned int pc_xdrressize; /* maximum size of XDR reply */
86610-};
86611+} __do_const;
86612
86613 /*
86614 * Function prototypes.
86615diff --git a/include/linux/sunrpc/svc_rdma.h b/include/linux/sunrpc/svc_rdma.h
86616index df8edf8..d140fec 100644
86617--- a/include/linux/sunrpc/svc_rdma.h
86618+++ b/include/linux/sunrpc/svc_rdma.h
86619@@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
86620 extern unsigned int svcrdma_max_requests;
86621 extern unsigned int svcrdma_max_req_size;
86622
86623-extern atomic_t rdma_stat_recv;
86624-extern atomic_t rdma_stat_read;
86625-extern atomic_t rdma_stat_write;
86626-extern atomic_t rdma_stat_sq_starve;
86627-extern atomic_t rdma_stat_rq_starve;
86628-extern atomic_t rdma_stat_rq_poll;
86629-extern atomic_t rdma_stat_rq_prod;
86630-extern atomic_t rdma_stat_sq_poll;
86631-extern atomic_t rdma_stat_sq_prod;
86632+extern atomic_unchecked_t rdma_stat_recv;
86633+extern atomic_unchecked_t rdma_stat_read;
86634+extern atomic_unchecked_t rdma_stat_write;
86635+extern atomic_unchecked_t rdma_stat_sq_starve;
86636+extern atomic_unchecked_t rdma_stat_rq_starve;
86637+extern atomic_unchecked_t rdma_stat_rq_poll;
86638+extern atomic_unchecked_t rdma_stat_rq_prod;
86639+extern atomic_unchecked_t rdma_stat_sq_poll;
86640+extern atomic_unchecked_t rdma_stat_sq_prod;
86641
86642 /*
86643 * Contexts are built when an RDMA request is created and are a
86644diff --git a/include/linux/sunrpc/svcauth.h b/include/linux/sunrpc/svcauth.h
86645index 8d71d65..f79586e 100644
86646--- a/include/linux/sunrpc/svcauth.h
86647+++ b/include/linux/sunrpc/svcauth.h
86648@@ -120,7 +120,7 @@ struct auth_ops {
86649 int (*release)(struct svc_rqst *rq);
86650 void (*domain_release)(struct auth_domain *);
86651 int (*set_client)(struct svc_rqst *rq);
86652-};
86653+} __do_const;
86654
86655 #define SVC_GARBAGE 1
86656 #define SVC_SYSERR 2
86657diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
86658index e7a018e..49f8b17 100644
86659--- a/include/linux/swiotlb.h
86660+++ b/include/linux/swiotlb.h
86661@@ -60,7 +60,8 @@ extern void
86662
86663 extern void
86664 swiotlb_free_coherent(struct device *hwdev, size_t size,
86665- void *vaddr, dma_addr_t dma_handle);
86666+ void *vaddr, dma_addr_t dma_handle,
86667+ struct dma_attrs *attrs);
86668
86669 extern dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
86670 unsigned long offset, size_t size,
86671diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
86672index 76d1e38..200776e 100644
86673--- a/include/linux/syscalls.h
86674+++ b/include/linux/syscalls.h
86675@@ -102,7 +102,12 @@ union bpf_attr;
86676 #define __TYPE_IS_L(t) (__same_type((t)0, 0L))
86677 #define __TYPE_IS_UL(t) (__same_type((t)0, 0UL))
86678 #define __TYPE_IS_LL(t) (__same_type((t)0, 0LL) || __same_type((t)0, 0ULL))
86679-#define __SC_LONG(t, a) __typeof(__builtin_choose_expr(__TYPE_IS_LL(t), 0LL, 0L)) a
86680+#define __SC_LONG(t, a) __typeof__( \
86681+ __builtin_choose_expr( \
86682+ sizeof(t) > sizeof(int), \
86683+ (t) 0, \
86684+ __builtin_choose_expr(__type_is_unsigned(t), 0UL, 0L) \
86685+ )) a
86686 #define __SC_CAST(t, a) (t) a
86687 #define __SC_ARGS(t, a) a
86688 #define __SC_TEST(t, a) (void)BUILD_BUG_ON_ZERO(!__TYPE_IS_LL(t) && sizeof(t) > sizeof(long))
86689@@ -384,11 +389,11 @@ asmlinkage long sys_sync(void);
86690 asmlinkage long sys_fsync(unsigned int fd);
86691 asmlinkage long sys_fdatasync(unsigned int fd);
86692 asmlinkage long sys_bdflush(int func, long data);
86693-asmlinkage long sys_mount(char __user *dev_name, char __user *dir_name,
86694- char __user *type, unsigned long flags,
86695+asmlinkage long sys_mount(const char __user *dev_name, const char __user *dir_name,
86696+ const char __user *type, unsigned long flags,
86697 void __user *data);
86698-asmlinkage long sys_umount(char __user *name, int flags);
86699-asmlinkage long sys_oldumount(char __user *name);
86700+asmlinkage long sys_umount(const char __user *name, int flags);
86701+asmlinkage long sys_oldumount(const char __user *name);
86702 asmlinkage long sys_truncate(const char __user *path, long length);
86703 asmlinkage long sys_ftruncate(unsigned int fd, unsigned long length);
86704 asmlinkage long sys_stat(const char __user *filename,
86705@@ -604,7 +609,7 @@ asmlinkage long sys_getsockname(int, struct sockaddr __user *, int __user *);
86706 asmlinkage long sys_getpeername(int, struct sockaddr __user *, int __user *);
86707 asmlinkage long sys_send(int, void __user *, size_t, unsigned);
86708 asmlinkage long sys_sendto(int, void __user *, size_t, unsigned,
86709- struct sockaddr __user *, int);
86710+ struct sockaddr __user *, int) __intentional_overflow(0);
86711 asmlinkage long sys_sendmsg(int fd, struct user_msghdr __user *msg, unsigned flags);
86712 asmlinkage long sys_sendmmsg(int fd, struct mmsghdr __user *msg,
86713 unsigned int vlen, unsigned flags);
86714@@ -663,10 +668,10 @@ asmlinkage long sys_msgctl(int msqid, int cmd, struct msqid_ds __user *buf);
86715
86716 asmlinkage long sys_semget(key_t key, int nsems, int semflg);
86717 asmlinkage long sys_semop(int semid, struct sembuf __user *sops,
86718- unsigned nsops);
86719+ long nsops);
86720 asmlinkage long sys_semctl(int semid, int semnum, int cmd, unsigned long arg);
86721 asmlinkage long sys_semtimedop(int semid, struct sembuf __user *sops,
86722- unsigned nsops,
86723+ long nsops,
86724 const struct timespec __user *timeout);
86725 asmlinkage long sys_shmat(int shmid, char __user *shmaddr, int shmflg);
86726 asmlinkage long sys_shmget(key_t key, size_t size, int flag);
86727diff --git a/include/linux/syscore_ops.h b/include/linux/syscore_ops.h
86728index 27b3b0b..e093dd9 100644
86729--- a/include/linux/syscore_ops.h
86730+++ b/include/linux/syscore_ops.h
86731@@ -16,7 +16,7 @@ struct syscore_ops {
86732 int (*suspend)(void);
86733 void (*resume)(void);
86734 void (*shutdown)(void);
86735-};
86736+} __do_const;
86737
86738 extern void register_syscore_ops(struct syscore_ops *ops);
86739 extern void unregister_syscore_ops(struct syscore_ops *ops);
86740diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
86741index b7361f8..341a15a 100644
86742--- a/include/linux/sysctl.h
86743+++ b/include/linux/sysctl.h
86744@@ -39,6 +39,8 @@ typedef int proc_handler (struct ctl_table *ctl, int write,
86745
86746 extern int proc_dostring(struct ctl_table *, int,
86747 void __user *, size_t *, loff_t *);
86748+extern int proc_dostring_modpriv(struct ctl_table *, int,
86749+ void __user *, size_t *, loff_t *);
86750 extern int proc_dointvec(struct ctl_table *, int,
86751 void __user *, size_t *, loff_t *);
86752 extern int proc_dointvec_minmax(struct ctl_table *, int,
86753@@ -113,7 +115,8 @@ struct ctl_table
86754 struct ctl_table_poll *poll;
86755 void *extra1;
86756 void *extra2;
86757-};
86758+} __do_const __randomize_layout;
86759+typedef struct ctl_table __no_const ctl_table_no_const;
86760
86761 struct ctl_node {
86762 struct rb_node node;
86763diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
86764index ddad161..a3efd26 100644
86765--- a/include/linux/sysfs.h
86766+++ b/include/linux/sysfs.h
86767@@ -34,7 +34,8 @@ struct attribute {
86768 struct lock_class_key *key;
86769 struct lock_class_key skey;
86770 #endif
86771-};
86772+} __do_const;
86773+typedef struct attribute __no_const attribute_no_const;
86774
86775 /**
86776 * sysfs_attr_init - initialize a dynamically allocated sysfs attribute
86777@@ -63,7 +64,8 @@ struct attribute_group {
86778 struct attribute *, int);
86779 struct attribute **attrs;
86780 struct bin_attribute **bin_attrs;
86781-};
86782+} __do_const;
86783+typedef struct attribute_group __no_const attribute_group_no_const;
86784
86785 /**
86786 * Use these macros to make defining attributes easier. See include/linux/device.h
86787@@ -137,7 +139,8 @@ struct bin_attribute {
86788 char *, loff_t, size_t);
86789 int (*mmap)(struct file *, struct kobject *, struct bin_attribute *attr,
86790 struct vm_area_struct *vma);
86791-};
86792+} __do_const;
86793+typedef struct bin_attribute __no_const bin_attribute_no_const;
86794
86795 /**
86796 * sysfs_bin_attr_init - initialize a dynamically allocated bin_attribute
86797diff --git a/include/linux/sysrq.h b/include/linux/sysrq.h
86798index 387fa7d..3fcde6b 100644
86799--- a/include/linux/sysrq.h
86800+++ b/include/linux/sysrq.h
86801@@ -16,6 +16,7 @@
86802
86803 #include <linux/errno.h>
86804 #include <linux/types.h>
86805+#include <linux/compiler.h>
86806
86807 /* Possible values of bitmask for enabling sysrq functions */
86808 /* 0x0001 is reserved for enable everything */
86809@@ -33,7 +34,7 @@ struct sysrq_key_op {
86810 char *help_msg;
86811 char *action_msg;
86812 int enable_mask;
86813-};
86814+} __do_const;
86815
86816 #ifdef CONFIG_MAGIC_SYSRQ
86817
86818diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
86819index ff307b5..f1a4468 100644
86820--- a/include/linux/thread_info.h
86821+++ b/include/linux/thread_info.h
86822@@ -145,6 +145,13 @@ static inline bool test_and_clear_restore_sigmask(void)
86823 #error "no set_restore_sigmask() provided and default one won't work"
86824 #endif
86825
86826+extern void __check_object_size(const void *ptr, unsigned long n, bool to_user, bool const_size);
86827+
86828+static inline void check_object_size(const void *ptr, unsigned long n, bool to_user)
86829+{
86830+ __check_object_size(ptr, n, to_user, __builtin_constant_p(n));
86831+}
86832+
86833 #endif /* __KERNEL__ */
86834
86835 #endif /* _LINUX_THREAD_INFO_H */
86836diff --git a/include/linux/tty.h b/include/linux/tty.h
86837index 358a337..8829c1f 100644
86838--- a/include/linux/tty.h
86839+++ b/include/linux/tty.h
86840@@ -225,7 +225,7 @@ struct tty_port {
86841 const struct tty_port_operations *ops; /* Port operations */
86842 spinlock_t lock; /* Lock protecting tty field */
86843 int blocked_open; /* Waiting to open */
86844- int count; /* Usage count */
86845+ atomic_t count; /* Usage count */
86846 wait_queue_head_t open_wait; /* Open waiters */
86847 wait_queue_head_t close_wait; /* Close waiters */
86848 wait_queue_head_t delta_msr_wait; /* Modem status change */
86849@@ -313,7 +313,7 @@ struct tty_struct {
86850 /* If the tty has a pending do_SAK, queue it here - akpm */
86851 struct work_struct SAK_work;
86852 struct tty_port *port;
86853-};
86854+} __randomize_layout;
86855
86856 /* Each of a tty's open files has private_data pointing to tty_file_private */
86857 struct tty_file_private {
86858@@ -572,7 +572,7 @@ extern int tty_port_open(struct tty_port *port,
86859 struct tty_struct *tty, struct file *filp);
86860 static inline int tty_port_users(struct tty_port *port)
86861 {
86862- return port->count + port->blocked_open;
86863+ return atomic_read(&port->count) + port->blocked_open;
86864 }
86865
86866 extern int tty_register_ldisc(int disc, struct tty_ldisc_ops *new_ldisc);
86867diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h
86868index 92e337c..f46757b 100644
86869--- a/include/linux/tty_driver.h
86870+++ b/include/linux/tty_driver.h
86871@@ -291,7 +291,7 @@ struct tty_operations {
86872 void (*poll_put_char)(struct tty_driver *driver, int line, char ch);
86873 #endif
86874 const struct file_operations *proc_fops;
86875-};
86876+} __do_const __randomize_layout;
86877
86878 struct tty_driver {
86879 int magic; /* magic number for this structure */
86880@@ -325,7 +325,7 @@ struct tty_driver {
86881
86882 const struct tty_operations *ops;
86883 struct list_head tty_drivers;
86884-};
86885+} __randomize_layout;
86886
86887 extern struct list_head tty_drivers;
86888
86889diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
86890index 00c9d68..bc0188b 100644
86891--- a/include/linux/tty_ldisc.h
86892+++ b/include/linux/tty_ldisc.h
86893@@ -215,7 +215,7 @@ struct tty_ldisc_ops {
86894
86895 struct module *owner;
86896
86897- int refcount;
86898+ atomic_t refcount;
86899 };
86900
86901 struct tty_ldisc {
86902diff --git a/include/linux/types.h b/include/linux/types.h
86903index 6747247..fc7ec8b 100644
86904--- a/include/linux/types.h
86905+++ b/include/linux/types.h
86906@@ -174,10 +174,26 @@ typedef struct {
86907 int counter;
86908 } atomic_t;
86909
86910+#ifdef CONFIG_PAX_REFCOUNT
86911+typedef struct {
86912+ int counter;
86913+} atomic_unchecked_t;
86914+#else
86915+typedef atomic_t atomic_unchecked_t;
86916+#endif
86917+
86918 #ifdef CONFIG_64BIT
86919 typedef struct {
86920 long counter;
86921 } atomic64_t;
86922+
86923+#ifdef CONFIG_PAX_REFCOUNT
86924+typedef struct {
86925+ long counter;
86926+} atomic64_unchecked_t;
86927+#else
86928+typedef atomic64_t atomic64_unchecked_t;
86929+#endif
86930 #endif
86931
86932 struct list_head {
86933diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
86934index ecd3319..8a36ded 100644
86935--- a/include/linux/uaccess.h
86936+++ b/include/linux/uaccess.h
86937@@ -75,11 +75,11 @@ static inline unsigned long __copy_from_user_nocache(void *to,
86938 long ret; \
86939 mm_segment_t old_fs = get_fs(); \
86940 \
86941- set_fs(KERNEL_DS); \
86942 pagefault_disable(); \
86943- ret = __copy_from_user_inatomic(&(retval), (__force typeof(retval) __user *)(addr), sizeof(retval)); \
86944- pagefault_enable(); \
86945+ set_fs(KERNEL_DS); \
86946+ ret = __copy_from_user_inatomic(&(retval), (typeof(retval) __force_user *)(addr), sizeof(retval)); \
86947 set_fs(old_fs); \
86948+ pagefault_enable(); \
86949 ret; \
86950 })
86951
86952diff --git a/include/linux/uidgid.h b/include/linux/uidgid.h
86953index 2d1f9b6..d7a9fce 100644
86954--- a/include/linux/uidgid.h
86955+++ b/include/linux/uidgid.h
86956@@ -175,4 +175,9 @@ static inline bool kgid_has_mapping(struct user_namespace *ns, kgid_t gid)
86957
86958 #endif /* CONFIG_USER_NS */
86959
86960+#define GR_GLOBAL_UID(x) from_kuid_munged(&init_user_ns, (x))
86961+#define GR_GLOBAL_GID(x) from_kgid_munged(&init_user_ns, (x))
86962+#define gr_is_global_root(x) uid_eq((x), GLOBAL_ROOT_UID)
86963+#define gr_is_global_nonroot(x) (!uid_eq((x), GLOBAL_ROOT_UID))
86964+
86965 #endif /* _LINUX_UIDGID_H */
86966diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
86967index 32c0e83..671eb35 100644
86968--- a/include/linux/uio_driver.h
86969+++ b/include/linux/uio_driver.h
86970@@ -67,7 +67,7 @@ struct uio_device {
86971 struct module *owner;
86972 struct device *dev;
86973 int minor;
86974- atomic_t event;
86975+ atomic_unchecked_t event;
86976 struct fasync_struct *async_queue;
86977 wait_queue_head_t wait;
86978 struct uio_info *info;
86979diff --git a/include/linux/unaligned/access_ok.h b/include/linux/unaligned/access_ok.h
86980index 99c1b4d..562e6f3 100644
86981--- a/include/linux/unaligned/access_ok.h
86982+++ b/include/linux/unaligned/access_ok.h
86983@@ -4,34 +4,34 @@
86984 #include <linux/kernel.h>
86985 #include <asm/byteorder.h>
86986
86987-static inline u16 get_unaligned_le16(const void *p)
86988+static inline u16 __intentional_overflow(-1) get_unaligned_le16(const void *p)
86989 {
86990- return le16_to_cpup((__le16 *)p);
86991+ return le16_to_cpup((const __le16 *)p);
86992 }
86993
86994-static inline u32 get_unaligned_le32(const void *p)
86995+static inline u32 __intentional_overflow(-1) get_unaligned_le32(const void *p)
86996 {
86997- return le32_to_cpup((__le32 *)p);
86998+ return le32_to_cpup((const __le32 *)p);
86999 }
87000
87001-static inline u64 get_unaligned_le64(const void *p)
87002+static inline u64 __intentional_overflow(-1) get_unaligned_le64(const void *p)
87003 {
87004- return le64_to_cpup((__le64 *)p);
87005+ return le64_to_cpup((const __le64 *)p);
87006 }
87007
87008-static inline u16 get_unaligned_be16(const void *p)
87009+static inline u16 __intentional_overflow(-1) get_unaligned_be16(const void *p)
87010 {
87011- return be16_to_cpup((__be16 *)p);
87012+ return be16_to_cpup((const __be16 *)p);
87013 }
87014
87015-static inline u32 get_unaligned_be32(const void *p)
87016+static inline u32 __intentional_overflow(-1) get_unaligned_be32(const void *p)
87017 {
87018- return be32_to_cpup((__be32 *)p);
87019+ return be32_to_cpup((const __be32 *)p);
87020 }
87021
87022-static inline u64 get_unaligned_be64(const void *p)
87023+static inline u64 __intentional_overflow(-1) get_unaligned_be64(const void *p)
87024 {
87025- return be64_to_cpup((__be64 *)p);
87026+ return be64_to_cpup((const __be64 *)p);
87027 }
87028
87029 static inline void put_unaligned_le16(u16 val, void *p)
87030diff --git a/include/linux/usb.h b/include/linux/usb.h
87031index 447fe29..9fc875f 100644
87032--- a/include/linux/usb.h
87033+++ b/include/linux/usb.h
87034@@ -592,7 +592,7 @@ struct usb_device {
87035 int maxchild;
87036
87037 u32 quirks;
87038- atomic_t urbnum;
87039+ atomic_unchecked_t urbnum;
87040
87041 unsigned long active_duration;
87042
87043@@ -1676,7 +1676,7 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
87044
87045 extern int usb_control_msg(struct usb_device *dev, unsigned int pipe,
87046 __u8 request, __u8 requesttype, __u16 value, __u16 index,
87047- void *data, __u16 size, int timeout);
87048+ void *data, __u16 size, int timeout) __intentional_overflow(-1);
87049 extern int usb_interrupt_msg(struct usb_device *usb_dev, unsigned int pipe,
87050 void *data, int len, int *actual_length, int timeout);
87051 extern int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
87052diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h
87053index 9fd9e48..e2c5f35 100644
87054--- a/include/linux/usb/renesas_usbhs.h
87055+++ b/include/linux/usb/renesas_usbhs.h
87056@@ -39,7 +39,7 @@ enum {
87057 */
87058 struct renesas_usbhs_driver_callback {
87059 int (*notify_hotplug)(struct platform_device *pdev);
87060-};
87061+} __no_const;
87062
87063 /*
87064 * callback functions for platform
87065diff --git a/include/linux/user_namespace.h b/include/linux/user_namespace.h
87066index 8297e5b..0dfae27 100644
87067--- a/include/linux/user_namespace.h
87068+++ b/include/linux/user_namespace.h
87069@@ -39,7 +39,7 @@ struct user_namespace {
87070 struct key *persistent_keyring_register;
87071 struct rw_semaphore persistent_keyring_register_sem;
87072 #endif
87073-};
87074+} __randomize_layout;
87075
87076 extern struct user_namespace init_user_ns;
87077
87078diff --git a/include/linux/utsname.h b/include/linux/utsname.h
87079index 5093f58..c103e58 100644
87080--- a/include/linux/utsname.h
87081+++ b/include/linux/utsname.h
87082@@ -25,7 +25,7 @@ struct uts_namespace {
87083 struct new_utsname name;
87084 struct user_namespace *user_ns;
87085 struct ns_common ns;
87086-};
87087+} __randomize_layout;
87088 extern struct uts_namespace init_uts_ns;
87089
87090 #ifdef CONFIG_UTS_NS
87091diff --git a/include/linux/vermagic.h b/include/linux/vermagic.h
87092index 6f8fbcf..4efc177 100644
87093--- a/include/linux/vermagic.h
87094+++ b/include/linux/vermagic.h
87095@@ -25,9 +25,42 @@
87096 #define MODULE_ARCH_VERMAGIC ""
87097 #endif
87098
87099+#ifdef CONFIG_PAX_REFCOUNT
87100+#define MODULE_PAX_REFCOUNT "REFCOUNT "
87101+#else
87102+#define MODULE_PAX_REFCOUNT ""
87103+#endif
87104+
87105+#ifdef CONSTIFY_PLUGIN
87106+#define MODULE_CONSTIFY_PLUGIN "CONSTIFY_PLUGIN "
87107+#else
87108+#define MODULE_CONSTIFY_PLUGIN ""
87109+#endif
87110+
87111+#ifdef STACKLEAK_PLUGIN
87112+#define MODULE_STACKLEAK_PLUGIN "STACKLEAK_PLUGIN "
87113+#else
87114+#define MODULE_STACKLEAK_PLUGIN ""
87115+#endif
87116+
87117+#ifdef RANDSTRUCT_PLUGIN
87118+#include <generated/randomize_layout_hash.h>
87119+#define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
87120+#else
87121+#define MODULE_RANDSTRUCT_PLUGIN
87122+#endif
87123+
87124+#ifdef CONFIG_GRKERNSEC
87125+#define MODULE_GRSEC "GRSEC "
87126+#else
87127+#define MODULE_GRSEC ""
87128+#endif
87129+
87130 #define VERMAGIC_STRING \
87131 UTS_RELEASE " " \
87132 MODULE_VERMAGIC_SMP MODULE_VERMAGIC_PREEMPT \
87133 MODULE_VERMAGIC_MODULE_UNLOAD MODULE_VERMAGIC_MODVERSIONS \
87134- MODULE_ARCH_VERMAGIC
87135+ MODULE_ARCH_VERMAGIC \
87136+ MODULE_PAX_REFCOUNT MODULE_CONSTIFY_PLUGIN MODULE_STACKLEAK_PLUGIN \
87137+ MODULE_GRSEC MODULE_RANDSTRUCT_PLUGIN
87138
87139diff --git a/include/linux/vga_switcheroo.h b/include/linux/vga_switcheroo.h
87140index b483abd..af305ad 100644
87141--- a/include/linux/vga_switcheroo.h
87142+++ b/include/linux/vga_switcheroo.h
87143@@ -63,9 +63,9 @@ int vga_switcheroo_get_client_state(struct pci_dev *dev);
87144
87145 void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic);
87146
87147-int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain);
87148+int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain);
87149 void vga_switcheroo_fini_domain_pm_ops(struct device *dev);
87150-int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain);
87151+int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain);
87152 #else
87153
87154 static inline void vga_switcheroo_unregister_client(struct pci_dev *dev) {}
87155@@ -82,9 +82,9 @@ static inline int vga_switcheroo_get_client_state(struct pci_dev *dev) { return
87156
87157 static inline void vga_switcheroo_set_dynamic_switch(struct pci_dev *pdev, enum vga_switcheroo_state dynamic) {}
87158
87159-static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
87160+static inline int vga_switcheroo_init_domain_pm_ops(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
87161 static inline void vga_switcheroo_fini_domain_pm_ops(struct device *dev) {}
87162-static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, struct dev_pm_domain *domain) { return -EINVAL; }
87163+static inline int vga_switcheroo_init_domain_pm_optimus_hdmi_audio(struct device *dev, dev_pm_domain_no_const *domain) { return -EINVAL; }
87164
87165 #endif
87166 #endif /* _LINUX_VGA_SWITCHEROO_H_ */
87167diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
87168index 0ec5983..cc61051 100644
87169--- a/include/linux/vmalloc.h
87170+++ b/include/linux/vmalloc.h
87171@@ -18,6 +18,11 @@ struct vm_area_struct; /* vma defining user mapping in mm_types.h */
87172 #define VM_UNINITIALIZED 0x00000020 /* vm_struct is not fully initialized */
87173 #define VM_NO_GUARD 0x00000040 /* don't add guard page */
87174 #define VM_KASAN 0x00000080 /* has allocated kasan shadow memory */
87175+
87176+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
87177+#define VM_KERNEXEC 0x00000100 /* allocate from executable kernel memory range */
87178+#endif
87179+
87180 /* bits [20..32] reserved for arch specific ioremap internals */
87181
87182 /*
87183@@ -86,6 +91,10 @@ extern void *vmap(struct page **pages, unsigned int count,
87184 unsigned long flags, pgprot_t prot);
87185 extern void vunmap(const void *addr);
87186
87187+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
87188+extern void unmap_process_stacks(struct task_struct *task);
87189+#endif
87190+
87191 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
87192 unsigned long uaddr, void *kaddr,
87193 unsigned long size);
87194@@ -150,7 +159,7 @@ extern void free_vm_area(struct vm_struct *area);
87195
87196 /* for /dev/kmem */
87197 extern long vread(char *buf, char *addr, unsigned long count);
87198-extern long vwrite(char *buf, char *addr, unsigned long count);
87199+extern long vwrite(char *buf, char *addr, unsigned long count) __size_overflow(3);
87200
87201 /*
87202 * Internals. Dont't use..
87203diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
87204index 82e7db7..f8ce3d0 100644
87205--- a/include/linux/vmstat.h
87206+++ b/include/linux/vmstat.h
87207@@ -108,18 +108,18 @@ static inline void vm_events_fold_cpu(int cpu)
87208 /*
87209 * Zone based page accounting with per cpu differentials.
87210 */
87211-extern atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
87212+extern atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
87213
87214 static inline void zone_page_state_add(long x, struct zone *zone,
87215 enum zone_stat_item item)
87216 {
87217- atomic_long_add(x, &zone->vm_stat[item]);
87218- atomic_long_add(x, &vm_stat[item]);
87219+ atomic_long_add_unchecked(x, &zone->vm_stat[item]);
87220+ atomic_long_add_unchecked(x, &vm_stat[item]);
87221 }
87222
87223-static inline unsigned long global_page_state(enum zone_stat_item item)
87224+static inline unsigned long __intentional_overflow(-1) global_page_state(enum zone_stat_item item)
87225 {
87226- long x = atomic_long_read(&vm_stat[item]);
87227+ long x = atomic_long_read_unchecked(&vm_stat[item]);
87228 #ifdef CONFIG_SMP
87229 if (x < 0)
87230 x = 0;
87231@@ -127,10 +127,10 @@ static inline unsigned long global_page_state(enum zone_stat_item item)
87232 return x;
87233 }
87234
87235-static inline unsigned long zone_page_state(struct zone *zone,
87236+static inline unsigned long __intentional_overflow(-1) zone_page_state(struct zone *zone,
87237 enum zone_stat_item item)
87238 {
87239- long x = atomic_long_read(&zone->vm_stat[item]);
87240+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
87241 #ifdef CONFIG_SMP
87242 if (x < 0)
87243 x = 0;
87244@@ -147,7 +147,7 @@ static inline unsigned long zone_page_state(struct zone *zone,
87245 static inline unsigned long zone_page_state_snapshot(struct zone *zone,
87246 enum zone_stat_item item)
87247 {
87248- long x = atomic_long_read(&zone->vm_stat[item]);
87249+ long x = atomic_long_read_unchecked(&zone->vm_stat[item]);
87250
87251 #ifdef CONFIG_SMP
87252 int cpu;
87253@@ -234,14 +234,14 @@ static inline void __mod_zone_page_state(struct zone *zone,
87254
87255 static inline void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
87256 {
87257- atomic_long_inc(&zone->vm_stat[item]);
87258- atomic_long_inc(&vm_stat[item]);
87259+ atomic_long_inc_unchecked(&zone->vm_stat[item]);
87260+ atomic_long_inc_unchecked(&vm_stat[item]);
87261 }
87262
87263 static inline void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
87264 {
87265- atomic_long_dec(&zone->vm_stat[item]);
87266- atomic_long_dec(&vm_stat[item]);
87267+ atomic_long_dec_unchecked(&zone->vm_stat[item]);
87268+ atomic_long_dec_unchecked(&vm_stat[item]);
87269 }
87270
87271 static inline void __inc_zone_page_state(struct page *page,
87272diff --git a/include/linux/xattr.h b/include/linux/xattr.h
87273index 91b0a68..0e9adf6 100644
87274--- a/include/linux/xattr.h
87275+++ b/include/linux/xattr.h
87276@@ -28,7 +28,7 @@ struct xattr_handler {
87277 size_t size, int handler_flags);
87278 int (*set)(struct dentry *dentry, const char *name, const void *buffer,
87279 size_t size, int flags, int handler_flags);
87280-};
87281+} __do_const;
87282
87283 struct xattr {
87284 const char *name;
87285@@ -37,6 +37,9 @@ struct xattr {
87286 };
87287
87288 ssize_t xattr_getsecurity(struct inode *, const char *, void *, size_t);
87289+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
87290+ssize_t pax_getxattr(struct dentry *, void *, size_t);
87291+#endif
87292 ssize_t vfs_getxattr(struct dentry *, const char *, void *, size_t);
87293 ssize_t vfs_listxattr(struct dentry *d, char *list, size_t size);
87294 int __vfs_setxattr_noperm(struct dentry *, const char *, const void *, size_t, int);
87295diff --git a/include/linux/zlib.h b/include/linux/zlib.h
87296index 92dbbd3..13ab0b3 100644
87297--- a/include/linux/zlib.h
87298+++ b/include/linux/zlib.h
87299@@ -31,6 +31,7 @@
87300 #define _ZLIB_H
87301
87302 #include <linux/zconf.h>
87303+#include <linux/compiler.h>
87304
87305 /* zlib deflate based on ZLIB_VERSION "1.1.3" */
87306 /* zlib inflate based on ZLIB_VERSION "1.2.3" */
87307@@ -179,7 +180,7 @@ typedef z_stream *z_streamp;
87308
87309 /* basic functions */
87310
87311-extern int zlib_deflate_workspacesize (int windowBits, int memLevel);
87312+extern int zlib_deflate_workspacesize (int windowBits, int memLevel) __intentional_overflow(0);
87313 /*
87314 Returns the number of bytes that needs to be allocated for a per-
87315 stream workspace with the specified parameters. A pointer to this
87316diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
87317index 3e4fddf..5ec9104 100644
87318--- a/include/media/v4l2-dev.h
87319+++ b/include/media/v4l2-dev.h
87320@@ -75,7 +75,7 @@ struct v4l2_file_operations {
87321 int (*mmap) (struct file *, struct vm_area_struct *);
87322 int (*open) (struct file *);
87323 int (*release) (struct file *);
87324-};
87325+} __do_const;
87326
87327 /*
87328 * Newer version of video_device, handled by videodev2.c
87329diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
87330index ffb69da..040393e 100644
87331--- a/include/media/v4l2-device.h
87332+++ b/include/media/v4l2-device.h
87333@@ -95,7 +95,7 @@ int __must_check v4l2_device_register(struct device *dev, struct v4l2_device *v4
87334 this function returns 0. If the name ends with a digit (e.g. cx18),
87335 then the name will be set to cx18-0 since cx180 looks really odd. */
87336 int v4l2_device_set_name(struct v4l2_device *v4l2_dev, const char *basename,
87337- atomic_t *instance);
87338+ atomic_unchecked_t *instance);
87339
87340 /* Set v4l2_dev->dev to NULL. Call when the USB parent disconnects.
87341 Since the parent disappears this ensures that v4l2_dev doesn't have an
87342diff --git a/include/net/9p/transport.h b/include/net/9p/transport.h
87343index 2a25dec..bf6dd8a 100644
87344--- a/include/net/9p/transport.h
87345+++ b/include/net/9p/transport.h
87346@@ -62,7 +62,7 @@ struct p9_trans_module {
87347 int (*cancelled)(struct p9_client *, struct p9_req_t *req);
87348 int (*zc_request)(struct p9_client *, struct p9_req_t *,
87349 char *, char *, int , int, int, int);
87350-};
87351+} __do_const;
87352
87353 void v9fs_register_trans(struct p9_trans_module *m);
87354 void v9fs_unregister_trans(struct p9_trans_module *m);
87355diff --git a/include/net/af_unix.h b/include/net/af_unix.h
87356index a175ba4..196eb8242 100644
87357--- a/include/net/af_unix.h
87358+++ b/include/net/af_unix.h
87359@@ -36,7 +36,7 @@ struct unix_skb_parms {
87360 u32 secid; /* Security ID */
87361 #endif
87362 u32 consumed;
87363-};
87364+} __randomize_layout;
87365
87366 #define UNIXCB(skb) (*(struct unix_skb_parms *)&((skb)->cb))
87367 #define UNIXSID(skb) (&UNIXCB((skb)).secid)
87368diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
87369index 2239a37..a83461f 100644
87370--- a/include/net/bluetooth/l2cap.h
87371+++ b/include/net/bluetooth/l2cap.h
87372@@ -609,7 +609,7 @@ struct l2cap_ops {
87373 struct sk_buff *(*alloc_skb) (struct l2cap_chan *chan,
87374 unsigned long hdr_len,
87375 unsigned long len, int nb);
87376-};
87377+} __do_const;
87378
87379 struct l2cap_conn {
87380 struct hci_conn *hcon;
87381diff --git a/include/net/bonding.h b/include/net/bonding.h
87382index fda6fee..dbdf83c 100644
87383--- a/include/net/bonding.h
87384+++ b/include/net/bonding.h
87385@@ -665,7 +665,7 @@ extern struct rtnl_link_ops bond_link_ops;
87386
87387 static inline void bond_tx_drop(struct net_device *dev, struct sk_buff *skb)
87388 {
87389- atomic_long_inc(&dev->tx_dropped);
87390+ atomic_long_inc_unchecked(&dev->tx_dropped);
87391 dev_kfree_skb_any(skb);
87392 }
87393
87394diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h
87395index f2ae33d..c457cf0 100644
87396--- a/include/net/caif/cfctrl.h
87397+++ b/include/net/caif/cfctrl.h
87398@@ -52,7 +52,7 @@ struct cfctrl_rsp {
87399 void (*radioset_rsp)(void);
87400 void (*reject_rsp)(struct cflayer *layer, u8 linkid,
87401 struct cflayer *client_layer);
87402-};
87403+} __no_const;
87404
87405 /* Link Setup Parameters for CAIF-Links. */
87406 struct cfctrl_link_param {
87407@@ -101,8 +101,8 @@ struct cfctrl_request_info {
87408 struct cfctrl {
87409 struct cfsrvl serv;
87410 struct cfctrl_rsp res;
87411- atomic_t req_seq_no;
87412- atomic_t rsp_seq_no;
87413+ atomic_unchecked_t req_seq_no;
87414+ atomic_unchecked_t rsp_seq_no;
87415 struct list_head list;
87416 /* Protects from simultaneous access to first_req list */
87417 spinlock_t info_list_lock;
87418diff --git a/include/net/flow.h b/include/net/flow.h
87419index 8109a15..504466d 100644
87420--- a/include/net/flow.h
87421+++ b/include/net/flow.h
87422@@ -231,6 +231,6 @@ void flow_cache_fini(struct net *net);
87423
87424 void flow_cache_flush(struct net *net);
87425 void flow_cache_flush_deferred(struct net *net);
87426-extern atomic_t flow_cache_genid;
87427+extern atomic_unchecked_t flow_cache_genid;
87428
87429 #endif
87430diff --git a/include/net/genetlink.h b/include/net/genetlink.h
87431index 0574abd..0f16881 100644
87432--- a/include/net/genetlink.h
87433+++ b/include/net/genetlink.h
87434@@ -130,7 +130,7 @@ struct genl_ops {
87435 u8 cmd;
87436 u8 internal_flags;
87437 u8 flags;
87438-};
87439+} __do_const;
87440
87441 int __genl_register_family(struct genl_family *family);
87442
87443diff --git a/include/net/gro_cells.h b/include/net/gro_cells.h
87444index 0f712c0..cd762c4 100644
87445--- a/include/net/gro_cells.h
87446+++ b/include/net/gro_cells.h
87447@@ -27,7 +27,7 @@ static inline void gro_cells_receive(struct gro_cells *gcells, struct sk_buff *s
87448 cell = this_cpu_ptr(gcells->cells);
87449
87450 if (skb_queue_len(&cell->napi_skbs) > netdev_max_backlog) {
87451- atomic_long_inc(&dev->rx_dropped);
87452+ atomic_long_inc_unchecked(&dev->rx_dropped);
87453 kfree_skb(skb);
87454 return;
87455 }
87456diff --git a/include/net/inet_connection_sock.h b/include/net/inet_connection_sock.h
87457index 5976bde..3a81660 100644
87458--- a/include/net/inet_connection_sock.h
87459+++ b/include/net/inet_connection_sock.h
87460@@ -63,7 +63,7 @@ struct inet_connection_sock_af_ops {
87461 int (*bind_conflict)(const struct sock *sk,
87462 const struct inet_bind_bucket *tb, bool relax);
87463 void (*mtu_reduced)(struct sock *sk);
87464-};
87465+} __do_const;
87466
87467 /** inet_connection_sock - INET connection oriented sock
87468 *
87469diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
87470index 80479ab..0c3f647 100644
87471--- a/include/net/inetpeer.h
87472+++ b/include/net/inetpeer.h
87473@@ -47,7 +47,7 @@ struct inet_peer {
87474 */
87475 union {
87476 struct {
87477- atomic_t rid; /* Frag reception counter */
87478+ atomic_unchecked_t rid; /* Frag reception counter */
87479 };
87480 struct rcu_head rcu;
87481 struct inet_peer *gc_next;
87482diff --git a/include/net/ip.h b/include/net/ip.h
87483index 6cc1eaf..14059b0 100644
87484--- a/include/net/ip.h
87485+++ b/include/net/ip.h
87486@@ -317,7 +317,7 @@ static inline unsigned int ip_skb_dst_mtu(const struct sk_buff *skb)
87487 }
87488 }
87489
87490-u32 ip_idents_reserve(u32 hash, int segs);
87491+u32 ip_idents_reserve(u32 hash, int segs) __intentional_overflow(-1);
87492 void __ip_select_ident(struct iphdr *iph, int segs);
87493
87494 static inline void ip_select_ident_segs(struct sk_buff *skb, struct sock *sk, int segs)
87495diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h
87496index 5bd120e4..03fb812 100644
87497--- a/include/net/ip_fib.h
87498+++ b/include/net/ip_fib.h
87499@@ -170,7 +170,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh);
87500
87501 #define FIB_RES_SADDR(net, res) \
87502 ((FIB_RES_NH(res).nh_saddr_genid == \
87503- atomic_read(&(net)->ipv4.dev_addr_genid)) ? \
87504+ atomic_read_unchecked(&(net)->ipv4.dev_addr_genid)) ? \
87505 FIB_RES_NH(res).nh_saddr : \
87506 fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
87507 #define FIB_RES_GW(res) (FIB_RES_NH(res).nh_gw)
87508diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
87509index 615b20b..fd4cbd8 100644
87510--- a/include/net/ip_vs.h
87511+++ b/include/net/ip_vs.h
87512@@ -534,7 +534,7 @@ struct ip_vs_conn {
87513 struct ip_vs_conn *control; /* Master control connection */
87514 atomic_t n_control; /* Number of controlled ones */
87515 struct ip_vs_dest *dest; /* real server */
87516- atomic_t in_pkts; /* incoming packet counter */
87517+ atomic_unchecked_t in_pkts; /* incoming packet counter */
87518
87519 /* Packet transmitter for different forwarding methods. If it
87520 * mangles the packet, it must return NF_DROP or better NF_STOLEN,
87521@@ -682,7 +682,7 @@ struct ip_vs_dest {
87522 __be16 port; /* port number of the server */
87523 union nf_inet_addr addr; /* IP address of the server */
87524 volatile unsigned int flags; /* dest status flags */
87525- atomic_t conn_flags; /* flags to copy to conn */
87526+ atomic_unchecked_t conn_flags; /* flags to copy to conn */
87527 atomic_t weight; /* server weight */
87528
87529 atomic_t refcnt; /* reference counter */
87530@@ -928,11 +928,11 @@ struct netns_ipvs {
87531 /* ip_vs_lblc */
87532 int sysctl_lblc_expiration;
87533 struct ctl_table_header *lblc_ctl_header;
87534- struct ctl_table *lblc_ctl_table;
87535+ ctl_table_no_const *lblc_ctl_table;
87536 /* ip_vs_lblcr */
87537 int sysctl_lblcr_expiration;
87538 struct ctl_table_header *lblcr_ctl_header;
87539- struct ctl_table *lblcr_ctl_table;
87540+ ctl_table_no_const *lblcr_ctl_table;
87541 /* ip_vs_est */
87542 struct list_head est_list; /* estimator list */
87543 spinlock_t est_lock;
87544diff --git a/include/net/irda/ircomm_tty.h b/include/net/irda/ircomm_tty.h
87545index 8d4f588..2e37ad2 100644
87546--- a/include/net/irda/ircomm_tty.h
87547+++ b/include/net/irda/ircomm_tty.h
87548@@ -33,6 +33,7 @@
87549 #include <linux/termios.h>
87550 #include <linux/timer.h>
87551 #include <linux/tty.h> /* struct tty_struct */
87552+#include <asm/local.h>
87553
87554 #include <net/irda/irias_object.h>
87555 #include <net/irda/ircomm_core.h>
87556diff --git a/include/net/iucv/af_iucv.h b/include/net/iucv/af_iucv.h
87557index 714cc9a..ea05f3e 100644
87558--- a/include/net/iucv/af_iucv.h
87559+++ b/include/net/iucv/af_iucv.h
87560@@ -149,7 +149,7 @@ struct iucv_skb_cb {
87561 struct iucv_sock_list {
87562 struct hlist_head head;
87563 rwlock_t lock;
87564- atomic_t autobind_name;
87565+ atomic_unchecked_t autobind_name;
87566 };
87567
87568 unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
87569diff --git a/include/net/llc_c_ac.h b/include/net/llc_c_ac.h
87570index f3be818..bf46196 100644
87571--- a/include/net/llc_c_ac.h
87572+++ b/include/net/llc_c_ac.h
87573@@ -87,7 +87,7 @@
87574 #define LLC_CONN_AC_STOP_SENDACK_TMR 70
87575 #define LLC_CONN_AC_START_SENDACK_TMR_IF_NOT_RUNNING 71
87576
87577-typedef int (*llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
87578+typedef int (* const llc_conn_action_t)(struct sock *sk, struct sk_buff *skb);
87579
87580 int llc_conn_ac_clear_remote_busy(struct sock *sk, struct sk_buff *skb);
87581 int llc_conn_ac_conn_ind(struct sock *sk, struct sk_buff *skb);
87582diff --git a/include/net/llc_c_ev.h b/include/net/llc_c_ev.h
87583index 3948cf1..83b28c4 100644
87584--- a/include/net/llc_c_ev.h
87585+++ b/include/net/llc_c_ev.h
87586@@ -125,8 +125,8 @@ static __inline__ struct llc_conn_state_ev *llc_conn_ev(struct sk_buff *skb)
87587 return (struct llc_conn_state_ev *)skb->cb;
87588 }
87589
87590-typedef int (*llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
87591-typedef int (*llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
87592+typedef int (* const llc_conn_ev_t)(struct sock *sk, struct sk_buff *skb);
87593+typedef int (* const llc_conn_ev_qfyr_t)(struct sock *sk, struct sk_buff *skb);
87594
87595 int llc_conn_ev_conn_req(struct sock *sk, struct sk_buff *skb);
87596 int llc_conn_ev_data_req(struct sock *sk, struct sk_buff *skb);
87597diff --git a/include/net/llc_c_st.h b/include/net/llc_c_st.h
87598index 48f3f89..0e92c50 100644
87599--- a/include/net/llc_c_st.h
87600+++ b/include/net/llc_c_st.h
87601@@ -37,7 +37,7 @@ struct llc_conn_state_trans {
87602 u8 next_state;
87603 const llc_conn_ev_qfyr_t *ev_qualifiers;
87604 const llc_conn_action_t *ev_actions;
87605-};
87606+} __do_const;
87607
87608 struct llc_conn_state {
87609 u8 current_state;
87610diff --git a/include/net/llc_s_ac.h b/include/net/llc_s_ac.h
87611index a61b98c..aade1eb 100644
87612--- a/include/net/llc_s_ac.h
87613+++ b/include/net/llc_s_ac.h
87614@@ -23,7 +23,7 @@
87615 #define SAP_ACT_TEST_IND 9
87616
87617 /* All action functions must look like this */
87618-typedef int (*llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
87619+typedef int (* const llc_sap_action_t)(struct llc_sap *sap, struct sk_buff *skb);
87620
87621 int llc_sap_action_unitdata_ind(struct llc_sap *sap, struct sk_buff *skb);
87622 int llc_sap_action_send_ui(struct llc_sap *sap, struct sk_buff *skb);
87623diff --git a/include/net/llc_s_st.h b/include/net/llc_s_st.h
87624index c4359e2..76dbc4a 100644
87625--- a/include/net/llc_s_st.h
87626+++ b/include/net/llc_s_st.h
87627@@ -20,7 +20,7 @@ struct llc_sap_state_trans {
87628 llc_sap_ev_t ev;
87629 u8 next_state;
87630 const llc_sap_action_t *ev_actions;
87631-};
87632+} __do_const;
87633
87634 struct llc_sap_state {
87635 u8 curr_state;
87636diff --git a/include/net/mac80211.h b/include/net/mac80211.h
87637index d52914b..2b13cec 100644
87638--- a/include/net/mac80211.h
87639+++ b/include/net/mac80211.h
87640@@ -4915,7 +4915,7 @@ struct rate_control_ops {
87641 void (*remove_sta_debugfs)(void *priv, void *priv_sta);
87642
87643 u32 (*get_expected_throughput)(void *priv_sta);
87644-};
87645+} __do_const;
87646
87647 static inline int rate_supported(struct ieee80211_sta *sta,
87648 enum ieee80211_band band,
87649diff --git a/include/net/neighbour.h b/include/net/neighbour.h
87650index 76f7084..8f36e39 100644
87651--- a/include/net/neighbour.h
87652+++ b/include/net/neighbour.h
87653@@ -163,7 +163,7 @@ struct neigh_ops {
87654 void (*error_report)(struct neighbour *, struct sk_buff *);
87655 int (*output)(struct neighbour *, struct sk_buff *);
87656 int (*connected_output)(struct neighbour *, struct sk_buff *);
87657-};
87658+} __do_const;
87659
87660 struct pneigh_entry {
87661 struct pneigh_entry *next;
87662@@ -217,7 +217,7 @@ struct neigh_table {
87663 struct neigh_statistics __percpu *stats;
87664 struct neigh_hash_table __rcu *nht;
87665 struct pneigh_entry **phash_buckets;
87666-};
87667+} __randomize_layout;
87668
87669 enum {
87670 NEIGH_ARP_TABLE = 0,
87671diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
87672index 36faf49..6927638 100644
87673--- a/include/net/net_namespace.h
87674+++ b/include/net/net_namespace.h
87675@@ -131,8 +131,8 @@ struct net {
87676 struct netns_ipvs *ipvs;
87677 #endif
87678 struct sock *diag_nlsk;
87679- atomic_t fnhe_genid;
87680-};
87681+ atomic_unchecked_t fnhe_genid;
87682+} __randomize_layout;
87683
87684 #include <linux/seq_file_net.h>
87685
87686@@ -288,7 +288,11 @@ static inline struct net *read_pnet(struct net * const *pnet)
87687 #define __net_init __init
87688 #define __net_exit __exit_refok
87689 #define __net_initdata __initdata
87690+#ifdef CONSTIFY_PLUGIN
87691 #define __net_initconst __initconst
87692+#else
87693+#define __net_initconst __initdata
87694+#endif
87695 #endif
87696
87697 int peernet2id(struct net *net, struct net *peer);
87698@@ -301,7 +305,7 @@ struct pernet_operations {
87699 void (*exit_batch)(struct list_head *net_exit_list);
87700 int *id;
87701 size_t size;
87702-};
87703+} __do_const;
87704
87705 /*
87706 * Use these carefully. If you implement a network device and it
87707@@ -349,12 +353,12 @@ static inline void unregister_net_sysctl_table(struct ctl_table_header *header)
87708
87709 static inline int rt_genid_ipv4(struct net *net)
87710 {
87711- return atomic_read(&net->ipv4.rt_genid);
87712+ return atomic_read_unchecked(&net->ipv4.rt_genid);
87713 }
87714
87715 static inline void rt_genid_bump_ipv4(struct net *net)
87716 {
87717- atomic_inc(&net->ipv4.rt_genid);
87718+ atomic_inc_unchecked(&net->ipv4.rt_genid);
87719 }
87720
87721 extern void (*__fib6_flush_trees)(struct net *net);
87722@@ -381,12 +385,12 @@ static inline void rt_genid_bump_all(struct net *net)
87723
87724 static inline int fnhe_genid(struct net *net)
87725 {
87726- return atomic_read(&net->fnhe_genid);
87727+ return atomic_read_unchecked(&net->fnhe_genid);
87728 }
87729
87730 static inline void fnhe_genid_bump(struct net *net)
87731 {
87732- atomic_inc(&net->fnhe_genid);
87733+ atomic_inc_unchecked(&net->fnhe_genid);
87734 }
87735
87736 #endif /* __NET_NET_NAMESPACE_H */
87737diff --git a/include/net/netlink.h b/include/net/netlink.h
87738index e010ee8..405b9f4 100644
87739--- a/include/net/netlink.h
87740+++ b/include/net/netlink.h
87741@@ -518,7 +518,7 @@ static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
87742 {
87743 if (mark) {
87744 WARN_ON((unsigned char *) mark < skb->data);
87745- skb_trim(skb, (unsigned char *) mark - skb->data);
87746+ skb_trim(skb, (const unsigned char *) mark - skb->data);
87747 }
87748 }
87749
87750diff --git a/include/net/netns/conntrack.h b/include/net/netns/conntrack.h
87751index 29d6a94..235d3d84 100644
87752--- a/include/net/netns/conntrack.h
87753+++ b/include/net/netns/conntrack.h
87754@@ -14,10 +14,10 @@ struct nf_conntrack_ecache;
87755 struct nf_proto_net {
87756 #ifdef CONFIG_SYSCTL
87757 struct ctl_table_header *ctl_table_header;
87758- struct ctl_table *ctl_table;
87759+ ctl_table_no_const *ctl_table;
87760 #ifdef CONFIG_NF_CONNTRACK_PROC_COMPAT
87761 struct ctl_table_header *ctl_compat_header;
87762- struct ctl_table *ctl_compat_table;
87763+ ctl_table_no_const *ctl_compat_table;
87764 #endif
87765 #endif
87766 unsigned int users;
87767@@ -60,7 +60,7 @@ struct nf_ip_net {
87768 struct nf_icmp_net icmpv6;
87769 #if defined(CONFIG_SYSCTL) && defined(CONFIG_NF_CONNTRACK_PROC_COMPAT)
87770 struct ctl_table_header *ctl_table_header;
87771- struct ctl_table *ctl_table;
87772+ ctl_table_no_const *ctl_table;
87773 #endif
87774 };
87775
87776diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
87777index dbe2254..ed0c151 100644
87778--- a/include/net/netns/ipv4.h
87779+++ b/include/net/netns/ipv4.h
87780@@ -87,7 +87,7 @@ struct netns_ipv4 {
87781
87782 struct ping_group_range ping_group_range;
87783
87784- atomic_t dev_addr_genid;
87785+ atomic_unchecked_t dev_addr_genid;
87786
87787 #ifdef CONFIG_SYSCTL
87788 unsigned long *sysctl_local_reserved_ports;
87789@@ -101,6 +101,6 @@ struct netns_ipv4 {
87790 struct fib_rules_ops *mr_rules_ops;
87791 #endif
87792 #endif
87793- atomic_t rt_genid;
87794+ atomic_unchecked_t rt_genid;
87795 };
87796 #endif
87797diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h
87798index 69ae41f..4f94868 100644
87799--- a/include/net/netns/ipv6.h
87800+++ b/include/net/netns/ipv6.h
87801@@ -75,8 +75,8 @@ struct netns_ipv6 {
87802 struct fib_rules_ops *mr6_rules_ops;
87803 #endif
87804 #endif
87805- atomic_t dev_addr_genid;
87806- atomic_t fib6_sernum;
87807+ atomic_unchecked_t dev_addr_genid;
87808+ atomic_unchecked_t fib6_sernum;
87809 };
87810
87811 #if IS_ENABLED(CONFIG_NF_DEFRAG_IPV6)
87812diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h
87813index 730d82a..045f2c4 100644
87814--- a/include/net/netns/xfrm.h
87815+++ b/include/net/netns/xfrm.h
87816@@ -78,7 +78,7 @@ struct netns_xfrm {
87817
87818 /* flow cache part */
87819 struct flow_cache flow_cache_global;
87820- atomic_t flow_cache_genid;
87821+ atomic_unchecked_t flow_cache_genid;
87822 struct list_head flow_cache_gc_list;
87823 spinlock_t flow_cache_gc_lock;
87824 struct work_struct flow_cache_gc_work;
87825diff --git a/include/net/ping.h b/include/net/ping.h
87826index cc16d41..664f40b 100644
87827--- a/include/net/ping.h
87828+++ b/include/net/ping.h
87829@@ -54,7 +54,7 @@ struct ping_iter_state {
87830
87831 extern struct proto ping_prot;
87832 #if IS_ENABLED(CONFIG_IPV6)
87833-extern struct pingv6_ops pingv6_ops;
87834+extern struct pingv6_ops *pingv6_ops;
87835 #endif
87836
87837 struct pingfakehdr {
87838diff --git a/include/net/protocol.h b/include/net/protocol.h
87839index d6fcc1f..ca277058 100644
87840--- a/include/net/protocol.h
87841+++ b/include/net/protocol.h
87842@@ -49,7 +49,7 @@ struct net_protocol {
87843 * socket lookup?
87844 */
87845 icmp_strict_tag_validation:1;
87846-};
87847+} __do_const;
87848
87849 #if IS_ENABLED(CONFIG_IPV6)
87850 struct inet6_protocol {
87851@@ -62,7 +62,7 @@ struct inet6_protocol {
87852 u8 type, u8 code, int offset,
87853 __be32 info);
87854 unsigned int flags; /* INET6_PROTO_xxx */
87855-};
87856+} __do_const;
87857
87858 #define INET6_PROTO_NOPOLICY 0x1
87859 #define INET6_PROTO_FINAL 0x2
87860diff --git a/include/net/rtnetlink.h b/include/net/rtnetlink.h
87861index 6c6d539..af70817 100644
87862--- a/include/net/rtnetlink.h
87863+++ b/include/net/rtnetlink.h
87864@@ -95,7 +95,7 @@ struct rtnl_link_ops {
87865 const struct net_device *dev,
87866 const struct net_device *slave_dev);
87867 struct net *(*get_link_net)(const struct net_device *dev);
87868-};
87869+} __do_const;
87870
87871 int __rtnl_link_register(struct rtnl_link_ops *ops);
87872 void __rtnl_link_unregister(struct rtnl_link_ops *ops);
87873diff --git a/include/net/sctp/checksum.h b/include/net/sctp/checksum.h
87874index 4a5b9a3..ca27d73 100644
87875--- a/include/net/sctp/checksum.h
87876+++ b/include/net/sctp/checksum.h
87877@@ -61,8 +61,8 @@ static inline __le32 sctp_compute_cksum(const struct sk_buff *skb,
87878 unsigned int offset)
87879 {
87880 struct sctphdr *sh = sctp_hdr(skb);
87881- __le32 ret, old = sh->checksum;
87882- const struct skb_checksum_ops ops = {
87883+ __le32 ret, old = sh->checksum;
87884+ static const struct skb_checksum_ops ops = {
87885 .update = sctp_csum_update,
87886 .combine = sctp_csum_combine,
87887 };
87888diff --git a/include/net/sctp/sm.h b/include/net/sctp/sm.h
87889index 487ef34..d457f98 100644
87890--- a/include/net/sctp/sm.h
87891+++ b/include/net/sctp/sm.h
87892@@ -80,7 +80,7 @@ typedef void (sctp_timer_event_t) (unsigned long);
87893 typedef struct {
87894 sctp_state_fn_t *fn;
87895 const char *name;
87896-} sctp_sm_table_entry_t;
87897+} __do_const sctp_sm_table_entry_t;
87898
87899 /* A naming convention of "sctp_sf_xxx" applies to all the state functions
87900 * currently in use.
87901@@ -292,7 +292,7 @@ __u32 sctp_generate_tag(const struct sctp_endpoint *);
87902 __u32 sctp_generate_tsn(const struct sctp_endpoint *);
87903
87904 /* Extern declarations for major data structures. */
87905-extern sctp_timer_event_t *sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
87906+extern sctp_timer_event_t * const sctp_timer_events[SCTP_NUM_TIMEOUT_TYPES];
87907
87908
87909 /* Get the size of a DATA chunk payload. */
87910diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
87911index 2bb2fcf..d17c291 100644
87912--- a/include/net/sctp/structs.h
87913+++ b/include/net/sctp/structs.h
87914@@ -509,7 +509,7 @@ struct sctp_pf {
87915 void (*to_sk_saddr)(union sctp_addr *, struct sock *sk);
87916 void (*to_sk_daddr)(union sctp_addr *, struct sock *sk);
87917 struct sctp_af *af;
87918-};
87919+} __do_const;
87920
87921
87922 /* Structure to track chunk fragments that have been acked, but peer
87923diff --git a/include/net/sock.h b/include/net/sock.h
87924index e4079c2..79c5d3a 100644
87925--- a/include/net/sock.h
87926+++ b/include/net/sock.h
87927@@ -362,7 +362,7 @@ struct sock {
87928 unsigned int sk_napi_id;
87929 unsigned int sk_ll_usec;
87930 #endif
87931- atomic_t sk_drops;
87932+ atomic_unchecked_t sk_drops;
87933 int sk_rcvbuf;
87934
87935 struct sk_filter __rcu *sk_filter;
87936@@ -1039,7 +1039,7 @@ struct proto {
87937 void (*destroy_cgroup)(struct mem_cgroup *memcg);
87938 struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg);
87939 #endif
87940-};
87941+} __randomize_layout;
87942
87943 /*
87944 * Bits in struct cg_proto.flags
87945@@ -1212,7 +1212,7 @@ static inline void memcg_memory_allocated_sub(struct cg_proto *prot,
87946 page_counter_uncharge(&prot->memory_allocated, amt);
87947 }
87948
87949-static inline long
87950+static inline long __intentional_overflow(-1)
87951 sk_memory_allocated(const struct sock *sk)
87952 {
87953 struct proto *prot = sk->sk_prot;
87954@@ -1778,7 +1778,7 @@ static inline void sk_nocaps_add(struct sock *sk, netdev_features_t flags)
87955 }
87956
87957 static inline int skb_do_copy_data_nocache(struct sock *sk, struct sk_buff *skb,
87958- struct iov_iter *from, char *to,
87959+ struct iov_iter *from, unsigned char *to,
87960 int copy, int offset)
87961 {
87962 if (skb->ip_summed == CHECKSUM_NONE) {
87963@@ -2025,7 +2025,7 @@ static inline void sk_stream_moderate_sndbuf(struct sock *sk)
87964 }
87965 }
87966
87967-struct sk_buff *sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
87968+struct sk_buff * __intentional_overflow(0) sk_stream_alloc_skb(struct sock *sk, int size, gfp_t gfp);
87969
87970 /**
87971 * sk_page_frag - return an appropriate page_frag
87972diff --git a/include/net/tcp.h b/include/net/tcp.h
87973index 8d6b983..5813205 100644
87974--- a/include/net/tcp.h
87975+++ b/include/net/tcp.h
87976@@ -516,7 +516,7 @@ void tcp_retransmit_timer(struct sock *sk);
87977 void tcp_xmit_retransmit_queue(struct sock *);
87978 void tcp_simple_retransmit(struct sock *);
87979 int tcp_trim_head(struct sock *, struct sk_buff *, u32);
87980-int tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
87981+int __intentional_overflow(3) tcp_fragment(struct sock *, struct sk_buff *, u32, unsigned int, gfp_t);
87982
87983 void tcp_send_probe0(struct sock *);
87984 void tcp_send_partial(struct sock *);
87985@@ -694,8 +694,8 @@ static inline u32 tcp_skb_timestamp(const struct sk_buff *skb)
87986 * If this grows please adjust skbuff.h:skbuff->cb[xxx] size appropriately.
87987 */
87988 struct tcp_skb_cb {
87989- __u32 seq; /* Starting sequence number */
87990- __u32 end_seq; /* SEQ + FIN + SYN + datalen */
87991+ __u32 seq __intentional_overflow(0); /* Starting sequence number */
87992+ __u32 end_seq __intentional_overflow(0); /* SEQ + FIN + SYN + datalen */
87993 union {
87994 /* Note : tcp_tw_isn is used in input path only
87995 * (isn chosen by tcp_timewait_state_process())
87996@@ -720,7 +720,7 @@ struct tcp_skb_cb {
87997
87998 __u8 ip_dsfield; /* IPv4 tos or IPv6 dsfield */
87999 /* 1 byte hole */
88000- __u32 ack_seq; /* Sequence number ACK'd */
88001+ __u32 ack_seq __intentional_overflow(0); /* Sequence number ACK'd */
88002 union {
88003 struct inet_skb_parm h4;
88004 #if IS_ENABLED(CONFIG_IPV6)
88005diff --git a/include/net/xfrm.h b/include/net/xfrm.h
88006index dc4865e..152ee4c 100644
88007--- a/include/net/xfrm.h
88008+++ b/include/net/xfrm.h
88009@@ -285,7 +285,6 @@ struct xfrm_dst;
88010 struct xfrm_policy_afinfo {
88011 unsigned short family;
88012 struct dst_ops *dst_ops;
88013- void (*garbage_collect)(struct net *net);
88014 struct dst_entry *(*dst_lookup)(struct net *net, int tos,
88015 const xfrm_address_t *saddr,
88016 const xfrm_address_t *daddr);
88017@@ -303,7 +302,7 @@ struct xfrm_policy_afinfo {
88018 struct net_device *dev,
88019 const struct flowi *fl);
88020 struct dst_entry *(*blackhole_route)(struct net *net, struct dst_entry *orig);
88021-};
88022+} __do_const;
88023
88024 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo);
88025 int xfrm_policy_unregister_afinfo(struct xfrm_policy_afinfo *afinfo);
88026@@ -342,7 +341,7 @@ struct xfrm_state_afinfo {
88027 int (*transport_finish)(struct sk_buff *skb,
88028 int async);
88029 void (*local_error)(struct sk_buff *skb, u32 mtu);
88030-};
88031+} __do_const;
88032
88033 int xfrm_state_register_afinfo(struct xfrm_state_afinfo *afinfo);
88034 int xfrm_state_unregister_afinfo(struct xfrm_state_afinfo *afinfo);
88035@@ -437,7 +436,7 @@ struct xfrm_mode {
88036 struct module *owner;
88037 unsigned int encap;
88038 int flags;
88039-};
88040+} __do_const;
88041
88042 /* Flags for xfrm_mode. */
88043 enum {
88044@@ -534,7 +533,7 @@ struct xfrm_policy {
88045 struct timer_list timer;
88046
88047 struct flow_cache_object flo;
88048- atomic_t genid;
88049+ atomic_unchecked_t genid;
88050 u32 priority;
88051 u32 index;
88052 struct xfrm_mark mark;
88053@@ -1167,6 +1166,7 @@ static inline void xfrm_sk_free_policy(struct sock *sk)
88054 }
88055
88056 void xfrm_garbage_collect(struct net *net);
88057+void xfrm_garbage_collect_deferred(struct net *net);
88058
88059 #else
88060
88061@@ -1205,6 +1205,9 @@ static inline int xfrm6_policy_check_reverse(struct sock *sk, int dir,
88062 static inline void xfrm_garbage_collect(struct net *net)
88063 {
88064 }
88065+static inline void xfrm_garbage_collect_deferred(struct net *net)
88066+{
88067+}
88068 #endif
88069
88070 static __inline__
88071diff --git a/include/rdma/iw_cm.h b/include/rdma/iw_cm.h
88072index 1017e0b..227aa4d 100644
88073--- a/include/rdma/iw_cm.h
88074+++ b/include/rdma/iw_cm.h
88075@@ -122,7 +122,7 @@ struct iw_cm_verbs {
88076 int backlog);
88077
88078 int (*destroy_listen)(struct iw_cm_id *cm_id);
88079-};
88080+} __no_const;
88081
88082 /**
88083 * iw_create_cm_id - Create an IW CM identifier.
88084diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h
88085index 93d14da..734b3d8 100644
88086--- a/include/scsi/libfc.h
88087+++ b/include/scsi/libfc.h
88088@@ -771,6 +771,7 @@ struct libfc_function_template {
88089 */
88090 void (*disc_stop_final) (struct fc_lport *);
88091 };
88092+typedef struct libfc_function_template __no_const libfc_function_template_no_const;
88093
88094 /**
88095 * struct fc_disc - Discovery context
88096@@ -875,7 +876,7 @@ struct fc_lport {
88097 struct fc_vport *vport;
88098
88099 /* Operational Information */
88100- struct libfc_function_template tt;
88101+ libfc_function_template_no_const tt;
88102 u8 link_up;
88103 u8 qfull;
88104 enum fc_lport_state state;
88105diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
88106index a4c9336..d6f8f34 100644
88107--- a/include/scsi/scsi_device.h
88108+++ b/include/scsi/scsi_device.h
88109@@ -185,9 +185,9 @@ struct scsi_device {
88110 unsigned int max_device_blocked; /* what device_blocked counts down from */
88111 #define SCSI_DEFAULT_DEVICE_BLOCKED 3
88112
88113- atomic_t iorequest_cnt;
88114- atomic_t iodone_cnt;
88115- atomic_t ioerr_cnt;
88116+ atomic_unchecked_t iorequest_cnt;
88117+ atomic_unchecked_t iodone_cnt;
88118+ atomic_unchecked_t ioerr_cnt;
88119
88120 struct device sdev_gendev,
88121 sdev_dev;
88122diff --git a/include/scsi/scsi_transport_fc.h b/include/scsi/scsi_transport_fc.h
88123index 007a0bc..7188db8 100644
88124--- a/include/scsi/scsi_transport_fc.h
88125+++ b/include/scsi/scsi_transport_fc.h
88126@@ -756,7 +756,8 @@ struct fc_function_template {
88127 unsigned long show_host_system_hostname:1;
88128
88129 unsigned long disable_target_scan:1;
88130-};
88131+} __do_const;
88132+typedef struct fc_function_template __no_const fc_function_template_no_const;
88133
88134
88135 /**
88136diff --git a/include/sound/compress_driver.h b/include/sound/compress_driver.h
88137index f48089d..73abe48 100644
88138--- a/include/sound/compress_driver.h
88139+++ b/include/sound/compress_driver.h
88140@@ -130,7 +130,7 @@ struct snd_compr_ops {
88141 struct snd_compr_caps *caps);
88142 int (*get_codec_caps) (struct snd_compr_stream *stream,
88143 struct snd_compr_codec_caps *codec);
88144-};
88145+} __no_const;
88146
88147 /**
88148 * struct snd_compr: Compressed device
88149diff --git a/include/sound/soc.h b/include/sound/soc.h
88150index 0d1ade1..34e77d3 100644
88151--- a/include/sound/soc.h
88152+++ b/include/sound/soc.h
88153@@ -856,7 +856,7 @@ struct snd_soc_codec_driver {
88154 enum snd_soc_dapm_type, int);
88155
88156 bool ignore_pmdown_time; /* Doesn't benefit from pmdown delay */
88157-};
88158+} __do_const;
88159
88160 /* SoC platform interface */
88161 struct snd_soc_platform_driver {
88162@@ -883,7 +883,7 @@ struct snd_soc_platform_driver {
88163 const struct snd_compr_ops *compr_ops;
88164
88165 int (*bespoke_trigger)(struct snd_pcm_substream *, int);
88166-};
88167+} __do_const;
88168
88169 struct snd_soc_dai_link_component {
88170 const char *name;
88171diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h
88172index 985ca4c..b55b54a 100644
88173--- a/include/target/target_core_base.h
88174+++ b/include/target/target_core_base.h
88175@@ -767,7 +767,7 @@ struct se_device {
88176 atomic_long_t write_bytes;
88177 /* Active commands on this virtual SE device */
88178 atomic_t simple_cmds;
88179- atomic_t dev_ordered_id;
88180+ atomic_unchecked_t dev_ordered_id;
88181 atomic_t dev_ordered_sync;
88182 atomic_t dev_qf_count;
88183 int export_count;
88184diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
88185new file mode 100644
88186index 0000000..fb634b7
88187--- /dev/null
88188+++ b/include/trace/events/fs.h
88189@@ -0,0 +1,53 @@
88190+#undef TRACE_SYSTEM
88191+#define TRACE_SYSTEM fs
88192+
88193+#if !defined(_TRACE_FS_H) || defined(TRACE_HEADER_MULTI_READ)
88194+#define _TRACE_FS_H
88195+
88196+#include <linux/fs.h>
88197+#include <linux/tracepoint.h>
88198+
88199+TRACE_EVENT(do_sys_open,
88200+
88201+ TP_PROTO(const char *filename, int flags, int mode),
88202+
88203+ TP_ARGS(filename, flags, mode),
88204+
88205+ TP_STRUCT__entry(
88206+ __string( filename, filename )
88207+ __field( int, flags )
88208+ __field( int, mode )
88209+ ),
88210+
88211+ TP_fast_assign(
88212+ __assign_str(filename, filename);
88213+ __entry->flags = flags;
88214+ __entry->mode = mode;
88215+ ),
88216+
88217+ TP_printk("\"%s\" %x %o",
88218+ __get_str(filename), __entry->flags, __entry->mode)
88219+);
88220+
88221+TRACE_EVENT(open_exec,
88222+
88223+ TP_PROTO(const char *filename),
88224+
88225+ TP_ARGS(filename),
88226+
88227+ TP_STRUCT__entry(
88228+ __string( filename, filename )
88229+ ),
88230+
88231+ TP_fast_assign(
88232+ __assign_str(filename, filename);
88233+ ),
88234+
88235+ TP_printk("\"%s\"",
88236+ __get_str(filename))
88237+);
88238+
88239+#endif /* _TRACE_FS_H */
88240+
88241+/* This part must be outside protection */
88242+#include <trace/define_trace.h>
88243diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
88244index 3608beb..df39d8a 100644
88245--- a/include/trace/events/irq.h
88246+++ b/include/trace/events/irq.h
88247@@ -36,7 +36,7 @@ struct softirq_action;
88248 */
88249 TRACE_EVENT(irq_handler_entry,
88250
88251- TP_PROTO(int irq, struct irqaction *action),
88252+ TP_PROTO(int irq, const struct irqaction *action),
88253
88254 TP_ARGS(irq, action),
88255
88256@@ -66,7 +66,7 @@ TRACE_EVENT(irq_handler_entry,
88257 */
88258 TRACE_EVENT(irq_handler_exit,
88259
88260- TP_PROTO(int irq, struct irqaction *action, int ret),
88261+ TP_PROTO(int irq, const struct irqaction *action, int ret),
88262
88263 TP_ARGS(irq, action, ret),
88264
88265diff --git a/include/uapi/linux/a.out.h b/include/uapi/linux/a.out.h
88266index 7caf44c..23c6f27 100644
88267--- a/include/uapi/linux/a.out.h
88268+++ b/include/uapi/linux/a.out.h
88269@@ -39,6 +39,14 @@ enum machine_type {
88270 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
88271 };
88272
88273+/* Constants for the N_FLAGS field */
88274+#define F_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
88275+#define F_PAX_EMUTRAMP 2 /* Emulate trampolines */
88276+#define F_PAX_MPROTECT 4 /* Restrict mprotect() */
88277+#define F_PAX_RANDMMAP 8 /* Randomize mmap() base */
88278+/*#define F_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
88279+#define F_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
88280+
88281 #if !defined (N_MAGIC)
88282 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
88283 #endif
88284diff --git a/include/uapi/linux/bcache.h b/include/uapi/linux/bcache.h
88285index 22b6ad3..aeba37e 100644
88286--- a/include/uapi/linux/bcache.h
88287+++ b/include/uapi/linux/bcache.h
88288@@ -5,6 +5,7 @@
88289 * Bcache on disk data structures
88290 */
88291
88292+#include <linux/compiler.h>
88293 #include <asm/types.h>
88294
88295 #define BITMASK(name, type, field, offset, size) \
88296@@ -20,8 +21,8 @@ static inline void SET_##name(type *k, __u64 v) \
88297 /* Btree keys - all units are in sectors */
88298
88299 struct bkey {
88300- __u64 high;
88301- __u64 low;
88302+ __u64 high __intentional_overflow(-1);
88303+ __u64 low __intentional_overflow(-1);
88304 __u64 ptr[];
88305 };
88306
88307diff --git a/include/uapi/linux/byteorder/little_endian.h b/include/uapi/linux/byteorder/little_endian.h
88308index d876736..ccce5c0 100644
88309--- a/include/uapi/linux/byteorder/little_endian.h
88310+++ b/include/uapi/linux/byteorder/little_endian.h
88311@@ -42,51 +42,51 @@
88312
88313 static inline __le64 __cpu_to_le64p(const __u64 *p)
88314 {
88315- return (__force __le64)*p;
88316+ return (__force const __le64)*p;
88317 }
88318-static inline __u64 __le64_to_cpup(const __le64 *p)
88319+static inline __u64 __intentional_overflow(-1) __le64_to_cpup(const __le64 *p)
88320 {
88321- return (__force __u64)*p;
88322+ return (__force const __u64)*p;
88323 }
88324 static inline __le32 __cpu_to_le32p(const __u32 *p)
88325 {
88326- return (__force __le32)*p;
88327+ return (__force const __le32)*p;
88328 }
88329 static inline __u32 __le32_to_cpup(const __le32 *p)
88330 {
88331- return (__force __u32)*p;
88332+ return (__force const __u32)*p;
88333 }
88334 static inline __le16 __cpu_to_le16p(const __u16 *p)
88335 {
88336- return (__force __le16)*p;
88337+ return (__force const __le16)*p;
88338 }
88339 static inline __u16 __le16_to_cpup(const __le16 *p)
88340 {
88341- return (__force __u16)*p;
88342+ return (__force const __u16)*p;
88343 }
88344 static inline __be64 __cpu_to_be64p(const __u64 *p)
88345 {
88346- return (__force __be64)__swab64p(p);
88347+ return (__force const __be64)__swab64p(p);
88348 }
88349 static inline __u64 __be64_to_cpup(const __be64 *p)
88350 {
88351- return __swab64p((__u64 *)p);
88352+ return __swab64p((const __u64 *)p);
88353 }
88354 static inline __be32 __cpu_to_be32p(const __u32 *p)
88355 {
88356- return (__force __be32)__swab32p(p);
88357+ return (__force const __be32)__swab32p(p);
88358 }
88359-static inline __u32 __be32_to_cpup(const __be32 *p)
88360+static inline __u32 __intentional_overflow(-1) __be32_to_cpup(const __be32 *p)
88361 {
88362- return __swab32p((__u32 *)p);
88363+ return __swab32p((const __u32 *)p);
88364 }
88365 static inline __be16 __cpu_to_be16p(const __u16 *p)
88366 {
88367- return (__force __be16)__swab16p(p);
88368+ return (__force const __be16)__swab16p(p);
88369 }
88370 static inline __u16 __be16_to_cpup(const __be16 *p)
88371 {
88372- return __swab16p((__u16 *)p);
88373+ return __swab16p((const __u16 *)p);
88374 }
88375 #define __cpu_to_le64s(x) do { (void)(x); } while (0)
88376 #define __le64_to_cpus(x) do { (void)(x); } while (0)
88377diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h
88378index 71e1d0e..6cc9caf 100644
88379--- a/include/uapi/linux/elf.h
88380+++ b/include/uapi/linux/elf.h
88381@@ -37,6 +37,17 @@ typedef __s64 Elf64_Sxword;
88382 #define PT_GNU_EH_FRAME 0x6474e550
88383
88384 #define PT_GNU_STACK (PT_LOOS + 0x474e551)
88385+#define PT_GNU_RELRO (PT_LOOS + 0x474e552)
88386+
88387+#define PT_PAX_FLAGS (PT_LOOS + 0x5041580)
88388+
88389+/* Constants for the e_flags field */
88390+#define EF_PAX_PAGEEXEC 1 /* Paging based non-executable pages */
88391+#define EF_PAX_EMUTRAMP 2 /* Emulate trampolines */
88392+#define EF_PAX_MPROTECT 4 /* Restrict mprotect() */
88393+#define EF_PAX_RANDMMAP 8 /* Randomize mmap() base */
88394+/*#define EF_PAX_RANDEXEC 16*/ /* Randomize ET_EXEC base */
88395+#define EF_PAX_SEGMEXEC 32 /* Segmentation based non-executable pages */
88396
88397 /*
88398 * Extended Numbering
88399@@ -94,6 +105,8 @@ typedef __s64 Elf64_Sxword;
88400 #define DT_DEBUG 21
88401 #define DT_TEXTREL 22
88402 #define DT_JMPREL 23
88403+#define DT_FLAGS 30
88404+ #define DF_TEXTREL 0x00000004
88405 #define DT_ENCODING 32
88406 #define OLD_DT_LOOS 0x60000000
88407 #define DT_LOOS 0x6000000d
88408@@ -240,6 +253,19 @@ typedef struct elf64_hdr {
88409 #define PF_W 0x2
88410 #define PF_X 0x1
88411
88412+#define PF_PAGEEXEC (1U << 4) /* Enable PAGEEXEC */
88413+#define PF_NOPAGEEXEC (1U << 5) /* Disable PAGEEXEC */
88414+#define PF_SEGMEXEC (1U << 6) /* Enable SEGMEXEC */
88415+#define PF_NOSEGMEXEC (1U << 7) /* Disable SEGMEXEC */
88416+#define PF_MPROTECT (1U << 8) /* Enable MPROTECT */
88417+#define PF_NOMPROTECT (1U << 9) /* Disable MPROTECT */
88418+/*#define PF_RANDEXEC (1U << 10)*/ /* Enable RANDEXEC */
88419+/*#define PF_NORANDEXEC (1U << 11)*/ /* Disable RANDEXEC */
88420+#define PF_EMUTRAMP (1U << 12) /* Enable EMUTRAMP */
88421+#define PF_NOEMUTRAMP (1U << 13) /* Disable EMUTRAMP */
88422+#define PF_RANDMMAP (1U << 14) /* Enable RANDMMAP */
88423+#define PF_NORANDMMAP (1U << 15) /* Disable RANDMMAP */
88424+
88425 typedef struct elf32_phdr{
88426 Elf32_Word p_type;
88427 Elf32_Off p_offset;
88428@@ -332,6 +358,8 @@ typedef struct elf64_shdr {
88429 #define EI_OSABI 7
88430 #define EI_PAD 8
88431
88432+#define EI_PAX 14
88433+
88434 #define ELFMAG0 0x7f /* EI_MAG */
88435 #define ELFMAG1 'E'
88436 #define ELFMAG2 'L'
88437diff --git a/include/uapi/linux/personality.h b/include/uapi/linux/personality.h
88438index aa169c4..6a2771d 100644
88439--- a/include/uapi/linux/personality.h
88440+++ b/include/uapi/linux/personality.h
88441@@ -30,6 +30,7 @@ enum {
88442 #define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC | \
88443 ADDR_NO_RANDOMIZE | \
88444 ADDR_COMPAT_LAYOUT | \
88445+ ADDR_LIMIT_3GB | \
88446 MMAP_PAGE_ZERO)
88447
88448 /*
88449diff --git a/include/uapi/linux/screen_info.h b/include/uapi/linux/screen_info.h
88450index 7530e74..e714828 100644
88451--- a/include/uapi/linux/screen_info.h
88452+++ b/include/uapi/linux/screen_info.h
88453@@ -43,7 +43,8 @@ struct screen_info {
88454 __u16 pages; /* 0x32 */
88455 __u16 vesa_attributes; /* 0x34 */
88456 __u32 capabilities; /* 0x36 */
88457- __u8 _reserved[6]; /* 0x3a */
88458+ __u16 vesapm_size; /* 0x3a */
88459+ __u8 _reserved[4]; /* 0x3c */
88460 } __attribute__((packed));
88461
88462 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
88463diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
88464index 0e011eb..82681b1 100644
88465--- a/include/uapi/linux/swab.h
88466+++ b/include/uapi/linux/swab.h
88467@@ -43,7 +43,7 @@
88468 * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
88469 */
88470
88471-static inline __attribute_const__ __u16 __fswab16(__u16 val)
88472+static inline __intentional_overflow(-1) __attribute_const__ __u16 __fswab16(__u16 val)
88473 {
88474 #ifdef __HAVE_BUILTIN_BSWAP16__
88475 return __builtin_bswap16(val);
88476@@ -54,7 +54,7 @@ static inline __attribute_const__ __u16 __fswab16(__u16 val)
88477 #endif
88478 }
88479
88480-static inline __attribute_const__ __u32 __fswab32(__u32 val)
88481+static inline __intentional_overflow(-1) __attribute_const__ __u32 __fswab32(__u32 val)
88482 {
88483 #ifdef __HAVE_BUILTIN_BSWAP32__
88484 return __builtin_bswap32(val);
88485@@ -65,7 +65,7 @@ static inline __attribute_const__ __u32 __fswab32(__u32 val)
88486 #endif
88487 }
88488
88489-static inline __attribute_const__ __u64 __fswab64(__u64 val)
88490+static inline __intentional_overflow(-1) __attribute_const__ __u64 __fswab64(__u64 val)
88491 {
88492 #ifdef __HAVE_BUILTIN_BSWAP64__
88493 return __builtin_bswap64(val);
88494diff --git a/include/uapi/linux/xattr.h b/include/uapi/linux/xattr.h
88495index 1590c49..5eab462 100644
88496--- a/include/uapi/linux/xattr.h
88497+++ b/include/uapi/linux/xattr.h
88498@@ -73,5 +73,9 @@
88499 #define XATTR_POSIX_ACL_DEFAULT "posix_acl_default"
88500 #define XATTR_NAME_POSIX_ACL_DEFAULT XATTR_SYSTEM_PREFIX XATTR_POSIX_ACL_DEFAULT
88501
88502+/* User namespace */
88503+#define XATTR_PAX_PREFIX XATTR_USER_PREFIX "pax."
88504+#define XATTR_PAX_FLAGS_SUFFIX "flags"
88505+#define XATTR_NAME_PAX_FLAGS XATTR_PAX_PREFIX XATTR_PAX_FLAGS_SUFFIX
88506
88507 #endif /* _UAPI_LINUX_XATTR_H */
88508diff --git a/include/video/udlfb.h b/include/video/udlfb.h
88509index f9466fa..f4e2b81 100644
88510--- a/include/video/udlfb.h
88511+++ b/include/video/udlfb.h
88512@@ -53,10 +53,10 @@ struct dlfb_data {
88513 u32 pseudo_palette[256];
88514 int blank_mode; /*one of FB_BLANK_ */
88515 /* blit-only rendering path metrics, exposed through sysfs */
88516- atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */
88517- atomic_t bytes_identical; /* saved effort with backbuffer comparison */
88518- atomic_t bytes_sent; /* to usb, after compression including overhead */
88519- atomic_t cpu_kcycles_used; /* transpired during pixel processing */
88520+ atomic_unchecked_t bytes_rendered; /* raw pixel-bytes driver asked to render */
88521+ atomic_unchecked_t bytes_identical; /* saved effort with backbuffer comparison */
88522+ atomic_unchecked_t bytes_sent; /* to usb, after compression including overhead */
88523+ atomic_unchecked_t cpu_kcycles_used; /* transpired during pixel processing */
88524 };
88525
88526 #define NR_USB_REQUEST_I2C_SUB_IO 0x02
88527diff --git a/include/video/uvesafb.h b/include/video/uvesafb.h
88528index 30f5362..8ed8ac9 100644
88529--- a/include/video/uvesafb.h
88530+++ b/include/video/uvesafb.h
88531@@ -122,6 +122,7 @@ struct uvesafb_par {
88532 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
88533 u8 pmi_setpal; /* PMI for palette changes */
88534 u16 *pmi_base; /* protected mode interface location */
88535+ u8 *pmi_code; /* protected mode code location */
88536 void *pmi_start;
88537 void *pmi_pal;
88538 u8 *vbe_state_orig; /*
88539diff --git a/init/Kconfig b/init/Kconfig
88540index f5dbc6d..8259396 100644
88541--- a/init/Kconfig
88542+++ b/init/Kconfig
88543@@ -1136,6 +1136,7 @@ endif # CGROUPS
88544
88545 config CHECKPOINT_RESTORE
88546 bool "Checkpoint/restore support" if EXPERT
88547+ depends on !GRKERNSEC
88548 default n
88549 help
88550 Enables additional kernel features in a sake of checkpoint/restore.
88551@@ -1646,7 +1647,7 @@ config SLUB_DEBUG
88552
88553 config COMPAT_BRK
88554 bool "Disable heap randomization"
88555- default y
88556+ default n
88557 help
88558 Randomizing heap placement makes heap exploits harder, but it
88559 also breaks ancient binaries (including anything libc5 based).
88560@@ -1977,7 +1978,7 @@ config INIT_ALL_POSSIBLE
88561 config STOP_MACHINE
88562 bool
88563 default y
88564- depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU
88565+ depends on (SMP && MODULE_UNLOAD) || HOTPLUG_CPU || GRKERNSEC
88566 help
88567 Need stop_machine() primitive.
88568
88569diff --git a/init/Makefile b/init/Makefile
88570index 7bc47ee..6da2dc7 100644
88571--- a/init/Makefile
88572+++ b/init/Makefile
88573@@ -2,6 +2,9 @@
88574 # Makefile for the linux kernel.
88575 #
88576
88577+ccflags-y := $(GCC_PLUGINS_CFLAGS)
88578+asflags-y := $(GCC_PLUGINS_AFLAGS)
88579+
88580 obj-y := main.o version.o mounts.o
88581 ifneq ($(CONFIG_BLK_DEV_INITRD),y)
88582 obj-y += noinitramfs.o
88583diff --git a/init/do_mounts.c b/init/do_mounts.c
88584index eb41008..f5dbbf9 100644
88585--- a/init/do_mounts.c
88586+++ b/init/do_mounts.c
88587@@ -360,11 +360,11 @@ static void __init get_fs_names(char *page)
88588 static int __init do_mount_root(char *name, char *fs, int flags, void *data)
88589 {
88590 struct super_block *s;
88591- int err = sys_mount(name, "/root", fs, flags, data);
88592+ int err = sys_mount((char __force_user *)name, (char __force_user *)"/root", (char __force_user *)fs, flags, (void __force_user *)data);
88593 if (err)
88594 return err;
88595
88596- sys_chdir("/root");
88597+ sys_chdir((const char __force_user *)"/root");
88598 s = current->fs->pwd.dentry->d_sb;
88599 ROOT_DEV = s->s_dev;
88600 printk(KERN_INFO
88601@@ -487,18 +487,18 @@ void __init change_floppy(char *fmt, ...)
88602 va_start(args, fmt);
88603 vsprintf(buf, fmt, args);
88604 va_end(args);
88605- fd = sys_open("/dev/root", O_RDWR | O_NDELAY, 0);
88606+ fd = sys_open((char __user *)"/dev/root", O_RDWR | O_NDELAY, 0);
88607 if (fd >= 0) {
88608 sys_ioctl(fd, FDEJECT, 0);
88609 sys_close(fd);
88610 }
88611 printk(KERN_NOTICE "VFS: Insert %s and press ENTER\n", buf);
88612- fd = sys_open("/dev/console", O_RDWR, 0);
88613+ fd = sys_open((__force const char __user *)"/dev/console", O_RDWR, 0);
88614 if (fd >= 0) {
88615 sys_ioctl(fd, TCGETS, (long)&termios);
88616 termios.c_lflag &= ~ICANON;
88617 sys_ioctl(fd, TCSETSF, (long)&termios);
88618- sys_read(fd, &c, 1);
88619+ sys_read(fd, (char __user *)&c, 1);
88620 termios.c_lflag |= ICANON;
88621 sys_ioctl(fd, TCSETSF, (long)&termios);
88622 sys_close(fd);
88623@@ -592,8 +592,8 @@ void __init prepare_namespace(void)
88624 mount_root();
88625 out:
88626 devtmpfs_mount("dev");
88627- sys_mount(".", "/", NULL, MS_MOVE, NULL);
88628- sys_chroot(".");
88629+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
88630+ sys_chroot((const char __force_user *)".");
88631 }
88632
88633 static bool is_tmpfs;
88634diff --git a/init/do_mounts.h b/init/do_mounts.h
88635index f5b978a..69dbfe8 100644
88636--- a/init/do_mounts.h
88637+++ b/init/do_mounts.h
88638@@ -15,15 +15,15 @@ extern int root_mountflags;
88639
88640 static inline int create_dev(char *name, dev_t dev)
88641 {
88642- sys_unlink(name);
88643- return sys_mknod(name, S_IFBLK|0600, new_encode_dev(dev));
88644+ sys_unlink((char __force_user *)name);
88645+ return sys_mknod((char __force_user *)name, S_IFBLK|0600, new_encode_dev(dev));
88646 }
88647
88648 #if BITS_PER_LONG == 32
88649 static inline u32 bstat(char *name)
88650 {
88651 struct stat64 stat;
88652- if (sys_stat64(name, &stat) != 0)
88653+ if (sys_stat64((char __force_user *)name, (struct stat64 __force_user *)&stat) != 0)
88654 return 0;
88655 if (!S_ISBLK(stat.st_mode))
88656 return 0;
88657@@ -35,7 +35,7 @@ static inline u32 bstat(char *name)
88658 static inline u32 bstat(char *name)
88659 {
88660 struct stat stat;
88661- if (sys_newstat(name, &stat) != 0)
88662+ if (sys_newstat((const char __force_user *)name, (struct stat __force_user *)&stat) != 0)
88663 return 0;
88664 if (!S_ISBLK(stat.st_mode))
88665 return 0;
88666diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
88667index 3e0878e..8a9d7a0 100644
88668--- a/init/do_mounts_initrd.c
88669+++ b/init/do_mounts_initrd.c
88670@@ -37,13 +37,13 @@ static int init_linuxrc(struct subprocess_info *info, struct cred *new)
88671 {
88672 sys_unshare(CLONE_FS | CLONE_FILES);
88673 /* stdin/stdout/stderr for /linuxrc */
88674- sys_open("/dev/console", O_RDWR, 0);
88675+ sys_open((const char __force_user *)"/dev/console", O_RDWR, 0);
88676 sys_dup(0);
88677 sys_dup(0);
88678 /* move initrd over / and chdir/chroot in initrd root */
88679- sys_chdir("/root");
88680- sys_mount(".", "/", NULL, MS_MOVE, NULL);
88681- sys_chroot(".");
88682+ sys_chdir((const char __force_user *)"/root");
88683+ sys_mount((char __force_user *)".", (char __force_user *)"/", NULL, MS_MOVE, NULL);
88684+ sys_chroot((const char __force_user *)".");
88685 sys_setsid();
88686 return 0;
88687 }
88688@@ -59,8 +59,8 @@ static void __init handle_initrd(void)
88689 create_dev("/dev/root.old", Root_RAM0);
88690 /* mount initrd on rootfs' /root */
88691 mount_block_root("/dev/root.old", root_mountflags & ~MS_RDONLY);
88692- sys_mkdir("/old", 0700);
88693- sys_chdir("/old");
88694+ sys_mkdir((const char __force_user *)"/old", 0700);
88695+ sys_chdir((const char __force_user *)"/old");
88696
88697 /* try loading default modules from initrd */
88698 load_default_modules();
88699@@ -80,31 +80,31 @@ static void __init handle_initrd(void)
88700 current->flags &= ~PF_FREEZER_SKIP;
88701
88702 /* move initrd to rootfs' /old */
88703- sys_mount("..", ".", NULL, MS_MOVE, NULL);
88704+ sys_mount((char __force_user *)"..", (char __force_user *)".", NULL, MS_MOVE, NULL);
88705 /* switch root and cwd back to / of rootfs */
88706- sys_chroot("..");
88707+ sys_chroot((const char __force_user *)"..");
88708
88709 if (new_decode_dev(real_root_dev) == Root_RAM0) {
88710- sys_chdir("/old");
88711+ sys_chdir((const char __force_user *)"/old");
88712 return;
88713 }
88714
88715- sys_chdir("/");
88716+ sys_chdir((const char __force_user *)"/");
88717 ROOT_DEV = new_decode_dev(real_root_dev);
88718 mount_root();
88719
88720 printk(KERN_NOTICE "Trying to move old root to /initrd ... ");
88721- error = sys_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL);
88722+ error = sys_mount((char __force_user *)"/old", (char __force_user *)"/root/initrd", NULL, MS_MOVE, NULL);
88723 if (!error)
88724 printk("okay\n");
88725 else {
88726- int fd = sys_open("/dev/root.old", O_RDWR, 0);
88727+ int fd = sys_open((const char __force_user *)"/dev/root.old", O_RDWR, 0);
88728 if (error == -ENOENT)
88729 printk("/initrd does not exist. Ignored.\n");
88730 else
88731 printk("failed\n");
88732 printk(KERN_NOTICE "Unmounting old root\n");
88733- sys_umount("/old", MNT_DETACH);
88734+ sys_umount((char __force_user *)"/old", MNT_DETACH);
88735 printk(KERN_NOTICE "Trying to free ramdisk memory ... ");
88736 if (fd < 0) {
88737 error = fd;
88738@@ -127,11 +127,11 @@ int __init initrd_load(void)
88739 * mounted in the normal path.
88740 */
88741 if (rd_load_image("/initrd.image") && ROOT_DEV != Root_RAM0) {
88742- sys_unlink("/initrd.image");
88743+ sys_unlink((const char __force_user *)"/initrd.image");
88744 handle_initrd();
88745 return 1;
88746 }
88747 }
88748- sys_unlink("/initrd.image");
88749+ sys_unlink((const char __force_user *)"/initrd.image");
88750 return 0;
88751 }
88752diff --git a/init/do_mounts_md.c b/init/do_mounts_md.c
88753index 8cb6db5..d729f50 100644
88754--- a/init/do_mounts_md.c
88755+++ b/init/do_mounts_md.c
88756@@ -180,7 +180,7 @@ static void __init md_setup_drive(void)
88757 partitioned ? "_d" : "", minor,
88758 md_setup_args[ent].device_names);
88759
88760- fd = sys_open(name, 0, 0);
88761+ fd = sys_open((char __force_user *)name, 0, 0);
88762 if (fd < 0) {
88763 printk(KERN_ERR "md: open failed - cannot start "
88764 "array %s\n", name);
88765@@ -243,7 +243,7 @@ static void __init md_setup_drive(void)
88766 * array without it
88767 */
88768 sys_close(fd);
88769- fd = sys_open(name, 0, 0);
88770+ fd = sys_open((char __force_user *)name, 0, 0);
88771 sys_ioctl(fd, BLKRRPART, 0);
88772 }
88773 sys_close(fd);
88774@@ -293,7 +293,7 @@ static void __init autodetect_raid(void)
88775
88776 wait_for_device_probe();
88777
88778- fd = sys_open("/dev/md0", 0, 0);
88779+ fd = sys_open((const char __force_user *) "/dev/md0", 0, 0);
88780 if (fd >= 0) {
88781 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
88782 sys_close(fd);
88783diff --git a/init/init_task.c b/init/init_task.c
88784index ba0a7f36..2bcf1d5 100644
88785--- a/init/init_task.c
88786+++ b/init/init_task.c
88787@@ -22,5 +22,9 @@ EXPORT_SYMBOL(init_task);
88788 * Initial thread structure. Alignment of this is handled by a special
88789 * linker map entry.
88790 */
88791+#ifdef CONFIG_X86
88792+union thread_union init_thread_union __init_task_data;
88793+#else
88794 union thread_union init_thread_union __init_task_data =
88795 { INIT_THREAD_INFO(init_task) };
88796+#endif
88797diff --git a/init/initramfs.c b/init/initramfs.c
88798index ad1bd77..dca2c1b 100644
88799--- a/init/initramfs.c
88800+++ b/init/initramfs.c
88801@@ -25,7 +25,7 @@ static ssize_t __init xwrite(int fd, const char *p, size_t count)
88802
88803 /* sys_write only can write MAX_RW_COUNT aka 2G-4K bytes at most */
88804 while (count) {
88805- ssize_t rv = sys_write(fd, p, count);
88806+ ssize_t rv = sys_write(fd, (char __force_user *)p, count);
88807
88808 if (rv < 0) {
88809 if (rv == -EINTR || rv == -EAGAIN)
88810@@ -107,7 +107,7 @@ static void __init free_hash(void)
88811 }
88812 }
88813
88814-static long __init do_utime(char *filename, time_t mtime)
88815+static long __init do_utime(char __force_user *filename, time_t mtime)
88816 {
88817 struct timespec t[2];
88818
88819@@ -142,7 +142,7 @@ static void __init dir_utime(void)
88820 struct dir_entry *de, *tmp;
88821 list_for_each_entry_safe(de, tmp, &dir_list, list) {
88822 list_del(&de->list);
88823- do_utime(de->name, de->mtime);
88824+ do_utime((char __force_user *)de->name, de->mtime);
88825 kfree(de->name);
88826 kfree(de);
88827 }
88828@@ -304,7 +304,7 @@ static int __init maybe_link(void)
88829 if (nlink >= 2) {
88830 char *old = find_link(major, minor, ino, mode, collected);
88831 if (old)
88832- return (sys_link(old, collected) < 0) ? -1 : 1;
88833+ return (sys_link((char __force_user *)old, (char __force_user *)collected) < 0) ? -1 : 1;
88834 }
88835 return 0;
88836 }
88837@@ -313,11 +313,11 @@ static void __init clean_path(char *path, umode_t fmode)
88838 {
88839 struct stat st;
88840
88841- if (!sys_newlstat(path, &st) && (st.st_mode ^ fmode) & S_IFMT) {
88842+ if (!sys_newlstat((char __force_user *)path, (struct stat __force_user *)&st) && (st.st_mode ^ fmode) & S_IFMT) {
88843 if (S_ISDIR(st.st_mode))
88844- sys_rmdir(path);
88845+ sys_rmdir((char __force_user *)path);
88846 else
88847- sys_unlink(path);
88848+ sys_unlink((char __force_user *)path);
88849 }
88850 }
88851
88852@@ -338,7 +338,7 @@ static int __init do_name(void)
88853 int openflags = O_WRONLY|O_CREAT;
88854 if (ml != 1)
88855 openflags |= O_TRUNC;
88856- wfd = sys_open(collected, openflags, mode);
88857+ wfd = sys_open((char __force_user *)collected, openflags, mode);
88858
88859 if (wfd >= 0) {
88860 sys_fchown(wfd, uid, gid);
88861@@ -350,17 +350,17 @@ static int __init do_name(void)
88862 }
88863 }
88864 } else if (S_ISDIR(mode)) {
88865- sys_mkdir(collected, mode);
88866- sys_chown(collected, uid, gid);
88867- sys_chmod(collected, mode);
88868+ sys_mkdir((char __force_user *)collected, mode);
88869+ sys_chown((char __force_user *)collected, uid, gid);
88870+ sys_chmod((char __force_user *)collected, mode);
88871 dir_add(collected, mtime);
88872 } else if (S_ISBLK(mode) || S_ISCHR(mode) ||
88873 S_ISFIFO(mode) || S_ISSOCK(mode)) {
88874 if (maybe_link() == 0) {
88875- sys_mknod(collected, mode, rdev);
88876- sys_chown(collected, uid, gid);
88877- sys_chmod(collected, mode);
88878- do_utime(collected, mtime);
88879+ sys_mknod((char __force_user *)collected, mode, rdev);
88880+ sys_chown((char __force_user *)collected, uid, gid);
88881+ sys_chmod((char __force_user *)collected, mode);
88882+ do_utime((char __force_user *)collected, mtime);
88883 }
88884 }
88885 return 0;
88886@@ -372,7 +372,7 @@ static int __init do_copy(void)
88887 if (xwrite(wfd, victim, body_len) != body_len)
88888 error("write error");
88889 sys_close(wfd);
88890- do_utime(vcollected, mtime);
88891+ do_utime((char __force_user *)vcollected, mtime);
88892 kfree(vcollected);
88893 eat(body_len);
88894 state = SkipIt;
88895@@ -390,9 +390,9 @@ static int __init do_symlink(void)
88896 {
88897 collected[N_ALIGN(name_len) + body_len] = '\0';
88898 clean_path(collected, 0);
88899- sys_symlink(collected + N_ALIGN(name_len), collected);
88900- sys_lchown(collected, uid, gid);
88901- do_utime(collected, mtime);
88902+ sys_symlink((char __force_user *)collected + N_ALIGN(name_len), (char __force_user *)collected);
88903+ sys_lchown((char __force_user *)collected, uid, gid);
88904+ do_utime((char __force_user *)collected, mtime);
88905 state = SkipIt;
88906 next_state = Reset;
88907 return 0;
88908diff --git a/init/main.c b/init/main.c
88909index 6f0f1c5f..a542824 100644
88910--- a/init/main.c
88911+++ b/init/main.c
88912@@ -96,6 +96,8 @@ extern void radix_tree_init(void);
88913 static inline void mark_rodata_ro(void) { }
88914 #endif
88915
88916+extern void grsecurity_init(void);
88917+
88918 /*
88919 * Debug helper: via this flag we know that we are in 'early bootup code'
88920 * where only the boot processor is running with IRQ disabled. This means
88921@@ -157,6 +159,85 @@ static int __init set_reset_devices(char *str)
88922
88923 __setup("reset_devices", set_reset_devices);
88924
88925+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
88926+kgid_t grsec_proc_gid = KGIDT_INIT(CONFIG_GRKERNSEC_PROC_GID);
88927+static int __init setup_grsec_proc_gid(char *str)
88928+{
88929+ grsec_proc_gid = KGIDT_INIT(simple_strtol(str, NULL, 0));
88930+ return 1;
88931+}
88932+__setup("grsec_proc_gid=", setup_grsec_proc_gid);
88933+#endif
88934+#ifdef CONFIG_GRKERNSEC_SYSFS_RESTRICT
88935+int grsec_enable_sysfs_restrict = 1;
88936+static int __init setup_grsec_sysfs_restrict(char *str)
88937+{
88938+ if (!simple_strtol(str, NULL, 0))
88939+ grsec_enable_sysfs_restrict = 0;
88940+ return 1;
88941+}
88942+__setup("grsec_sysfs_restrict", setup_grsec_sysfs_restrict);
88943+#endif
88944+
88945+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
88946+unsigned long pax_user_shadow_base __read_only;
88947+EXPORT_SYMBOL(pax_user_shadow_base);
88948+extern char pax_enter_kernel_user[];
88949+extern char pax_exit_kernel_user[];
88950+#endif
88951+
88952+#if defined(CONFIG_X86) && defined(CONFIG_PAX_MEMORY_UDEREF)
88953+static int __init setup_pax_nouderef(char *str)
88954+{
88955+#ifdef CONFIG_X86_32
88956+ unsigned int cpu;
88957+ struct desc_struct *gdt;
88958+
88959+ for (cpu = 0; cpu < nr_cpu_ids; cpu++) {
88960+ gdt = get_cpu_gdt_table(cpu);
88961+ gdt[GDT_ENTRY_KERNEL_DS].type = 3;
88962+ gdt[GDT_ENTRY_KERNEL_DS].limit = 0xf;
88963+ gdt[GDT_ENTRY_DEFAULT_USER_CS].limit = 0xf;
88964+ gdt[GDT_ENTRY_DEFAULT_USER_DS].limit = 0xf;
88965+ }
88966+ loadsegment(ds, __KERNEL_DS);
88967+ loadsegment(es, __KERNEL_DS);
88968+ loadsegment(ss, __KERNEL_DS);
88969+#else
88970+ memcpy(pax_enter_kernel_user, (unsigned char []){0xc3}, 1);
88971+ memcpy(pax_exit_kernel_user, (unsigned char []){0xc3}, 1);
88972+ clone_pgd_mask = ~(pgdval_t)0UL;
88973+ pax_user_shadow_base = 0UL;
88974+ setup_clear_cpu_cap(X86_FEATURE_PCID);
88975+ setup_clear_cpu_cap(X86_FEATURE_INVPCID);
88976+#endif
88977+
88978+ return 0;
88979+}
88980+early_param("pax_nouderef", setup_pax_nouderef);
88981+
88982+#ifdef CONFIG_X86_64
88983+static int __init setup_pax_weakuderef(char *str)
88984+{
88985+ if (clone_pgd_mask != ~(pgdval_t)0UL)
88986+ pax_user_shadow_base = 1UL << TASK_SIZE_MAX_SHIFT;
88987+ return 1;
88988+}
88989+__setup("pax_weakuderef", setup_pax_weakuderef);
88990+#endif
88991+#endif
88992+
88993+#ifdef CONFIG_PAX_SOFTMODE
88994+int pax_softmode;
88995+
88996+static int __init setup_pax_softmode(char *str)
88997+{
88998+ get_option(&str, &pax_softmode);
88999+ return 1;
89000+}
89001+__setup("pax_softmode=", setup_pax_softmode);
89002+#endif
89003+
89004 static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
89005 const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
89006 static const char *panic_later, *panic_param;
89007@@ -722,7 +803,7 @@ static bool __init_or_module initcall_blacklisted(initcall_t fn)
89008 struct blacklist_entry *entry;
89009 char *fn_name;
89010
89011- fn_name = kasprintf(GFP_KERNEL, "%pf", fn);
89012+ fn_name = kasprintf(GFP_KERNEL, "%pX", fn);
89013 if (!fn_name)
89014 return false;
89015
89016@@ -774,7 +855,7 @@ int __init_or_module do_one_initcall(initcall_t fn)
89017 {
89018 int count = preempt_count();
89019 int ret;
89020- char msgbuf[64];
89021+ const char *msg1 = "", *msg2 = "";
89022
89023 if (initcall_blacklisted(fn))
89024 return -EPERM;
89025@@ -784,18 +865,17 @@ int __init_or_module do_one_initcall(initcall_t fn)
89026 else
89027 ret = fn();
89028
89029- msgbuf[0] = 0;
89030-
89031 if (preempt_count() != count) {
89032- sprintf(msgbuf, "preemption imbalance ");
89033+ msg1 = " preemption imbalance";
89034 preempt_count_set(count);
89035 }
89036 if (irqs_disabled()) {
89037- strlcat(msgbuf, "disabled interrupts ", sizeof(msgbuf));
89038+ msg2 = " disabled interrupts";
89039 local_irq_enable();
89040 }
89041- WARN(msgbuf[0], "initcall %pF returned with %s\n", fn, msgbuf);
89042+ WARN(*msg1 || *msg2, "initcall %pF returned with%s%s\n", fn, msg1, msg2);
89043
89044+ add_latent_entropy();
89045 return ret;
89046 }
89047
89048@@ -901,8 +981,8 @@ static int run_init_process(const char *init_filename)
89049 {
89050 argv_init[0] = init_filename;
89051 return do_execve(getname_kernel(init_filename),
89052- (const char __user *const __user *)argv_init,
89053- (const char __user *const __user *)envp_init);
89054+ (const char __user *const __force_user *)argv_init,
89055+ (const char __user *const __force_user *)envp_init);
89056 }
89057
89058 static int try_to_run_init_process(const char *init_filename)
89059@@ -919,6 +999,10 @@ static int try_to_run_init_process(const char *init_filename)
89060 return ret;
89061 }
89062
89063+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
89064+extern int gr_init_ran;
89065+#endif
89066+
89067 static noinline void __init kernel_init_freeable(void);
89068
89069 static int __ref kernel_init(void *unused)
89070@@ -943,6 +1027,11 @@ static int __ref kernel_init(void *unused)
89071 ramdisk_execute_command, ret);
89072 }
89073
89074+#ifdef CONFIG_GRKERNSEC_CHROOT_INITRD
89075+ /* if no initrd was used, be extra sure we enforce chroot restrictions */
89076+ gr_init_ran = 1;
89077+#endif
89078+
89079 /*
89080 * We try each of these until one succeeds.
89081 *
89082@@ -998,7 +1087,7 @@ static noinline void __init kernel_init_freeable(void)
89083 do_basic_setup();
89084
89085 /* Open the /dev/console on the rootfs, this should never fail */
89086- if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
89087+ if (sys_open((const char __force_user *) "/dev/console", O_RDWR, 0) < 0)
89088 pr_err("Warning: unable to open an initial console.\n");
89089
89090 (void) sys_dup(0);
89091@@ -1011,11 +1100,13 @@ static noinline void __init kernel_init_freeable(void)
89092 if (!ramdisk_execute_command)
89093 ramdisk_execute_command = "/init";
89094
89095- if (sys_access((const char __user *) ramdisk_execute_command, 0) != 0) {
89096+ if (sys_access((const char __force_user *) ramdisk_execute_command, 0) != 0) {
89097 ramdisk_execute_command = NULL;
89098 prepare_namespace();
89099 }
89100
89101+ grsecurity_init();
89102+
89103 /*
89104 * Ok, we have completed the initial bootup, and
89105 * we're essentially up and running. Get rid of the
89106diff --git a/ipc/compat.c b/ipc/compat.c
89107index 9b3c85f..5266b0f 100644
89108--- a/ipc/compat.c
89109+++ b/ipc/compat.c
89110@@ -396,7 +396,7 @@ COMPAT_SYSCALL_DEFINE6(ipc, u32, call, int, first, int, second,
89111 COMPAT_SHMLBA);
89112 if (err < 0)
89113 return err;
89114- return put_user(raddr, (compat_ulong_t *)compat_ptr(third));
89115+ return put_user(raddr, (compat_ulong_t __user *)compat_ptr(third));
89116 }
89117 case SHMDT:
89118 return sys_shmdt(compat_ptr(ptr));
89119@@ -747,7 +747,7 @@ COMPAT_SYSCALL_DEFINE3(shmctl, int, first, int, second, void __user *, uptr)
89120 }
89121
89122 COMPAT_SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsems,
89123- unsigned, nsops,
89124+ compat_long_t, nsops,
89125 const struct compat_timespec __user *, timeout)
89126 {
89127 struct timespec __user *ts64;
89128diff --git a/ipc/ipc_sysctl.c b/ipc/ipc_sysctl.c
89129index 8ad93c2..efd80f8 100644
89130--- a/ipc/ipc_sysctl.c
89131+++ b/ipc/ipc_sysctl.c
89132@@ -30,7 +30,7 @@ static void *get_ipc(struct ctl_table *table)
89133 static int proc_ipc_dointvec(struct ctl_table *table, int write,
89134 void __user *buffer, size_t *lenp, loff_t *ppos)
89135 {
89136- struct ctl_table ipc_table;
89137+ ctl_table_no_const ipc_table;
89138
89139 memcpy(&ipc_table, table, sizeof(ipc_table));
89140 ipc_table.data = get_ipc(table);
89141@@ -41,7 +41,7 @@ static int proc_ipc_dointvec(struct ctl_table *table, int write,
89142 static int proc_ipc_dointvec_minmax(struct ctl_table *table, int write,
89143 void __user *buffer, size_t *lenp, loff_t *ppos)
89144 {
89145- struct ctl_table ipc_table;
89146+ ctl_table_no_const ipc_table;
89147
89148 memcpy(&ipc_table, table, sizeof(ipc_table));
89149 ipc_table.data = get_ipc(table);
89150@@ -65,7 +65,7 @@ static int proc_ipc_dointvec_minmax_orphans(struct ctl_table *table, int write,
89151 static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
89152 void __user *buffer, size_t *lenp, loff_t *ppos)
89153 {
89154- struct ctl_table ipc_table;
89155+ ctl_table_no_const ipc_table;
89156 memcpy(&ipc_table, table, sizeof(ipc_table));
89157 ipc_table.data = get_ipc(table);
89158
89159@@ -76,7 +76,7 @@ static int proc_ipc_doulongvec_minmax(struct ctl_table *table, int write,
89160 static int proc_ipc_auto_msgmni(struct ctl_table *table, int write,
89161 void __user *buffer, size_t *lenp, loff_t *ppos)
89162 {
89163- struct ctl_table ipc_table;
89164+ ctl_table_no_const ipc_table;
89165 int dummy = 0;
89166
89167 memcpy(&ipc_table, table, sizeof(ipc_table));
89168diff --git a/ipc/mq_sysctl.c b/ipc/mq_sysctl.c
89169index 68d4e95..1477ded 100644
89170--- a/ipc/mq_sysctl.c
89171+++ b/ipc/mq_sysctl.c
89172@@ -25,7 +25,7 @@ static void *get_mq(struct ctl_table *table)
89173 static int proc_mq_dointvec(struct ctl_table *table, int write,
89174 void __user *buffer, size_t *lenp, loff_t *ppos)
89175 {
89176- struct ctl_table mq_table;
89177+ ctl_table_no_const mq_table;
89178 memcpy(&mq_table, table, sizeof(mq_table));
89179 mq_table.data = get_mq(table);
89180
89181@@ -35,7 +35,7 @@ static int proc_mq_dointvec(struct ctl_table *table, int write,
89182 static int proc_mq_dointvec_minmax(struct ctl_table *table, int write,
89183 void __user *buffer, size_t *lenp, loff_t *ppos)
89184 {
89185- struct ctl_table mq_table;
89186+ ctl_table_no_const mq_table;
89187 memcpy(&mq_table, table, sizeof(mq_table));
89188 mq_table.data = get_mq(table);
89189
89190diff --git a/ipc/mqueue.c b/ipc/mqueue.c
89191index 7635a1c..7432cb6 100644
89192--- a/ipc/mqueue.c
89193+++ b/ipc/mqueue.c
89194@@ -278,6 +278,7 @@ static struct inode *mqueue_get_inode(struct super_block *sb,
89195 mq_bytes = mq_treesize + (info->attr.mq_maxmsg *
89196 info->attr.mq_msgsize);
89197
89198+ gr_learn_resource(current, RLIMIT_MSGQUEUE, u->mq_bytes + mq_bytes, 1);
89199 spin_lock(&mq_lock);
89200 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
89201 u->mq_bytes + mq_bytes > rlimit(RLIMIT_MSGQUEUE)) {
89202diff --git a/ipc/sem.c b/ipc/sem.c
89203index 9284211..bca5b1b 100644
89204--- a/ipc/sem.c
89205+++ b/ipc/sem.c
89206@@ -1780,7 +1780,7 @@ static int get_queue_result(struct sem_queue *q)
89207 }
89208
89209 SYSCALL_DEFINE4(semtimedop, int, semid, struct sembuf __user *, tsops,
89210- unsigned, nsops, const struct timespec __user *, timeout)
89211+ long, nsops, const struct timespec __user *, timeout)
89212 {
89213 int error = -EINVAL;
89214 struct sem_array *sma;
89215@@ -2015,7 +2015,7 @@ out_free:
89216 }
89217
89218 SYSCALL_DEFINE3(semop, int, semid, struct sembuf __user *, tsops,
89219- unsigned, nsops)
89220+ long, nsops)
89221 {
89222 return sys_semtimedop(semid, tsops, nsops, NULL);
89223 }
89224diff --git a/ipc/shm.c b/ipc/shm.c
89225index 19633b4..d454904 100644
89226--- a/ipc/shm.c
89227+++ b/ipc/shm.c
89228@@ -72,6 +72,14 @@ static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp);
89229 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
89230 #endif
89231
89232+#ifdef CONFIG_GRKERNSEC
89233+extern int gr_handle_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
89234+ const u64 shm_createtime, const kuid_t cuid,
89235+ const int shmid);
89236+extern int gr_chroot_shmat(const pid_t shm_cprid, const pid_t shm_lapid,
89237+ const u64 shm_createtime);
89238+#endif
89239+
89240 void shm_init_ns(struct ipc_namespace *ns)
89241 {
89242 ns->shm_ctlmax = SHMMAX;
89243@@ -560,6 +568,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
89244 shp->shm_lprid = 0;
89245 shp->shm_atim = shp->shm_dtim = 0;
89246 shp->shm_ctim = get_seconds();
89247+#ifdef CONFIG_GRKERNSEC
89248+ shp->shm_createtime = ktime_get_ns();
89249+#endif
89250 shp->shm_segsz = size;
89251 shp->shm_nattch = 0;
89252 shp->shm_file = file;
89253@@ -1096,6 +1107,12 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
89254 f_mode = FMODE_READ | FMODE_WRITE;
89255 }
89256 if (shmflg & SHM_EXEC) {
89257+
89258+#ifdef CONFIG_PAX_MPROTECT
89259+ if (current->mm->pax_flags & MF_PAX_MPROTECT)
89260+ goto out;
89261+#endif
89262+
89263 prot |= PROT_EXEC;
89264 acc_mode |= S_IXUGO;
89265 }
89266@@ -1120,6 +1137,15 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
89267 if (err)
89268 goto out_unlock;
89269
89270+#ifdef CONFIG_GRKERNSEC
89271+ if (!gr_handle_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime,
89272+ shp->shm_perm.cuid, shmid) ||
89273+ !gr_chroot_shmat(shp->shm_cprid, shp->shm_lapid, shp->shm_createtime)) {
89274+ err = -EACCES;
89275+ goto out_unlock;
89276+ }
89277+#endif
89278+
89279 ipc_lock_object(&shp->shm_perm);
89280
89281 /* check if shm_destroy() is tearing down shp */
89282@@ -1132,6 +1158,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
89283 path = shp->shm_file->f_path;
89284 path_get(&path);
89285 shp->shm_nattch++;
89286+#ifdef CONFIG_GRKERNSEC
89287+ shp->shm_lapid = current->pid;
89288+#endif
89289 size = i_size_read(path.dentry->d_inode);
89290 ipc_unlock_object(&shp->shm_perm);
89291 rcu_read_unlock();
89292diff --git a/ipc/util.c b/ipc/util.c
89293index 106bed0..f851429 100644
89294--- a/ipc/util.c
89295+++ b/ipc/util.c
89296@@ -71,6 +71,8 @@ struct ipc_proc_iface {
89297 int (*show)(struct seq_file *, void *);
89298 };
89299
89300+extern int gr_ipc_permitted(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, int requested_mode, int granted_mode);
89301+
89302 /**
89303 * ipc_init - initialise ipc subsystem
89304 *
89305@@ -497,6 +499,10 @@ int ipcperms(struct ipc_namespace *ns, struct kern_ipc_perm *ipcp, short flag)
89306 granted_mode >>= 6;
89307 else if (in_group_p(ipcp->cgid) || in_group_p(ipcp->gid))
89308 granted_mode >>= 3;
89309+
89310+ if (!gr_ipc_permitted(ns, ipcp, requested_mode, granted_mode))
89311+ return -1;
89312+
89313 /* is there some bit set in requested_mode but not in granted_mode? */
89314 if ((requested_mode & ~granted_mode & 0007) &&
89315 !ns_capable(ns->user_ns, CAP_IPC_OWNER))
89316diff --git a/kernel/audit.c b/kernel/audit.c
89317index 72ab759..757deba 100644
89318--- a/kernel/audit.c
89319+++ b/kernel/audit.c
89320@@ -122,7 +122,7 @@ u32 audit_sig_sid = 0;
89321 3) suppressed due to audit_rate_limit
89322 4) suppressed due to audit_backlog_limit
89323 */
89324-static atomic_t audit_lost = ATOMIC_INIT(0);
89325+static atomic_unchecked_t audit_lost = ATOMIC_INIT(0);
89326
89327 /* The netlink socket. */
89328 static struct sock *audit_sock;
89329@@ -256,7 +256,7 @@ void audit_log_lost(const char *message)
89330 unsigned long now;
89331 int print;
89332
89333- atomic_inc(&audit_lost);
89334+ atomic_inc_unchecked(&audit_lost);
89335
89336 print = (audit_failure == AUDIT_FAIL_PANIC || !audit_rate_limit);
89337
89338@@ -273,7 +273,7 @@ void audit_log_lost(const char *message)
89339 if (print) {
89340 if (printk_ratelimit())
89341 pr_warn("audit_lost=%u audit_rate_limit=%u audit_backlog_limit=%u\n",
89342- atomic_read(&audit_lost),
89343+ atomic_read_unchecked(&audit_lost),
89344 audit_rate_limit,
89345 audit_backlog_limit);
89346 audit_panic(message);
89347@@ -831,7 +831,7 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
89348 s.pid = audit_pid;
89349 s.rate_limit = audit_rate_limit;
89350 s.backlog_limit = audit_backlog_limit;
89351- s.lost = atomic_read(&audit_lost);
89352+ s.lost = atomic_read_unchecked(&audit_lost);
89353 s.backlog = skb_queue_len(&audit_skb_queue);
89354 s.feature_bitmap = AUDIT_FEATURE_BITMAP_ALL;
89355 s.backlog_wait_time = audit_backlog_wait_time;
89356diff --git a/kernel/auditsc.c b/kernel/auditsc.c
89357index dc4ae70..2a2bddc 100644
89358--- a/kernel/auditsc.c
89359+++ b/kernel/auditsc.c
89360@@ -1955,7 +1955,7 @@ int auditsc_get_stamp(struct audit_context *ctx,
89361 }
89362
89363 /* global counter which is incremented every time something logs in */
89364-static atomic_t session_id = ATOMIC_INIT(0);
89365+static atomic_unchecked_t session_id = ATOMIC_INIT(0);
89366
89367 static int audit_set_loginuid_perm(kuid_t loginuid)
89368 {
89369@@ -2022,7 +2022,7 @@ int audit_set_loginuid(kuid_t loginuid)
89370
89371 /* are we setting or clearing? */
89372 if (uid_valid(loginuid))
89373- sessionid = (unsigned int)atomic_inc_return(&session_id);
89374+ sessionid = (unsigned int)atomic_inc_return_unchecked(&session_id);
89375
89376 task->sessionid = sessionid;
89377 task->loginuid = loginuid;
89378diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
89379index a64e7a2..2e69448 100644
89380--- a/kernel/bpf/core.c
89381+++ b/kernel/bpf/core.c
89382@@ -143,14 +143,17 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
89383 * random section of illegal instructions.
89384 */
89385 size = round_up(proglen + sizeof(*hdr) + 128, PAGE_SIZE);
89386- hdr = module_alloc(size);
89387+ hdr = module_alloc_exec(size);
89388 if (hdr == NULL)
89389 return NULL;
89390
89391 /* Fill space with illegal/arch-dep instructions. */
89392 bpf_fill_ill_insns(hdr, size);
89393
89394+ pax_open_kernel();
89395 hdr->pages = size / PAGE_SIZE;
89396+ pax_close_kernel();
89397+
89398 hole = min_t(unsigned int, size - (proglen + sizeof(*hdr)),
89399 PAGE_SIZE - sizeof(*hdr));
89400 start = (prandom_u32() % hole) & ~(alignment - 1);
89401@@ -163,7 +166,7 @@ bpf_jit_binary_alloc(unsigned int proglen, u8 **image_ptr,
89402
89403 void bpf_jit_binary_free(struct bpf_binary_header *hdr)
89404 {
89405- module_memfree(hdr);
89406+ module_memfree_exec(hdr);
89407 }
89408 #endif /* CONFIG_BPF_JIT */
89409
89410diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c
89411index 536edc2..d28c85d 100644
89412--- a/kernel/bpf/syscall.c
89413+++ b/kernel/bpf/syscall.c
89414@@ -548,11 +548,15 @@ SYSCALL_DEFINE3(bpf, int, cmd, union bpf_attr __user *, uattr, unsigned int, siz
89415 int err;
89416
89417 /* the syscall is limited to root temporarily. This restriction will be
89418- * lifted when security audit is clean. Note that eBPF+tracing must have
89419- * this restriction, since it may pass kernel data to user space
89420+ * lifted by upstream when a half-assed security audit is clean. Note
89421+ * that eBPF+tracing must have this restriction, since it may pass
89422+ * kernel data to user space
89423 */
89424 if (!capable(CAP_SYS_ADMIN))
89425 return -EPERM;
89426+#ifdef CONFIG_GRKERNSEC
89427+ return -EPERM;
89428+#endif
89429
89430 if (!access_ok(VERIFY_READ, uattr, 1))
89431 return -EFAULT;
89432diff --git a/kernel/capability.c b/kernel/capability.c
89433index 989f5bf..d317ca0 100644
89434--- a/kernel/capability.c
89435+++ b/kernel/capability.c
89436@@ -192,6 +192,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_t, header, cap_user_data_t, dataptr)
89437 * before modification is attempted and the application
89438 * fails.
89439 */
89440+ if (tocopy > ARRAY_SIZE(kdata))
89441+ return -EFAULT;
89442+
89443 if (copy_to_user(dataptr, kdata, tocopy
89444 * sizeof(struct __user_cap_data_struct))) {
89445 return -EFAULT;
89446@@ -297,10 +300,11 @@ bool has_ns_capability(struct task_struct *t,
89447 int ret;
89448
89449 rcu_read_lock();
89450- ret = security_capable(__task_cred(t), ns, cap);
89451+ ret = security_capable(__task_cred(t), ns, cap) == 0 &&
89452+ gr_task_is_capable(t, __task_cred(t), cap);
89453 rcu_read_unlock();
89454
89455- return (ret == 0);
89456+ return ret;
89457 }
89458
89459 /**
89460@@ -337,10 +341,10 @@ bool has_ns_capability_noaudit(struct task_struct *t,
89461 int ret;
89462
89463 rcu_read_lock();
89464- ret = security_capable_noaudit(__task_cred(t), ns, cap);
89465+ ret = security_capable_noaudit(__task_cred(t), ns, cap) == 0 && gr_task_is_capable_nolog(t, cap);
89466 rcu_read_unlock();
89467
89468- return (ret == 0);
89469+ return ret;
89470 }
89471
89472 /**
89473@@ -378,7 +382,7 @@ bool ns_capable(struct user_namespace *ns, int cap)
89474 BUG();
89475 }
89476
89477- if (security_capable(current_cred(), ns, cap) == 0) {
89478+ if (security_capable(current_cred(), ns, cap) == 0 && gr_is_capable(cap)) {
89479 current->flags |= PF_SUPERPRIV;
89480 return true;
89481 }
89482@@ -386,6 +390,21 @@ bool ns_capable(struct user_namespace *ns, int cap)
89483 }
89484 EXPORT_SYMBOL(ns_capable);
89485
89486+bool ns_capable_nolog(struct user_namespace *ns, int cap)
89487+{
89488+ if (unlikely(!cap_valid(cap))) {
89489+ printk(KERN_CRIT "capable_nolog() called with invalid cap=%u\n", cap);
89490+ BUG();
89491+ }
89492+
89493+ if (security_capable_noaudit(current_cred(), ns, cap) == 0 && gr_is_capable_nolog(cap)) {
89494+ current->flags |= PF_SUPERPRIV;
89495+ return true;
89496+ }
89497+ return false;
89498+}
89499+EXPORT_SYMBOL(ns_capable_nolog);
89500+
89501 /**
89502 * file_ns_capable - Determine if the file's opener had a capability in effect
89503 * @file: The file we want to check
89504@@ -427,6 +446,12 @@ bool capable(int cap)
89505 }
89506 EXPORT_SYMBOL(capable);
89507
89508+bool capable_nolog(int cap)
89509+{
89510+ return ns_capable_nolog(&init_user_ns, cap);
89511+}
89512+EXPORT_SYMBOL(capable_nolog);
89513+
89514 /**
89515 * capable_wrt_inode_uidgid - Check nsown_capable and uid and gid mapped
89516 * @inode: The inode in question
89517@@ -444,3 +469,12 @@ bool capable_wrt_inode_uidgid(const struct inode *inode, int cap)
89518 kgid_has_mapping(ns, inode->i_gid);
89519 }
89520 EXPORT_SYMBOL(capable_wrt_inode_uidgid);
89521+
89522+bool capable_wrt_inode_uidgid_nolog(const struct inode *inode, int cap)
89523+{
89524+ struct user_namespace *ns = current_user_ns();
89525+
89526+ return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid) &&
89527+ kgid_has_mapping(ns, inode->i_gid);
89528+}
89529+EXPORT_SYMBOL(capable_wrt_inode_uidgid_nolog);
89530diff --git a/kernel/cgroup.c b/kernel/cgroup.c
89531index 29a7b2c..a64e30a 100644
89532--- a/kernel/cgroup.c
89533+++ b/kernel/cgroup.c
89534@@ -5347,6 +5347,9 @@ static void cgroup_release_agent(struct work_struct *work)
89535 if (!pathbuf || !agentbuf)
89536 goto out;
89537
89538+ if (agentbuf[0] == '\0')
89539+ goto out;
89540+
89541 path = cgroup_path(cgrp, pathbuf, PATH_MAX);
89542 if (!path)
89543 goto out;
89544@@ -5532,7 +5535,7 @@ static int cgroup_css_links_read(struct seq_file *seq, void *v)
89545 struct task_struct *task;
89546 int count = 0;
89547
89548- seq_printf(seq, "css_set %p\n", cset);
89549+ seq_printf(seq, "css_set %pK\n", cset);
89550
89551 list_for_each_entry(task, &cset->tasks, cg_list) {
89552 if (count++ > MAX_TASKS_SHOWN_PER_CSS)
89553diff --git a/kernel/compat.c b/kernel/compat.c
89554index 24f0061..ea80802 100644
89555--- a/kernel/compat.c
89556+++ b/kernel/compat.c
89557@@ -13,6 +13,7 @@
89558
89559 #include <linux/linkage.h>
89560 #include <linux/compat.h>
89561+#include <linux/module.h>
89562 #include <linux/errno.h>
89563 #include <linux/time.h>
89564 #include <linux/signal.h>
89565@@ -220,7 +221,7 @@ static long compat_nanosleep_restart(struct restart_block *restart)
89566 mm_segment_t oldfs;
89567 long ret;
89568
89569- restart->nanosleep.rmtp = (struct timespec __user *) &rmt;
89570+ restart->nanosleep.rmtp = (struct timespec __force_user *) &rmt;
89571 oldfs = get_fs();
89572 set_fs(KERNEL_DS);
89573 ret = hrtimer_nanosleep_restart(restart);
89574@@ -252,7 +253,7 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct compat_timespec __user *, rqtp,
89575 oldfs = get_fs();
89576 set_fs(KERNEL_DS);
89577 ret = hrtimer_nanosleep(&tu,
89578- rmtp ? (struct timespec __user *)&rmt : NULL,
89579+ rmtp ? (struct timespec __force_user *)&rmt : NULL,
89580 HRTIMER_MODE_REL, CLOCK_MONOTONIC);
89581 set_fs(oldfs);
89582
89583@@ -378,7 +379,7 @@ COMPAT_SYSCALL_DEFINE1(sigpending, compat_old_sigset_t __user *, set)
89584 mm_segment_t old_fs = get_fs();
89585
89586 set_fs(KERNEL_DS);
89587- ret = sys_sigpending((old_sigset_t __user *) &s);
89588+ ret = sys_sigpending((old_sigset_t __force_user *) &s);
89589 set_fs(old_fs);
89590 if (ret == 0)
89591 ret = put_user(s, set);
89592@@ -468,7 +469,7 @@ COMPAT_SYSCALL_DEFINE2(old_getrlimit, unsigned int, resource,
89593 mm_segment_t old_fs = get_fs();
89594
89595 set_fs(KERNEL_DS);
89596- ret = sys_old_getrlimit(resource, (struct rlimit __user *)&r);
89597+ ret = sys_old_getrlimit(resource, (struct rlimit __force_user *)&r);
89598 set_fs(old_fs);
89599
89600 if (!ret) {
89601@@ -550,8 +551,8 @@ COMPAT_SYSCALL_DEFINE4(wait4,
89602 set_fs (KERNEL_DS);
89603 ret = sys_wait4(pid,
89604 (stat_addr ?
89605- (unsigned int __user *) &status : NULL),
89606- options, (struct rusage __user *) &r);
89607+ (unsigned int __force_user *) &status : NULL),
89608+ options, (struct rusage __force_user *) &r);
89609 set_fs (old_fs);
89610
89611 if (ret > 0) {
89612@@ -577,8 +578,8 @@ COMPAT_SYSCALL_DEFINE5(waitid,
89613 memset(&info, 0, sizeof(info));
89614
89615 set_fs(KERNEL_DS);
89616- ret = sys_waitid(which, pid, (siginfo_t __user *)&info, options,
89617- uru ? (struct rusage __user *)&ru : NULL);
89618+ ret = sys_waitid(which, pid, (siginfo_t __force_user *)&info, options,
89619+ uru ? (struct rusage __force_user *)&ru : NULL);
89620 set_fs(old_fs);
89621
89622 if ((ret < 0) || (info.si_signo == 0))
89623@@ -712,8 +713,8 @@ COMPAT_SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
89624 oldfs = get_fs();
89625 set_fs(KERNEL_DS);
89626 err = sys_timer_settime(timer_id, flags,
89627- (struct itimerspec __user *) &newts,
89628- (struct itimerspec __user *) &oldts);
89629+ (struct itimerspec __force_user *) &newts,
89630+ (struct itimerspec __force_user *) &oldts);
89631 set_fs(oldfs);
89632 if (!err && old && put_compat_itimerspec(old, &oldts))
89633 return -EFAULT;
89634@@ -730,7 +731,7 @@ COMPAT_SYSCALL_DEFINE2(timer_gettime, timer_t, timer_id,
89635 oldfs = get_fs();
89636 set_fs(KERNEL_DS);
89637 err = sys_timer_gettime(timer_id,
89638- (struct itimerspec __user *) &ts);
89639+ (struct itimerspec __force_user *) &ts);
89640 set_fs(oldfs);
89641 if (!err && put_compat_itimerspec(setting, &ts))
89642 return -EFAULT;
89643@@ -749,7 +750,7 @@ COMPAT_SYSCALL_DEFINE2(clock_settime, clockid_t, which_clock,
89644 oldfs = get_fs();
89645 set_fs(KERNEL_DS);
89646 err = sys_clock_settime(which_clock,
89647- (struct timespec __user *) &ts);
89648+ (struct timespec __force_user *) &ts);
89649 set_fs(oldfs);
89650 return err;
89651 }
89652@@ -764,7 +765,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
89653 oldfs = get_fs();
89654 set_fs(KERNEL_DS);
89655 err = sys_clock_gettime(which_clock,
89656- (struct timespec __user *) &ts);
89657+ (struct timespec __force_user *) &ts);
89658 set_fs(oldfs);
89659 if (!err && compat_put_timespec(&ts, tp))
89660 return -EFAULT;
89661@@ -784,7 +785,7 @@ COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
89662
89663 oldfs = get_fs();
89664 set_fs(KERNEL_DS);
89665- ret = sys_clock_adjtime(which_clock, (struct timex __user *) &txc);
89666+ ret = sys_clock_adjtime(which_clock, (struct timex __force_user *) &txc);
89667 set_fs(oldfs);
89668
89669 err = compat_put_timex(utp, &txc);
89670@@ -804,7 +805,7 @@ COMPAT_SYSCALL_DEFINE2(clock_getres, clockid_t, which_clock,
89671 oldfs = get_fs();
89672 set_fs(KERNEL_DS);
89673 err = sys_clock_getres(which_clock,
89674- (struct timespec __user *) &ts);
89675+ (struct timespec __force_user *) &ts);
89676 set_fs(oldfs);
89677 if (!err && tp && compat_put_timespec(&ts, tp))
89678 return -EFAULT;
89679@@ -818,7 +819,7 @@ static long compat_clock_nanosleep_restart(struct restart_block *restart)
89680 struct timespec tu;
89681 struct compat_timespec __user *rmtp = restart->nanosleep.compat_rmtp;
89682
89683- restart->nanosleep.rmtp = (struct timespec __user *) &tu;
89684+ restart->nanosleep.rmtp = (struct timespec __force_user *) &tu;
89685 oldfs = get_fs();
89686 set_fs(KERNEL_DS);
89687 err = clock_nanosleep_restart(restart);
89688@@ -850,8 +851,8 @@ COMPAT_SYSCALL_DEFINE4(clock_nanosleep, clockid_t, which_clock, int, flags,
89689 oldfs = get_fs();
89690 set_fs(KERNEL_DS);
89691 err = sys_clock_nanosleep(which_clock, flags,
89692- (struct timespec __user *) &in,
89693- (struct timespec __user *) &out);
89694+ (struct timespec __force_user *) &in,
89695+ (struct timespec __force_user *) &out);
89696 set_fs(oldfs);
89697
89698 if ((err == -ERESTART_RESTARTBLOCK) && rmtp &&
89699@@ -1145,7 +1146,7 @@ COMPAT_SYSCALL_DEFINE2(sched_rr_get_interval,
89700 mm_segment_t old_fs = get_fs();
89701
89702 set_fs(KERNEL_DS);
89703- ret = sys_sched_rr_get_interval(pid, (struct timespec __user *)&t);
89704+ ret = sys_sched_rr_get_interval(pid, (struct timespec __force_user *)&t);
89705 set_fs(old_fs);
89706 if (compat_put_timespec(&t, interval))
89707 return -EFAULT;
89708diff --git a/kernel/configs.c b/kernel/configs.c
89709index c18b1f1..b9a0132 100644
89710--- a/kernel/configs.c
89711+++ b/kernel/configs.c
89712@@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
89713 struct proc_dir_entry *entry;
89714
89715 /* create the current config file */
89716+#if defined(CONFIG_GRKERNSEC_PROC_ADD) || defined(CONFIG_GRKERNSEC_HIDESYM)
89717+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_HIDESYM)
89718+ entry = proc_create("config.gz", S_IFREG | S_IRUSR, NULL,
89719+ &ikconfig_file_ops);
89720+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
89721+ entry = proc_create("config.gz", S_IFREG | S_IRUSR | S_IRGRP, NULL,
89722+ &ikconfig_file_ops);
89723+#endif
89724+#else
89725 entry = proc_create("config.gz", S_IFREG | S_IRUGO, NULL,
89726 &ikconfig_file_ops);
89727+#endif
89728+
89729 if (!entry)
89730 return -ENOMEM;
89731
89732diff --git a/kernel/cred.c b/kernel/cred.c
89733index e0573a4..26c0fd3 100644
89734--- a/kernel/cred.c
89735+++ b/kernel/cred.c
89736@@ -164,6 +164,16 @@ void exit_creds(struct task_struct *tsk)
89737 validate_creds(cred);
89738 alter_cred_subscribers(cred, -1);
89739 put_cred(cred);
89740+
89741+#ifdef CONFIG_GRKERNSEC_SETXID
89742+ cred = (struct cred *) tsk->delayed_cred;
89743+ if (cred != NULL) {
89744+ tsk->delayed_cred = NULL;
89745+ validate_creds(cred);
89746+ alter_cred_subscribers(cred, -1);
89747+ put_cred(cred);
89748+ }
89749+#endif
89750 }
89751
89752 /**
89753@@ -411,7 +421,7 @@ static bool cred_cap_issubset(const struct cred *set, const struct cred *subset)
89754 * Always returns 0 thus allowing this function to be tail-called at the end
89755 * of, say, sys_setgid().
89756 */
89757-int commit_creds(struct cred *new)
89758+static int __commit_creds(struct cred *new)
89759 {
89760 struct task_struct *task = current;
89761 const struct cred *old = task->real_cred;
89762@@ -430,6 +440,8 @@ int commit_creds(struct cred *new)
89763
89764 get_cred(new); /* we will require a ref for the subj creds too */
89765
89766+ gr_set_role_label(task, new->uid, new->gid);
89767+
89768 /* dumpability changes */
89769 if (!uid_eq(old->euid, new->euid) ||
89770 !gid_eq(old->egid, new->egid) ||
89771@@ -479,6 +491,105 @@ int commit_creds(struct cred *new)
89772 put_cred(old);
89773 return 0;
89774 }
89775+#ifdef CONFIG_GRKERNSEC_SETXID
89776+extern int set_user(struct cred *new);
89777+
89778+void gr_delayed_cred_worker(void)
89779+{
89780+ const struct cred *new = current->delayed_cred;
89781+ struct cred *ncred;
89782+
89783+ current->delayed_cred = NULL;
89784+
89785+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID) && new != NULL) {
89786+ // from doing get_cred on it when queueing this
89787+ put_cred(new);
89788+ return;
89789+ } else if (new == NULL)
89790+ return;
89791+
89792+ ncred = prepare_creds();
89793+ if (!ncred)
89794+ goto die;
89795+ // uids
89796+ ncred->uid = new->uid;
89797+ ncred->euid = new->euid;
89798+ ncred->suid = new->suid;
89799+ ncred->fsuid = new->fsuid;
89800+ // gids
89801+ ncred->gid = new->gid;
89802+ ncred->egid = new->egid;
89803+ ncred->sgid = new->sgid;
89804+ ncred->fsgid = new->fsgid;
89805+ // groups
89806+ set_groups(ncred, new->group_info);
89807+ // caps
89808+ ncred->securebits = new->securebits;
89809+ ncred->cap_inheritable = new->cap_inheritable;
89810+ ncred->cap_permitted = new->cap_permitted;
89811+ ncred->cap_effective = new->cap_effective;
89812+ ncred->cap_bset = new->cap_bset;
89813+
89814+ if (set_user(ncred)) {
89815+ abort_creds(ncred);
89816+ goto die;
89817+ }
89818+
89819+ // from doing get_cred on it when queueing this
89820+ put_cred(new);
89821+
89822+ __commit_creds(ncred);
89823+ return;
89824+die:
89825+ // from doing get_cred on it when queueing this
89826+ put_cred(new);
89827+ do_group_exit(SIGKILL);
89828+}
89829+#endif
89830+
89831+int commit_creds(struct cred *new)
89832+{
89833+#ifdef CONFIG_GRKERNSEC_SETXID
89834+ int ret;
89835+ int schedule_it = 0;
89836+ struct task_struct *t;
89837+ unsigned oldsecurebits = current_cred()->securebits;
89838+
89839+ /* we won't get called with tasklist_lock held for writing
89840+ and interrupts disabled as the cred struct in that case is
89841+ init_cred
89842+ */
89843+ if (grsec_enable_setxid && !current_is_single_threaded() &&
89844+ uid_eq(current_uid(), GLOBAL_ROOT_UID) &&
89845+ !uid_eq(new->uid, GLOBAL_ROOT_UID)) {
89846+ schedule_it = 1;
89847+ }
89848+ ret = __commit_creds(new);
89849+ if (schedule_it) {
89850+ rcu_read_lock();
89851+ read_lock(&tasklist_lock);
89852+ for (t = next_thread(current); t != current;
89853+ t = next_thread(t)) {
89854+ /* we'll check if the thread has uid 0 in
89855+ * the delayed worker routine
89856+ */
89857+ if (task_securebits(t) == oldsecurebits &&
89858+ t->delayed_cred == NULL) {
89859+ t->delayed_cred = get_cred(new);
89860+ set_tsk_thread_flag(t, TIF_GRSEC_SETXID);
89861+ set_tsk_need_resched(t);
89862+ }
89863+ }
89864+ read_unlock(&tasklist_lock);
89865+ rcu_read_unlock();
89866+ }
89867+
89868+ return ret;
89869+#else
89870+ return __commit_creds(new);
89871+#endif
89872+}
89873+
89874 EXPORT_SYMBOL(commit_creds);
89875
89876 /**
89877diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c
89878index 0874e2e..5b32cc9 100644
89879--- a/kernel/debug/debug_core.c
89880+++ b/kernel/debug/debug_core.c
89881@@ -127,7 +127,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_lock);
89882 */
89883 static atomic_t masters_in_kgdb;
89884 static atomic_t slaves_in_kgdb;
89885-static atomic_t kgdb_break_tasklet_var;
89886+static atomic_unchecked_t kgdb_break_tasklet_var;
89887 atomic_t kgdb_setting_breakpoint;
89888
89889 struct task_struct *kgdb_usethread;
89890@@ -137,7 +137,7 @@ int kgdb_single_step;
89891 static pid_t kgdb_sstep_pid;
89892
89893 /* to keep track of the CPU which is doing the single stepping*/
89894-atomic_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
89895+atomic_unchecked_t kgdb_cpu_doing_single_step = ATOMIC_INIT(-1);
89896
89897 /*
89898 * If you are debugging a problem where roundup (the collection of
89899@@ -552,7 +552,7 @@ return_normal:
89900 * kernel will only try for the value of sstep_tries before
89901 * giving up and continuing on.
89902 */
89903- if (atomic_read(&kgdb_cpu_doing_single_step) != -1 &&
89904+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1 &&
89905 (kgdb_info[cpu].task &&
89906 kgdb_info[cpu].task->pid != kgdb_sstep_pid) && --sstep_tries) {
89907 atomic_set(&kgdb_active, -1);
89908@@ -654,8 +654,8 @@ cpu_master_loop:
89909 }
89910
89911 kgdb_restore:
89912- if (atomic_read(&kgdb_cpu_doing_single_step) != -1) {
89913- int sstep_cpu = atomic_read(&kgdb_cpu_doing_single_step);
89914+ if (atomic_read_unchecked(&kgdb_cpu_doing_single_step) != -1) {
89915+ int sstep_cpu = atomic_read_unchecked(&kgdb_cpu_doing_single_step);
89916 if (kgdb_info[sstep_cpu].task)
89917 kgdb_sstep_pid = kgdb_info[sstep_cpu].task->pid;
89918 else
89919@@ -949,18 +949,18 @@ static void kgdb_unregister_callbacks(void)
89920 static void kgdb_tasklet_bpt(unsigned long ing)
89921 {
89922 kgdb_breakpoint();
89923- atomic_set(&kgdb_break_tasklet_var, 0);
89924+ atomic_set_unchecked(&kgdb_break_tasklet_var, 0);
89925 }
89926
89927 static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0);
89928
89929 void kgdb_schedule_breakpoint(void)
89930 {
89931- if (atomic_read(&kgdb_break_tasklet_var) ||
89932+ if (atomic_read_unchecked(&kgdb_break_tasklet_var) ||
89933 atomic_read(&kgdb_active) != -1 ||
89934 atomic_read(&kgdb_setting_breakpoint))
89935 return;
89936- atomic_inc(&kgdb_break_tasklet_var);
89937+ atomic_inc_unchecked(&kgdb_break_tasklet_var);
89938 tasklet_schedule(&kgdb_tasklet_breakpoint);
89939 }
89940 EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
89941diff --git a/kernel/debug/kdb/kdb_main.c b/kernel/debug/kdb/kdb_main.c
89942index 4121345..861e178 100644
89943--- a/kernel/debug/kdb/kdb_main.c
89944+++ b/kernel/debug/kdb/kdb_main.c
89945@@ -2021,7 +2021,7 @@ static int kdb_lsmod(int argc, const char **argv)
89946 continue;
89947
89948 kdb_printf("%-20s%8u 0x%p ", mod->name,
89949- mod->core_size, (void *)mod);
89950+ mod->core_size_rx + mod->core_size_rw, (void *)mod);
89951 #ifdef CONFIG_MODULE_UNLOAD
89952 kdb_printf("%4d ", module_refcount(mod));
89953 #endif
89954@@ -2031,7 +2031,7 @@ static int kdb_lsmod(int argc, const char **argv)
89955 kdb_printf(" (Loading)");
89956 else
89957 kdb_printf(" (Live)");
89958- kdb_printf(" 0x%p", mod->module_core);
89959+ kdb_printf(" 0x%p 0x%p", mod->module_core_rx, mod->module_core_rw);
89960
89961 #ifdef CONFIG_MODULE_UNLOAD
89962 {
89963diff --git a/kernel/events/core.c b/kernel/events/core.c
89964index 2fabc06..79cceec 100644
89965--- a/kernel/events/core.c
89966+++ b/kernel/events/core.c
89967@@ -170,8 +170,15 @@ static struct srcu_struct pmus_srcu;
89968 * 0 - disallow raw tracepoint access for unpriv
89969 * 1 - disallow cpu events for unpriv
89970 * 2 - disallow kernel profiling for unpriv
89971+ * 3 - disallow all unpriv perf event use
89972 */
89973-int sysctl_perf_event_paranoid __read_mostly = 1;
89974+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
89975+int sysctl_perf_event_legitimately_concerned __read_mostly = 3;
89976+#elif defined(CONFIG_GRKERNSEC_HIDESYM)
89977+int sysctl_perf_event_legitimately_concerned __read_mostly = 2;
89978+#else
89979+int sysctl_perf_event_legitimately_concerned __read_mostly = 1;
89980+#endif
89981
89982 /* Minimum for 512 kiB + 1 user control page */
89983 int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */
89984@@ -197,7 +204,7 @@ void update_perf_cpu_limits(void)
89985
89986 tmp *= sysctl_perf_cpu_time_max_percent;
89987 do_div(tmp, 100);
89988- ACCESS_ONCE(perf_sample_allowed_ns) = tmp;
89989+ ACCESS_ONCE_RW(perf_sample_allowed_ns) = tmp;
89990 }
89991
89992 static int perf_rotate_context(struct perf_cpu_context *cpuctx);
89993@@ -303,7 +310,7 @@ void perf_sample_event_took(u64 sample_len_ns)
89994 }
89995 }
89996
89997-static atomic64_t perf_event_id;
89998+static atomic64_unchecked_t perf_event_id;
89999
90000 static void cpu_ctx_sched_out(struct perf_cpu_context *cpuctx,
90001 enum event_type_t event_type);
90002@@ -3220,7 +3227,7 @@ static void __perf_event_read(void *info)
90003
90004 static inline u64 perf_event_count(struct perf_event *event)
90005 {
90006- return local64_read(&event->count) + atomic64_read(&event->child_count);
90007+ return local64_read(&event->count) + atomic64_read_unchecked(&event->child_count);
90008 }
90009
90010 static u64 perf_event_read(struct perf_event *event)
90011@@ -3656,9 +3663,9 @@ u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
90012 mutex_lock(&event->child_mutex);
90013 total += perf_event_read(event);
90014 *enabled += event->total_time_enabled +
90015- atomic64_read(&event->child_total_time_enabled);
90016+ atomic64_read_unchecked(&event->child_total_time_enabled);
90017 *running += event->total_time_running +
90018- atomic64_read(&event->child_total_time_running);
90019+ atomic64_read_unchecked(&event->child_total_time_running);
90020
90021 list_for_each_entry(child, &event->child_list, child_list) {
90022 total += perf_event_read(child);
90023@@ -4147,10 +4154,10 @@ void perf_event_update_userpage(struct perf_event *event)
90024 userpg->offset -= local64_read(&event->hw.prev_count);
90025
90026 userpg->time_enabled = enabled +
90027- atomic64_read(&event->child_total_time_enabled);
90028+ atomic64_read_unchecked(&event->child_total_time_enabled);
90029
90030 userpg->time_running = running +
90031- atomic64_read(&event->child_total_time_running);
90032+ atomic64_read_unchecked(&event->child_total_time_running);
90033
90034 arch_perf_update_userpage(event, userpg, now);
90035
90036@@ -4740,7 +4747,7 @@ perf_output_sample_ustack(struct perf_output_handle *handle, u64 dump_size,
90037
90038 /* Data. */
90039 sp = perf_user_stack_pointer(regs);
90040- rem = __output_copy_user(handle, (void *) sp, dump_size);
90041+ rem = __output_copy_user(handle, (void __user *) sp, dump_size);
90042 dyn_size = dump_size - rem;
90043
90044 perf_output_skip(handle, rem);
90045@@ -4831,11 +4838,11 @@ static void perf_output_read_one(struct perf_output_handle *handle,
90046 values[n++] = perf_event_count(event);
90047 if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {
90048 values[n++] = enabled +
90049- atomic64_read(&event->child_total_time_enabled);
90050+ atomic64_read_unchecked(&event->child_total_time_enabled);
90051 }
90052 if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {
90053 values[n++] = running +
90054- atomic64_read(&event->child_total_time_running);
90055+ atomic64_read_unchecked(&event->child_total_time_running);
90056 }
90057 if (read_format & PERF_FORMAT_ID)
90058 values[n++] = primary_event_id(event);
90059@@ -7180,7 +7187,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu,
90060 event->parent = parent_event;
90061
90062 event->ns = get_pid_ns(task_active_pid_ns(current));
90063- event->id = atomic64_inc_return(&perf_event_id);
90064+ event->id = atomic64_inc_return_unchecked(&perf_event_id);
90065
90066 event->state = PERF_EVENT_STATE_INACTIVE;
90067
90068@@ -7470,6 +7477,11 @@ SYSCALL_DEFINE5(perf_event_open,
90069 if (flags & ~PERF_FLAG_ALL)
90070 return -EINVAL;
90071
90072+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
90073+ if (perf_paranoid_any() && !capable(CAP_SYS_ADMIN))
90074+ return -EACCES;
90075+#endif
90076+
90077 err = perf_copy_attr(attr_uptr, &attr);
90078 if (err)
90079 return err;
90080@@ -7892,10 +7904,10 @@ static void sync_child_event(struct perf_event *child_event,
90081 /*
90082 * Add back the child's count to the parent's count:
90083 */
90084- atomic64_add(child_val, &parent_event->child_count);
90085- atomic64_add(child_event->total_time_enabled,
90086+ atomic64_add_unchecked(child_val, &parent_event->child_count);
90087+ atomic64_add_unchecked(child_event->total_time_enabled,
90088 &parent_event->child_total_time_enabled);
90089- atomic64_add(child_event->total_time_running,
90090+ atomic64_add_unchecked(child_event->total_time_running,
90091 &parent_event->child_total_time_running);
90092
90093 /*
90094diff --git a/kernel/events/internal.h b/kernel/events/internal.h
90095index 569b2187..19940d9 100644
90096--- a/kernel/events/internal.h
90097+++ b/kernel/events/internal.h
90098@@ -81,10 +81,10 @@ static inline unsigned long perf_data_size(struct ring_buffer *rb)
90099 return rb->nr_pages << (PAGE_SHIFT + page_order(rb));
90100 }
90101
90102-#define DEFINE_OUTPUT_COPY(func_name, memcpy_func) \
90103+#define DEFINE_OUTPUT_COPY(func_name, memcpy_func, user) \
90104 static inline unsigned long \
90105 func_name(struct perf_output_handle *handle, \
90106- const void *buf, unsigned long len) \
90107+ const void user *buf, unsigned long len) \
90108 { \
90109 unsigned long size, written; \
90110 \
90111@@ -117,7 +117,7 @@ memcpy_common(void *dst, const void *src, unsigned long n)
90112 return 0;
90113 }
90114
90115-DEFINE_OUTPUT_COPY(__output_copy, memcpy_common)
90116+DEFINE_OUTPUT_COPY(__output_copy, memcpy_common, )
90117
90118 static inline unsigned long
90119 memcpy_skip(void *dst, const void *src, unsigned long n)
90120@@ -125,7 +125,7 @@ memcpy_skip(void *dst, const void *src, unsigned long n)
90121 return 0;
90122 }
90123
90124-DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip)
90125+DEFINE_OUTPUT_COPY(__output_skip, memcpy_skip, )
90126
90127 #ifndef arch_perf_out_copy_user
90128 #define arch_perf_out_copy_user arch_perf_out_copy_user
90129@@ -143,7 +143,7 @@ arch_perf_out_copy_user(void *dst, const void *src, unsigned long n)
90130 }
90131 #endif
90132
90133-DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user)
90134+DEFINE_OUTPUT_COPY(__output_copy_user, arch_perf_out_copy_user, __user)
90135
90136 /* Callchain handling */
90137 extern struct perf_callchain_entry *
90138diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c
90139index cb346f2..e4dc317 100644
90140--- a/kernel/events/uprobes.c
90141+++ b/kernel/events/uprobes.c
90142@@ -1670,7 +1670,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr)
90143 {
90144 struct page *page;
90145 uprobe_opcode_t opcode;
90146- int result;
90147+ long result;
90148
90149 pagefault_disable();
90150 result = __copy_from_user_inatomic(&opcode, (void __user*)vaddr,
90151diff --git a/kernel/exit.c b/kernel/exit.c
90152index feff10b..f623dd5 100644
90153--- a/kernel/exit.c
90154+++ b/kernel/exit.c
90155@@ -171,6 +171,10 @@ void release_task(struct task_struct *p)
90156 struct task_struct *leader;
90157 int zap_leader;
90158 repeat:
90159+#ifdef CONFIG_NET
90160+ gr_del_task_from_ip_table(p);
90161+#endif
90162+
90163 /* don't need to get the RCU readlock here - the process is dead and
90164 * can't be modifying its own credentials. But shut RCU-lockdep up */
90165 rcu_read_lock();
90166@@ -656,6 +660,8 @@ void do_exit(long code)
90167 int group_dead;
90168 TASKS_RCU(int tasks_rcu_i);
90169
90170+ set_fs(USER_DS);
90171+
90172 profile_task_exit(tsk);
90173
90174 WARN_ON(blk_needs_flush_plug(tsk));
90175@@ -672,7 +678,6 @@ void do_exit(long code)
90176 * mm_release()->clear_child_tid() from writing to a user-controlled
90177 * kernel address.
90178 */
90179- set_fs(USER_DS);
90180
90181 ptrace_event(PTRACE_EVENT_EXIT, code);
90182
90183@@ -730,6 +735,9 @@ void do_exit(long code)
90184 tsk->exit_code = code;
90185 taskstats_exit(tsk, group_dead);
90186
90187+ gr_acl_handle_psacct(tsk, code);
90188+ gr_acl_handle_exit();
90189+
90190 exit_mm(tsk);
90191
90192 if (group_dead)
90193@@ -849,7 +857,7 @@ SYSCALL_DEFINE1(exit, int, error_code)
90194 * Take down every thread in the group. This is called by fatal signals
90195 * as well as by sys_exit_group (below).
90196 */
90197-void
90198+__noreturn void
90199 do_group_exit(int exit_code)
90200 {
90201 struct signal_struct *sig = current->signal;
90202diff --git a/kernel/fork.c b/kernel/fork.c
90203index cf65139..704476e 100644
90204--- a/kernel/fork.c
90205+++ b/kernel/fork.c
90206@@ -177,12 +177,54 @@ static void free_thread_info(struct thread_info *ti)
90207 void thread_info_cache_init(void)
90208 {
90209 thread_info_cache = kmem_cache_create("thread_info", THREAD_SIZE,
90210- THREAD_SIZE, 0, NULL);
90211+ THREAD_SIZE, SLAB_USERCOPY, NULL);
90212 BUG_ON(thread_info_cache == NULL);
90213 }
90214 # endif
90215 #endif
90216
90217+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
90218+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
90219+ int node, void **lowmem_stack)
90220+{
90221+ struct page *pages[THREAD_SIZE / PAGE_SIZE];
90222+ void *ret = NULL;
90223+ unsigned int i;
90224+
90225+ *lowmem_stack = alloc_thread_info_node(tsk, node);
90226+ if (*lowmem_stack == NULL)
90227+ goto out;
90228+
90229+ for (i = 0; i < THREAD_SIZE / PAGE_SIZE; i++)
90230+ pages[i] = virt_to_page(*lowmem_stack + (i * PAGE_SIZE));
90231+
90232+ /* use VM_IOREMAP to gain THREAD_SIZE alignment */
90233+ ret = vmap(pages, THREAD_SIZE / PAGE_SIZE, VM_IOREMAP, PAGE_KERNEL);
90234+ if (ret == NULL) {
90235+ free_thread_info(*lowmem_stack);
90236+ *lowmem_stack = NULL;
90237+ }
90238+
90239+out:
90240+ return ret;
90241+}
90242+
90243+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
90244+{
90245+ unmap_process_stacks(tsk);
90246+}
90247+#else
90248+static inline struct thread_info *gr_alloc_thread_info_node(struct task_struct *tsk,
90249+ int node, void **lowmem_stack)
90250+{
90251+ return alloc_thread_info_node(tsk, node);
90252+}
90253+static inline void gr_free_thread_info(struct task_struct *tsk, struct thread_info *ti)
90254+{
90255+ free_thread_info(ti);
90256+}
90257+#endif
90258+
90259 /* SLAB cache for signal_struct structures (tsk->signal) */
90260 static struct kmem_cache *signal_cachep;
90261
90262@@ -201,18 +243,22 @@ struct kmem_cache *vm_area_cachep;
90263 /* SLAB cache for mm_struct structures (tsk->mm) */
90264 static struct kmem_cache *mm_cachep;
90265
90266-static void account_kernel_stack(struct thread_info *ti, int account)
90267+static void account_kernel_stack(struct task_struct *tsk, struct thread_info *ti, int account)
90268 {
90269+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
90270+ struct zone *zone = page_zone(virt_to_page(tsk->lowmem_stack));
90271+#else
90272 struct zone *zone = page_zone(virt_to_page(ti));
90273+#endif
90274
90275 mod_zone_page_state(zone, NR_KERNEL_STACK, account);
90276 }
90277
90278 void free_task(struct task_struct *tsk)
90279 {
90280- account_kernel_stack(tsk->stack, -1);
90281+ account_kernel_stack(tsk, tsk->stack, -1);
90282 arch_release_thread_info(tsk->stack);
90283- free_thread_info(tsk->stack);
90284+ gr_free_thread_info(tsk, tsk->stack);
90285 rt_mutex_debug_task_free(tsk);
90286 ftrace_graph_exit_task(tsk);
90287 put_seccomp_filter(tsk);
90288@@ -306,6 +352,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
90289 {
90290 struct task_struct *tsk;
90291 struct thread_info *ti;
90292+ void *lowmem_stack;
90293 int node = tsk_fork_get_node(orig);
90294 int err;
90295
90296@@ -313,7 +360,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
90297 if (!tsk)
90298 return NULL;
90299
90300- ti = alloc_thread_info_node(tsk, node);
90301+ ti = gr_alloc_thread_info_node(tsk, node, &lowmem_stack);
90302 if (!ti)
90303 goto free_tsk;
90304
90305@@ -322,6 +369,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
90306 goto free_ti;
90307
90308 tsk->stack = ti;
90309+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
90310+ tsk->lowmem_stack = lowmem_stack;
90311+#endif
90312 #ifdef CONFIG_SECCOMP
90313 /*
90314 * We must handle setting up seccomp filters once we're under
90315@@ -338,7 +388,7 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
90316 set_task_stack_end_magic(tsk);
90317
90318 #ifdef CONFIG_CC_STACKPROTECTOR
90319- tsk->stack_canary = get_random_int();
90320+ tsk->stack_canary = pax_get_random_long();
90321 #endif
90322
90323 /*
90324@@ -352,24 +402,89 @@ static struct task_struct *dup_task_struct(struct task_struct *orig)
90325 tsk->splice_pipe = NULL;
90326 tsk->task_frag.page = NULL;
90327
90328- account_kernel_stack(ti, 1);
90329+ account_kernel_stack(tsk, ti, 1);
90330
90331 return tsk;
90332
90333 free_ti:
90334- free_thread_info(ti);
90335+ gr_free_thread_info(tsk, ti);
90336 free_tsk:
90337 free_task_struct(tsk);
90338 return NULL;
90339 }
90340
90341 #ifdef CONFIG_MMU
90342-static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
90343+static struct vm_area_struct *dup_vma(struct mm_struct *mm, struct mm_struct *oldmm, struct vm_area_struct *mpnt)
90344+{
90345+ struct vm_area_struct *tmp;
90346+ unsigned long charge;
90347+ struct file *file;
90348+ int retval;
90349+
90350+ charge = 0;
90351+ if (mpnt->vm_flags & VM_ACCOUNT) {
90352+ unsigned long len = vma_pages(mpnt);
90353+
90354+ if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
90355+ goto fail_nomem;
90356+ charge = len;
90357+ }
90358+ tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
90359+ if (!tmp)
90360+ goto fail_nomem;
90361+ *tmp = *mpnt;
90362+ tmp->vm_mm = mm;
90363+ INIT_LIST_HEAD(&tmp->anon_vma_chain);
90364+ retval = vma_dup_policy(mpnt, tmp);
90365+ if (retval)
90366+ goto fail_nomem_policy;
90367+ if (anon_vma_fork(tmp, mpnt))
90368+ goto fail_nomem_anon_vma_fork;
90369+ tmp->vm_flags &= ~VM_LOCKED;
90370+ tmp->vm_next = tmp->vm_prev = NULL;
90371+ tmp->vm_mirror = NULL;
90372+ file = tmp->vm_file;
90373+ if (file) {
90374+ struct inode *inode = file_inode(file);
90375+ struct address_space *mapping = file->f_mapping;
90376+
90377+ get_file(file);
90378+ if (tmp->vm_flags & VM_DENYWRITE)
90379+ atomic_dec(&inode->i_writecount);
90380+ i_mmap_lock_write(mapping);
90381+ if (tmp->vm_flags & VM_SHARED)
90382+ atomic_inc(&mapping->i_mmap_writable);
90383+ flush_dcache_mmap_lock(mapping);
90384+ /* insert tmp into the share list, just after mpnt */
90385+ vma_interval_tree_insert_after(tmp, mpnt, &mapping->i_mmap);
90386+ flush_dcache_mmap_unlock(mapping);
90387+ i_mmap_unlock_write(mapping);
90388+ }
90389+
90390+ /*
90391+ * Clear hugetlb-related page reserves for children. This only
90392+ * affects MAP_PRIVATE mappings. Faults generated by the child
90393+ * are not guaranteed to succeed, even if read-only
90394+ */
90395+ if (is_vm_hugetlb_page(tmp))
90396+ reset_vma_resv_huge_pages(tmp);
90397+
90398+ return tmp;
90399+
90400+fail_nomem_anon_vma_fork:
90401+ mpol_put(vma_policy(tmp));
90402+fail_nomem_policy:
90403+ kmem_cache_free(vm_area_cachep, tmp);
90404+fail_nomem:
90405+ vm_unacct_memory(charge);
90406+ return NULL;
90407+}
90408+
90409+static __latent_entropy int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
90410 {
90411 struct vm_area_struct *mpnt, *tmp, *prev, **pprev;
90412 struct rb_node **rb_link, *rb_parent;
90413 int retval;
90414- unsigned long charge;
90415
90416 uprobe_start_dup_mmap();
90417 down_write(&oldmm->mmap_sem);
90418@@ -397,51 +512,15 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
90419
90420 prev = NULL;
90421 for (mpnt = oldmm->mmap; mpnt; mpnt = mpnt->vm_next) {
90422- struct file *file;
90423-
90424 if (mpnt->vm_flags & VM_DONTCOPY) {
90425 vm_stat_account(mm, mpnt->vm_flags, mpnt->vm_file,
90426 -vma_pages(mpnt));
90427 continue;
90428 }
90429- charge = 0;
90430- if (mpnt->vm_flags & VM_ACCOUNT) {
90431- unsigned long len = vma_pages(mpnt);
90432-
90433- if (security_vm_enough_memory_mm(oldmm, len)) /* sic */
90434- goto fail_nomem;
90435- charge = len;
90436- }
90437- tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
90438- if (!tmp)
90439- goto fail_nomem;
90440- *tmp = *mpnt;
90441- INIT_LIST_HEAD(&tmp->anon_vma_chain);
90442- retval = vma_dup_policy(mpnt, tmp);
90443- if (retval)
90444- goto fail_nomem_policy;
90445- tmp->vm_mm = mm;
90446- if (anon_vma_fork(tmp, mpnt))
90447- goto fail_nomem_anon_vma_fork;
90448- tmp->vm_flags &= ~VM_LOCKED;
90449- tmp->vm_next = tmp->vm_prev = NULL;
90450- file = tmp->vm_file;
90451- if (file) {
90452- struct inode *inode = file_inode(file);
90453- struct address_space *mapping = file->f_mapping;
90454-
90455- get_file(file);
90456- if (tmp->vm_flags & VM_DENYWRITE)
90457- atomic_dec(&inode->i_writecount);
90458- i_mmap_lock_write(mapping);
90459- if (tmp->vm_flags & VM_SHARED)
90460- atomic_inc(&mapping->i_mmap_writable);
90461- flush_dcache_mmap_lock(mapping);
90462- /* insert tmp into the share list, just after mpnt */
90463- vma_interval_tree_insert_after(tmp, mpnt,
90464- &mapping->i_mmap);
90465- flush_dcache_mmap_unlock(mapping);
90466- i_mmap_unlock_write(mapping);
90467+ tmp = dup_vma(mm, oldmm, mpnt);
90468+ if (!tmp) {
90469+ retval = -ENOMEM;
90470+ goto out;
90471 }
90472
90473 /*
90474@@ -473,6 +552,31 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
90475 if (retval)
90476 goto out;
90477 }
90478+
90479+#ifdef CONFIG_PAX_SEGMEXEC
90480+ if (oldmm->pax_flags & MF_PAX_SEGMEXEC) {
90481+ struct vm_area_struct *mpnt_m;
90482+
90483+ for (mpnt = oldmm->mmap, mpnt_m = mm->mmap; mpnt; mpnt = mpnt->vm_next, mpnt_m = mpnt_m->vm_next) {
90484+ BUG_ON(!mpnt_m || mpnt_m->vm_mirror || mpnt->vm_mm != oldmm || mpnt_m->vm_mm != mm);
90485+
90486+ if (!mpnt->vm_mirror)
90487+ continue;
90488+
90489+ if (mpnt->vm_end <= SEGMEXEC_TASK_SIZE) {
90490+ BUG_ON(mpnt->vm_mirror->vm_mirror != mpnt);
90491+ mpnt->vm_mirror = mpnt_m;
90492+ } else {
90493+ BUG_ON(mpnt->vm_mirror->vm_mirror == mpnt || mpnt->vm_mirror->vm_mirror->vm_mm != mm);
90494+ mpnt_m->vm_mirror = mpnt->vm_mirror->vm_mirror;
90495+ mpnt_m->vm_mirror->vm_mirror = mpnt_m;
90496+ mpnt->vm_mirror->vm_mirror = mpnt;
90497+ }
90498+ }
90499+ BUG_ON(mpnt_m);
90500+ }
90501+#endif
90502+
90503 /* a new mm has just been created */
90504 arch_dup_mmap(oldmm, mm);
90505 retval = 0;
90506@@ -482,14 +586,6 @@ out:
90507 up_write(&oldmm->mmap_sem);
90508 uprobe_end_dup_mmap();
90509 return retval;
90510-fail_nomem_anon_vma_fork:
90511- mpol_put(vma_policy(tmp));
90512-fail_nomem_policy:
90513- kmem_cache_free(vm_area_cachep, tmp);
90514-fail_nomem:
90515- retval = -ENOMEM;
90516- vm_unacct_memory(charge);
90517- goto out;
90518 }
90519
90520 static inline int mm_alloc_pgd(struct mm_struct *mm)
90521@@ -739,8 +835,8 @@ struct mm_struct *mm_access(struct task_struct *task, unsigned int mode)
90522 return ERR_PTR(err);
90523
90524 mm = get_task_mm(task);
90525- if (mm && mm != current->mm &&
90526- !ptrace_may_access(task, mode)) {
90527+ if (mm && ((mm != current->mm && !ptrace_may_access(task, mode)) ||
90528+ (mode == PTRACE_MODE_ATTACH && (gr_handle_proc_ptrace(task) || gr_acl_handle_procpidmem(task))))) {
90529 mmput(mm);
90530 mm = ERR_PTR(-EACCES);
90531 }
90532@@ -943,13 +1039,20 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
90533 spin_unlock(&fs->lock);
90534 return -EAGAIN;
90535 }
90536- fs->users++;
90537+ atomic_inc(&fs->users);
90538 spin_unlock(&fs->lock);
90539 return 0;
90540 }
90541 tsk->fs = copy_fs_struct(fs);
90542 if (!tsk->fs)
90543 return -ENOMEM;
90544+ /* Carry through gr_chroot_dentry and is_chrooted instead
90545+ of recomputing it here. Already copied when the task struct
90546+ is duplicated. This allows pivot_root to not be treated as
90547+ a chroot
90548+ */
90549+ //gr_set_chroot_entries(tsk, &tsk->fs->root);
90550+
90551 return 0;
90552 }
90553
90554@@ -1187,7 +1290,7 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid)
90555 * parts of the process environment (as per the clone
90556 * flags). The actual kick-off is left to the caller.
90557 */
90558-static struct task_struct *copy_process(unsigned long clone_flags,
90559+static __latent_entropy struct task_struct *copy_process(unsigned long clone_flags,
90560 unsigned long stack_start,
90561 unsigned long stack_size,
90562 int __user *child_tidptr,
90563@@ -1258,6 +1361,9 @@ static struct task_struct *copy_process(unsigned long clone_flags,
90564 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
90565 #endif
90566 retval = -EAGAIN;
90567+
90568+ gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
90569+
90570 if (atomic_read(&p->real_cred->user->processes) >=
90571 task_rlimit(p, RLIMIT_NPROC)) {
90572 if (p->real_cred->user != INIT_USER &&
90573@@ -1507,6 +1613,11 @@ static struct task_struct *copy_process(unsigned long clone_flags,
90574 goto bad_fork_free_pid;
90575 }
90576
90577+ /* synchronizes with gr_set_acls()
90578+ we need to call this past the point of no return for fork()
90579+ */
90580+ gr_copy_label(p);
90581+
90582 if (likely(p->pid)) {
90583 ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
90584
90585@@ -1597,6 +1708,8 @@ bad_fork_cleanup_count:
90586 bad_fork_free:
90587 free_task(p);
90588 fork_out:
90589+ gr_log_forkfail(retval);
90590+
90591 return ERR_PTR(retval);
90592 }
90593
90594@@ -1658,6 +1771,7 @@ long do_fork(unsigned long clone_flags,
90595
90596 p = copy_process(clone_flags, stack_start, stack_size,
90597 child_tidptr, NULL, trace);
90598+ add_latent_entropy();
90599 /*
90600 * Do this prior waking up the new thread - the thread pointer
90601 * might get invalid after that point, if the thread exits quickly.
90602@@ -1674,6 +1788,8 @@ long do_fork(unsigned long clone_flags,
90603 if (clone_flags & CLONE_PARENT_SETTID)
90604 put_user(nr, parent_tidptr);
90605
90606+ gr_handle_brute_check();
90607+
90608 if (clone_flags & CLONE_VFORK) {
90609 p->vfork_done = &vfork;
90610 init_completion(&vfork);
90611@@ -1792,7 +1908,7 @@ void __init proc_caches_init(void)
90612 mm_cachep = kmem_cache_create("mm_struct",
90613 sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN,
90614 SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
90615- vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
90616+ vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC | SLAB_NO_SANITIZE);
90617 mmap_init();
90618 nsproxy_cache_init();
90619 }
90620@@ -1832,7 +1948,7 @@ static int unshare_fs(unsigned long unshare_flags, struct fs_struct **new_fsp)
90621 return 0;
90622
90623 /* don't need lock here; in the worst case we'll do useless copy */
90624- if (fs->users == 1)
90625+ if (atomic_read(&fs->users) == 1)
90626 return 0;
90627
90628 *new_fsp = copy_fs_struct(fs);
90629@@ -1944,7 +2060,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, unshare_flags)
90630 fs = current->fs;
90631 spin_lock(&fs->lock);
90632 current->fs = new_fs;
90633- if (--fs->users)
90634+ gr_set_chroot_entries(current, &current->fs->root);
90635+ if (atomic_dec_return(&fs->users))
90636 new_fs = NULL;
90637 else
90638 new_fs = fs;
90639diff --git a/kernel/futex.c b/kernel/futex.c
90640index 2a5e383..878bac6 100644
90641--- a/kernel/futex.c
90642+++ b/kernel/futex.c
90643@@ -201,7 +201,7 @@ struct futex_pi_state {
90644 atomic_t refcount;
90645
90646 union futex_key key;
90647-};
90648+} __randomize_layout;
90649
90650 /**
90651 * struct futex_q - The hashed futex queue entry, one per waiting task
90652@@ -235,7 +235,7 @@ struct futex_q {
90653 struct rt_mutex_waiter *rt_waiter;
90654 union futex_key *requeue_pi_key;
90655 u32 bitset;
90656-};
90657+} __randomize_layout;
90658
90659 static const struct futex_q futex_q_init = {
90660 /* list gets initialized in queue_me()*/
90661@@ -402,6 +402,11 @@ get_futex_key(u32 __user *uaddr, int fshared, union futex_key *key, int rw)
90662 struct page *page, *page_head;
90663 int err, ro = 0;
90664
90665+#ifdef CONFIG_PAX_SEGMEXEC
90666+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && address >= SEGMEXEC_TASK_SIZE)
90667+ return -EFAULT;
90668+#endif
90669+
90670 /*
90671 * The futex address must be "naturally" aligned.
90672 */
90673@@ -601,7 +606,7 @@ static int cmpxchg_futex_value_locked(u32 *curval, u32 __user *uaddr,
90674
90675 static int get_futex_value_locked(u32 *dest, u32 __user *from)
90676 {
90677- int ret;
90678+ unsigned long ret;
90679
90680 pagefault_disable();
90681 ret = __copy_from_user_inatomic(dest, from, sizeof(u32));
90682@@ -3006,6 +3011,7 @@ static void __init futex_detect_cmpxchg(void)
90683 {
90684 #ifndef CONFIG_HAVE_FUTEX_CMPXCHG
90685 u32 curval;
90686+ mm_segment_t oldfs;
90687
90688 /*
90689 * This will fail and we want it. Some arch implementations do
90690@@ -3017,8 +3023,11 @@ static void __init futex_detect_cmpxchg(void)
90691 * implementation, the non-functional ones will return
90692 * -ENOSYS.
90693 */
90694+ oldfs = get_fs();
90695+ set_fs(USER_DS);
90696 if (cmpxchg_futex_value_locked(&curval, NULL, 0, 0) == -EFAULT)
90697 futex_cmpxchg_enabled = 1;
90698+ set_fs(oldfs);
90699 #endif
90700 }
90701
90702diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c
90703index 55c8c93..9ba7ad6 100644
90704--- a/kernel/futex_compat.c
90705+++ b/kernel/futex_compat.c
90706@@ -32,7 +32,7 @@ fetch_robust_entry(compat_uptr_t *uentry, struct robust_list __user **entry,
90707 return 0;
90708 }
90709
90710-static void __user *futex_uaddr(struct robust_list __user *entry,
90711+static void __user __intentional_overflow(-1) *futex_uaddr(struct robust_list __user *entry,
90712 compat_long_t futex_offset)
90713 {
90714 compat_uptr_t base = ptr_to_compat(entry);
90715diff --git a/kernel/gcov/base.c b/kernel/gcov/base.c
90716index b358a80..fc25240 100644
90717--- a/kernel/gcov/base.c
90718+++ b/kernel/gcov/base.c
90719@@ -114,11 +114,6 @@ void gcov_enable_events(void)
90720 }
90721
90722 #ifdef CONFIG_MODULES
90723-static inline int within(void *addr, void *start, unsigned long size)
90724-{
90725- return ((addr >= start) && (addr < start + size));
90726-}
90727-
90728 /* Update list and generate events when modules are unloaded. */
90729 static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
90730 void *data)
90731@@ -133,7 +128,7 @@ static int gcov_module_notifier(struct notifier_block *nb, unsigned long event,
90732
90733 /* Remove entries located in module from linked list. */
90734 while ((info = gcov_info_next(info))) {
90735- if (within(info, mod->module_core, mod->core_size)) {
90736+ if (within_module_core_rw((unsigned long)info, mod)) {
90737 gcov_info_unlink(prev, info);
90738 if (gcov_events_enabled)
90739 gcov_event(GCOV_REMOVE, info);
90740diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
90741index 886d09e..c7ff4e5 100644
90742--- a/kernel/irq/manage.c
90743+++ b/kernel/irq/manage.c
90744@@ -874,7 +874,7 @@ static int irq_thread(void *data)
90745
90746 action_ret = handler_fn(desc, action);
90747 if (action_ret == IRQ_HANDLED)
90748- atomic_inc(&desc->threads_handled);
90749+ atomic_inc_unchecked(&desc->threads_handled);
90750
90751 wake_threads_waitq(desc);
90752 }
90753diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
90754index e2514b0..de3dfe0 100644
90755--- a/kernel/irq/spurious.c
90756+++ b/kernel/irq/spurious.c
90757@@ -337,7 +337,7 @@ void note_interrupt(unsigned int irq, struct irq_desc *desc,
90758 * count. We just care about the count being
90759 * different than the one we saw before.
90760 */
90761- handled = atomic_read(&desc->threads_handled);
90762+ handled = atomic_read_unchecked(&desc->threads_handled);
90763 handled |= SPURIOUS_DEFERRED;
90764 if (handled != desc->threads_handled_last) {
90765 action_ret = IRQ_HANDLED;
90766diff --git a/kernel/jump_label.c b/kernel/jump_label.c
90767index 9019f15..9a3c42e 100644
90768--- a/kernel/jump_label.c
90769+++ b/kernel/jump_label.c
90770@@ -14,6 +14,7 @@
90771 #include <linux/err.h>
90772 #include <linux/static_key.h>
90773 #include <linux/jump_label_ratelimit.h>
90774+#include <linux/mm.h>
90775
90776 #ifdef HAVE_JUMP_LABEL
90777
90778@@ -51,7 +52,9 @@ jump_label_sort_entries(struct jump_entry *start, struct jump_entry *stop)
90779
90780 size = (((unsigned long)stop - (unsigned long)start)
90781 / sizeof(struct jump_entry));
90782+ pax_open_kernel();
90783 sort(start, size, sizeof(struct jump_entry), jump_label_cmp, NULL);
90784+ pax_close_kernel();
90785 }
90786
90787 static void jump_label_update(struct static_key *key, int enable);
90788@@ -363,10 +366,12 @@ static void jump_label_invalidate_module_init(struct module *mod)
90789 struct jump_entry *iter_stop = iter_start + mod->num_jump_entries;
90790 struct jump_entry *iter;
90791
90792+ pax_open_kernel();
90793 for (iter = iter_start; iter < iter_stop; iter++) {
90794 if (within_module_init(iter->code, mod))
90795 iter->code = 0;
90796 }
90797+ pax_close_kernel();
90798 }
90799
90800 static int
90801diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
90802index 5c5987f..bc502b0 100644
90803--- a/kernel/kallsyms.c
90804+++ b/kernel/kallsyms.c
90805@@ -11,6 +11,9 @@
90806 * Changed the compression method from stem compression to "table lookup"
90807 * compression (see scripts/kallsyms.c for a more complete description)
90808 */
90809+#ifdef CONFIG_GRKERNSEC_HIDESYM
90810+#define __INCLUDED_BY_HIDESYM 1
90811+#endif
90812 #include <linux/kallsyms.h>
90813 #include <linux/module.h>
90814 #include <linux/init.h>
90815@@ -54,12 +57,33 @@ extern const unsigned long kallsyms_markers[] __weak;
90816
90817 static inline int is_kernel_inittext(unsigned long addr)
90818 {
90819+ if (system_state != SYSTEM_BOOTING)
90820+ return 0;
90821+
90822 if (addr >= (unsigned long)_sinittext
90823 && addr <= (unsigned long)_einittext)
90824 return 1;
90825 return 0;
90826 }
90827
90828+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
90829+#ifdef CONFIG_MODULES
90830+static inline int is_module_text(unsigned long addr)
90831+{
90832+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END)
90833+ return 1;
90834+
90835+ addr = ktla_ktva(addr);
90836+ return (unsigned long)MODULES_EXEC_VADDR <= addr && addr <= (unsigned long)MODULES_EXEC_END;
90837+}
90838+#else
90839+static inline int is_module_text(unsigned long addr)
90840+{
90841+ return 0;
90842+}
90843+#endif
90844+#endif
90845+
90846 static inline int is_kernel_text(unsigned long addr)
90847 {
90848 if ((addr >= (unsigned long)_stext && addr <= (unsigned long)_etext) ||
90849@@ -70,13 +94,28 @@ static inline int is_kernel_text(unsigned long addr)
90850
90851 static inline int is_kernel(unsigned long addr)
90852 {
90853+
90854+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
90855+ if (is_kernel_text(addr) || is_kernel_inittext(addr))
90856+ return 1;
90857+
90858+ if (ktla_ktva((unsigned long)_text) <= addr && addr < (unsigned long)_end)
90859+#else
90860 if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end)
90861+#endif
90862+
90863 return 1;
90864 return in_gate_area_no_mm(addr);
90865 }
90866
90867 static int is_ksym_addr(unsigned long addr)
90868 {
90869+
90870+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
90871+ if (is_module_text(addr))
90872+ return 0;
90873+#endif
90874+
90875 if (all_var)
90876 return is_kernel(addr);
90877
90878@@ -481,7 +520,6 @@ static unsigned long get_ksymbol_core(struct kallsym_iter *iter)
90879
90880 static void reset_iter(struct kallsym_iter *iter, loff_t new_pos)
90881 {
90882- iter->name[0] = '\0';
90883 iter->nameoff = get_symbol_offset(new_pos);
90884 iter->pos = new_pos;
90885 }
90886@@ -529,6 +567,11 @@ static int s_show(struct seq_file *m, void *p)
90887 {
90888 struct kallsym_iter *iter = m->private;
90889
90890+#ifdef CONFIG_GRKERNSEC_HIDESYM
90891+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID))
90892+ return 0;
90893+#endif
90894+
90895 /* Some debugging symbols have no name. Ignore them. */
90896 if (!iter->name[0])
90897 return 0;
90898@@ -542,6 +585,7 @@ static int s_show(struct seq_file *m, void *p)
90899 */
90900 type = iter->exported ? toupper(iter->type) :
90901 tolower(iter->type);
90902+
90903 seq_printf(m, "%pK %c %s\t[%s]\n", (void *)iter->value,
90904 type, iter->name, iter->module_name);
90905 } else
90906diff --git a/kernel/kcmp.c b/kernel/kcmp.c
90907index 0aa69ea..a7fcafb 100644
90908--- a/kernel/kcmp.c
90909+++ b/kernel/kcmp.c
90910@@ -100,6 +100,10 @@ SYSCALL_DEFINE5(kcmp, pid_t, pid1, pid_t, pid2, int, type,
90911 struct task_struct *task1, *task2;
90912 int ret;
90913
90914+#ifdef CONFIG_GRKERNSEC
90915+ return -ENOSYS;
90916+#endif
90917+
90918 rcu_read_lock();
90919
90920 /*
90921diff --git a/kernel/kexec.c b/kernel/kexec.c
90922index 38c25b1..12b3f69 100644
90923--- a/kernel/kexec.c
90924+++ b/kernel/kexec.c
90925@@ -1348,7 +1348,8 @@ COMPAT_SYSCALL_DEFINE4(kexec_load, compat_ulong_t, entry,
90926 compat_ulong_t, flags)
90927 {
90928 struct compat_kexec_segment in;
90929- struct kexec_segment out, __user *ksegments;
90930+ struct kexec_segment out;
90931+ struct kexec_segment __user *ksegments;
90932 unsigned long i, result;
90933
90934 /* Don't allow clients that don't understand the native
90935diff --git a/kernel/kmod.c b/kernel/kmod.c
90936index 2777f40..a689506 100644
90937--- a/kernel/kmod.c
90938+++ b/kernel/kmod.c
90939@@ -68,7 +68,7 @@ static void free_modprobe_argv(struct subprocess_info *info)
90940 kfree(info->argv);
90941 }
90942
90943-static int call_modprobe(char *module_name, int wait)
90944+static int call_modprobe(char *module_name, char *module_param, int wait)
90945 {
90946 struct subprocess_info *info;
90947 static char *envp[] = {
90948@@ -78,7 +78,7 @@ static int call_modprobe(char *module_name, int wait)
90949 NULL
90950 };
90951
90952- char **argv = kmalloc(sizeof(char *[5]), GFP_KERNEL);
90953+ char **argv = kmalloc(sizeof(char *[6]), GFP_KERNEL);
90954 if (!argv)
90955 goto out;
90956
90957@@ -90,7 +90,8 @@ static int call_modprobe(char *module_name, int wait)
90958 argv[1] = "-q";
90959 argv[2] = "--";
90960 argv[3] = module_name; /* check free_modprobe_argv() */
90961- argv[4] = NULL;
90962+ argv[4] = module_param;
90963+ argv[5] = NULL;
90964
90965 info = call_usermodehelper_setup(modprobe_path, argv, envp, GFP_KERNEL,
90966 NULL, free_modprobe_argv, NULL);
90967@@ -122,9 +123,8 @@ out:
90968 * If module auto-loading support is disabled then this function
90969 * becomes a no-operation.
90970 */
90971-int __request_module(bool wait, const char *fmt, ...)
90972+static int ____request_module(bool wait, char *module_param, const char *fmt, va_list ap)
90973 {
90974- va_list args;
90975 char module_name[MODULE_NAME_LEN];
90976 unsigned int max_modprobes;
90977 int ret;
90978@@ -143,9 +143,7 @@ int __request_module(bool wait, const char *fmt, ...)
90979 if (!modprobe_path[0])
90980 return 0;
90981
90982- va_start(args, fmt);
90983- ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, args);
90984- va_end(args);
90985+ ret = vsnprintf(module_name, MODULE_NAME_LEN, fmt, ap);
90986 if (ret >= MODULE_NAME_LEN)
90987 return -ENAMETOOLONG;
90988
90989@@ -153,6 +151,20 @@ int __request_module(bool wait, const char *fmt, ...)
90990 if (ret)
90991 return ret;
90992
90993+#ifdef CONFIG_GRKERNSEC_MODHARDEN
90994+ if (uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
90995+ /* hack to workaround consolekit/udisks stupidity */
90996+ read_lock(&tasklist_lock);
90997+ if (!strcmp(current->comm, "mount") &&
90998+ current->real_parent && !strncmp(current->real_parent->comm, "udisk", 5)) {
90999+ read_unlock(&tasklist_lock);
91000+ printk(KERN_ALERT "grsec: denied attempt to auto-load fs module %.64s by udisks\n", module_name);
91001+ return -EPERM;
91002+ }
91003+ read_unlock(&tasklist_lock);
91004+ }
91005+#endif
91006+
91007 /* If modprobe needs a service that is in a module, we get a recursive
91008 * loop. Limit the number of running kmod threads to max_threads/2 or
91009 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
91010@@ -181,16 +193,61 @@ int __request_module(bool wait, const char *fmt, ...)
91011
91012 trace_module_request(module_name, wait, _RET_IP_);
91013
91014- ret = call_modprobe(module_name, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
91015+ ret = call_modprobe(module_name, module_param, wait ? UMH_WAIT_PROC : UMH_WAIT_EXEC);
91016
91017 atomic_dec(&kmod_concurrent);
91018 return ret;
91019 }
91020+
91021+int ___request_module(bool wait, char *module_param, const char *fmt, ...)
91022+{
91023+ va_list args;
91024+ int ret;
91025+
91026+ va_start(args, fmt);
91027+ ret = ____request_module(wait, module_param, fmt, args);
91028+ va_end(args);
91029+
91030+ return ret;
91031+}
91032+
91033+int __request_module(bool wait, const char *fmt, ...)
91034+{
91035+ va_list args;
91036+ int ret;
91037+
91038+#ifdef CONFIG_GRKERNSEC_MODHARDEN
91039+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)) {
91040+ char module_param[MODULE_NAME_LEN];
91041+
91042+ memset(module_param, 0, sizeof(module_param));
91043+
91044+ snprintf(module_param, sizeof(module_param) - 1, "grsec_modharden_normal%u_", GR_GLOBAL_UID(current_uid()));
91045+
91046+ va_start(args, fmt);
91047+ ret = ____request_module(wait, module_param, fmt, args);
91048+ va_end(args);
91049+
91050+ return ret;
91051+ }
91052+#endif
91053+
91054+ va_start(args, fmt);
91055+ ret = ____request_module(wait, NULL, fmt, args);
91056+ va_end(args);
91057+
91058+ return ret;
91059+}
91060+
91061 EXPORT_SYMBOL(__request_module);
91062 #endif /* CONFIG_MODULES */
91063
91064 static void call_usermodehelper_freeinfo(struct subprocess_info *info)
91065 {
91066+#ifdef CONFIG_GRKERNSEC
91067+ kfree(info->path);
91068+ info->path = info->origpath;
91069+#endif
91070 if (info->cleanup)
91071 (*info->cleanup)(info);
91072 kfree(info);
91073@@ -232,6 +289,21 @@ static int ____call_usermodehelper(void *data)
91074 */
91075 set_user_nice(current, 0);
91076
91077+#ifdef CONFIG_GRKERNSEC
91078+ /* this is race-free as far as userland is concerned as we copied
91079+ out the path to be used prior to this point and are now operating
91080+ on that copy
91081+ */
91082+ if ((strncmp(sub_info->path, "/sbin/", 6) && strncmp(sub_info->path, "/usr/lib/", 9) &&
91083+ strncmp(sub_info->path, "/lib/", 5) && strncmp(sub_info->path, "/lib64/", 7) &&
91084+ strncmp(sub_info->path, "/usr/libexec/", 13) && strncmp(sub_info->path, "/usr/bin/", 9) &&
91085+ strcmp(sub_info->path, "/usr/share/apport/apport")) || strstr(sub_info->path, "..")) {
91086+ printk(KERN_ALERT "grsec: denied exec of usermode helper binary %.950s located outside of permitted system paths\n", sub_info->path);
91087+ retval = -EPERM;
91088+ goto out;
91089+ }
91090+#endif
91091+
91092 retval = -ENOMEM;
91093 new = prepare_kernel_cred(current);
91094 if (!new)
91095@@ -254,8 +326,8 @@ static int ____call_usermodehelper(void *data)
91096 commit_creds(new);
91097
91098 retval = do_execve(getname_kernel(sub_info->path),
91099- (const char __user *const __user *)sub_info->argv,
91100- (const char __user *const __user *)sub_info->envp);
91101+ (const char __user *const __force_user *)sub_info->argv,
91102+ (const char __user *const __force_user *)sub_info->envp);
91103 out:
91104 sub_info->retval = retval;
91105 /* wait_for_helper() will call umh_complete if UHM_WAIT_PROC. */
91106@@ -288,7 +360,7 @@ static int wait_for_helper(void *data)
91107 *
91108 * Thus the __user pointer cast is valid here.
91109 */
91110- sys_wait4(pid, (int __user *)&ret, 0, NULL);
91111+ sys_wait4(pid, (int __force_user *)&ret, 0, NULL);
91112
91113 /*
91114 * If ret is 0, either ____call_usermodehelper failed and the
91115@@ -510,7 +582,12 @@ struct subprocess_info *call_usermodehelper_setup(char *path, char **argv,
91116 goto out;
91117
91118 INIT_WORK(&sub_info->work, __call_usermodehelper);
91119+#ifdef CONFIG_GRKERNSEC
91120+ sub_info->origpath = path;
91121+ sub_info->path = kstrdup(path, gfp_mask);
91122+#else
91123 sub_info->path = path;
91124+#endif
91125 sub_info->argv = argv;
91126 sub_info->envp = envp;
91127
91128@@ -612,7 +689,7 @@ EXPORT_SYMBOL(call_usermodehelper);
91129 static int proc_cap_handler(struct ctl_table *table, int write,
91130 void __user *buffer, size_t *lenp, loff_t *ppos)
91131 {
91132- struct ctl_table t;
91133+ ctl_table_no_const t;
91134 unsigned long cap_array[_KERNEL_CAPABILITY_U32S];
91135 kernel_cap_t new_cap;
91136 int err, i;
91137diff --git a/kernel/kprobes.c b/kernel/kprobes.c
91138index c90e417..e6c515d 100644
91139--- a/kernel/kprobes.c
91140+++ b/kernel/kprobes.c
91141@@ -31,6 +31,9 @@
91142 * <jkenisto@us.ibm.com> and Prasanna S Panchamukhi
91143 * <prasanna@in.ibm.com> added function-return probes.
91144 */
91145+#ifdef CONFIG_GRKERNSEC_HIDESYM
91146+#define __INCLUDED_BY_HIDESYM 1
91147+#endif
91148 #include <linux/kprobes.h>
91149 #include <linux/hash.h>
91150 #include <linux/init.h>
91151@@ -122,12 +125,12 @@ enum kprobe_slot_state {
91152
91153 static void *alloc_insn_page(void)
91154 {
91155- return module_alloc(PAGE_SIZE);
91156+ return module_alloc_exec(PAGE_SIZE);
91157 }
91158
91159 static void free_insn_page(void *page)
91160 {
91161- module_memfree(page);
91162+ module_memfree_exec(page);
91163 }
91164
91165 struct kprobe_insn_cache kprobe_insn_slots = {
91166@@ -2198,11 +2201,11 @@ static void report_probe(struct seq_file *pi, struct kprobe *p,
91167 kprobe_type = "k";
91168
91169 if (sym)
91170- seq_printf(pi, "%p %s %s+0x%x %s ",
91171+ seq_printf(pi, "%pK %s %s+0x%x %s ",
91172 p->addr, kprobe_type, sym, offset,
91173 (modname ? modname : " "));
91174 else
91175- seq_printf(pi, "%p %s %p ",
91176+ seq_printf(pi, "%pK %s %pK ",
91177 p->addr, kprobe_type, p->addr);
91178
91179 if (!pp)
91180diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
91181index 6683cce..daf8999 100644
91182--- a/kernel/ksysfs.c
91183+++ b/kernel/ksysfs.c
91184@@ -50,6 +50,8 @@ static ssize_t uevent_helper_store(struct kobject *kobj,
91185 {
91186 if (count+1 > UEVENT_HELPER_PATH_LEN)
91187 return -ENOENT;
91188+ if (!capable(CAP_SYS_ADMIN))
91189+ return -EPERM;
91190 memcpy(uevent_helper, buf, count);
91191 uevent_helper[count] = '\0';
91192 if (count && uevent_helper[count-1] == '\n')
91193@@ -176,7 +178,7 @@ static ssize_t notes_read(struct file *filp, struct kobject *kobj,
91194 return count;
91195 }
91196
91197-static struct bin_attribute notes_attr = {
91198+static bin_attribute_no_const notes_attr __read_only = {
91199 .attr = {
91200 .name = "notes",
91201 .mode = S_IRUGO,
91202diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
91203index ba77ab5..d6a3e20 100644
91204--- a/kernel/locking/lockdep.c
91205+++ b/kernel/locking/lockdep.c
91206@@ -599,6 +599,10 @@ static int static_obj(void *obj)
91207 end = (unsigned long) &_end,
91208 addr = (unsigned long) obj;
91209
91210+#ifdef CONFIG_PAX_KERNEXEC
91211+ start = ktla_ktva(start);
91212+#endif
91213+
91214 /*
91215 * static variable?
91216 */
91217@@ -743,6 +747,7 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
91218 if (!static_obj(lock->key)) {
91219 debug_locks_off();
91220 printk("INFO: trying to register non-static key.\n");
91221+ printk("lock:%pS key:%pS.\n", lock, lock->key);
91222 printk("the code is fine but needs lockdep annotation.\n");
91223 printk("turning off the locking correctness validator.\n");
91224 dump_stack();
91225@@ -3088,7 +3093,7 @@ static int __lock_acquire(struct lockdep_map *lock, unsigned int subclass,
91226 if (!class)
91227 return 0;
91228 }
91229- atomic_inc((atomic_t *)&class->ops);
91230+ atomic_long_inc_unchecked((atomic_long_unchecked_t *)&class->ops);
91231 if (very_verbose(class)) {
91232 printk("\nacquire class [%p] %s", class->key, class->name);
91233 if (class->name_version > 1)
91234diff --git a/kernel/locking/lockdep_proc.c b/kernel/locking/lockdep_proc.c
91235index ef43ac4..2720dfa 100644
91236--- a/kernel/locking/lockdep_proc.c
91237+++ b/kernel/locking/lockdep_proc.c
91238@@ -65,7 +65,7 @@ static int l_show(struct seq_file *m, void *v)
91239 return 0;
91240 }
91241
91242- seq_printf(m, "%p", class->key);
91243+ seq_printf(m, "%pK", class->key);
91244 #ifdef CONFIG_DEBUG_LOCKDEP
91245 seq_printf(m, " OPS:%8ld", class->ops);
91246 #endif
91247@@ -83,7 +83,7 @@ static int l_show(struct seq_file *m, void *v)
91248
91249 list_for_each_entry(entry, &class->locks_after, entry) {
91250 if (entry->distance == 1) {
91251- seq_printf(m, " -> [%p] ", entry->class->key);
91252+ seq_printf(m, " -> [%pK] ", entry->class->key);
91253 print_name(m, entry->class);
91254 seq_puts(m, "\n");
91255 }
91256@@ -152,7 +152,7 @@ static int lc_show(struct seq_file *m, void *v)
91257 if (!class->key)
91258 continue;
91259
91260- seq_printf(m, "[%p] ", class->key);
91261+ seq_printf(m, "[%pK] ", class->key);
91262 print_name(m, class);
91263 seq_puts(m, "\n");
91264 }
91265@@ -496,7 +496,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
91266 if (!i)
91267 seq_line(m, '-', 40-namelen, namelen);
91268
91269- snprintf(ip, sizeof(ip), "[<%p>]",
91270+ snprintf(ip, sizeof(ip), "[<%pK>]",
91271 (void *)class->contention_point[i]);
91272 seq_printf(m, "%40s %14lu %29s %pS\n",
91273 name, stats->contention_point[i],
91274@@ -511,7 +511,7 @@ static void seq_stats(struct seq_file *m, struct lock_stat_data *data)
91275 if (!i)
91276 seq_line(m, '-', 40-namelen, namelen);
91277
91278- snprintf(ip, sizeof(ip), "[<%p>]",
91279+ snprintf(ip, sizeof(ip), "[<%pK>]",
91280 (void *)class->contending_point[i]);
91281 seq_printf(m, "%40s %14lu %29s %pS\n",
91282 name, stats->contending_point[i],
91283diff --git a/kernel/locking/mcs_spinlock.h b/kernel/locking/mcs_spinlock.h
91284index d1fe2ba..180cd65e 100644
91285--- a/kernel/locking/mcs_spinlock.h
91286+++ b/kernel/locking/mcs_spinlock.h
91287@@ -78,7 +78,7 @@ void mcs_spin_lock(struct mcs_spinlock **lock, struct mcs_spinlock *node)
91288 */
91289 return;
91290 }
91291- ACCESS_ONCE(prev->next) = node;
91292+ ACCESS_ONCE_RW(prev->next) = node;
91293
91294 /* Wait until the lock holder passes the lock down. */
91295 arch_mcs_spin_lock_contended(&node->locked);
91296diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c
91297index 3ef3736..9c951fa 100644
91298--- a/kernel/locking/mutex-debug.c
91299+++ b/kernel/locking/mutex-debug.c
91300@@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter)
91301 }
91302
91303 void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter,
91304- struct thread_info *ti)
91305+ struct task_struct *task)
91306 {
91307 SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock));
91308
91309 /* Mark the current thread as blocked on the lock: */
91310- ti->task->blocked_on = waiter;
91311+ task->blocked_on = waiter;
91312 }
91313
91314 void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
91315- struct thread_info *ti)
91316+ struct task_struct *task)
91317 {
91318 DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list));
91319- DEBUG_LOCKS_WARN_ON(waiter->task != ti->task);
91320- DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter);
91321- ti->task->blocked_on = NULL;
91322+ DEBUG_LOCKS_WARN_ON(waiter->task != task);
91323+ DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter);
91324+ task->blocked_on = NULL;
91325
91326 list_del_init(&waiter->list);
91327 waiter->task = NULL;
91328diff --git a/kernel/locking/mutex-debug.h b/kernel/locking/mutex-debug.h
91329index 0799fd3..d06ae3b 100644
91330--- a/kernel/locking/mutex-debug.h
91331+++ b/kernel/locking/mutex-debug.h
91332@@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(struct mutex *lock,
91333 extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
91334 extern void debug_mutex_add_waiter(struct mutex *lock,
91335 struct mutex_waiter *waiter,
91336- struct thread_info *ti);
91337+ struct task_struct *task);
91338 extern void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter,
91339- struct thread_info *ti);
91340+ struct task_struct *task);
91341 extern void debug_mutex_unlock(struct mutex *lock);
91342 extern void debug_mutex_init(struct mutex *lock, const char *name,
91343 struct lock_class_key *key);
91344diff --git a/kernel/locking/mutex.c b/kernel/locking/mutex.c
91345index 94674e5..de4966f 100644
91346--- a/kernel/locking/mutex.c
91347+++ b/kernel/locking/mutex.c
91348@@ -542,7 +542,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
91349 goto skip_wait;
91350
91351 debug_mutex_lock_common(lock, &waiter);
91352- debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
91353+ debug_mutex_add_waiter(lock, &waiter, task);
91354
91355 /* add waiting tasks to the end of the waitqueue (FIFO): */
91356 list_add_tail(&waiter.list, &lock->wait_list);
91357@@ -589,7 +589,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass,
91358 }
91359 __set_task_state(task, TASK_RUNNING);
91360
91361- mutex_remove_waiter(lock, &waiter, current_thread_info());
91362+ mutex_remove_waiter(lock, &waiter, task);
91363 /* set it to 0 if there are no waiters left: */
91364 if (likely(list_empty(&lock->wait_list)))
91365 atomic_set(&lock->count, 0);
91366@@ -610,7 +610,7 @@ skip_wait:
91367 return 0;
91368
91369 err:
91370- mutex_remove_waiter(lock, &waiter, task_thread_info(task));
91371+ mutex_remove_waiter(lock, &waiter, task);
91372 spin_unlock_mutex(&lock->wait_lock, flags);
91373 debug_mutex_free_waiter(&waiter);
91374 mutex_release(&lock->dep_map, 1, ip);
91375diff --git a/kernel/locking/osq_lock.c b/kernel/locking/osq_lock.c
91376index c112d00..1946ad9 100644
91377--- a/kernel/locking/osq_lock.c
91378+++ b/kernel/locking/osq_lock.c
91379@@ -98,7 +98,7 @@ bool osq_lock(struct optimistic_spin_queue *lock)
91380
91381 prev = decode_cpu(old);
91382 node->prev = prev;
91383- ACCESS_ONCE(prev->next) = node;
91384+ ACCESS_ONCE_RW(prev->next) = node;
91385
91386 /*
91387 * Normally @prev is untouchable after the above store; because at that
91388@@ -170,8 +170,8 @@ unqueue:
91389 * it will wait in Step-A.
91390 */
91391
91392- ACCESS_ONCE(next->prev) = prev;
91393- ACCESS_ONCE(prev->next) = next;
91394+ ACCESS_ONCE_RW(next->prev) = prev;
91395+ ACCESS_ONCE_RW(prev->next) = next;
91396
91397 return false;
91398 }
91399@@ -193,11 +193,11 @@ void osq_unlock(struct optimistic_spin_queue *lock)
91400 node = this_cpu_ptr(&osq_node);
91401 next = xchg(&node->next, NULL);
91402 if (next) {
91403- ACCESS_ONCE(next->locked) = 1;
91404+ ACCESS_ONCE_RW(next->locked) = 1;
91405 return;
91406 }
91407
91408 next = osq_wait_next(lock, node, NULL);
91409 if (next)
91410- ACCESS_ONCE(next->locked) = 1;
91411+ ACCESS_ONCE_RW(next->locked) = 1;
91412 }
91413diff --git a/kernel/locking/rtmutex-tester.c b/kernel/locking/rtmutex-tester.c
91414index 1d96dd0..994ff19 100644
91415--- a/kernel/locking/rtmutex-tester.c
91416+++ b/kernel/locking/rtmutex-tester.c
91417@@ -22,7 +22,7 @@
91418 #define MAX_RT_TEST_MUTEXES 8
91419
91420 static spinlock_t rttest_lock;
91421-static atomic_t rttest_event;
91422+static atomic_unchecked_t rttest_event;
91423
91424 struct test_thread_data {
91425 int opcode;
91426@@ -63,7 +63,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
91427
91428 case RTTEST_LOCKCONT:
91429 td->mutexes[td->opdata] = 1;
91430- td->event = atomic_add_return(1, &rttest_event);
91431+ td->event = atomic_add_return_unchecked(1, &rttest_event);
91432 return 0;
91433
91434 case RTTEST_RESET:
91435@@ -76,7 +76,7 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
91436 return 0;
91437
91438 case RTTEST_RESETEVENT:
91439- atomic_set(&rttest_event, 0);
91440+ atomic_set_unchecked(&rttest_event, 0);
91441 return 0;
91442
91443 default:
91444@@ -93,9 +93,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
91445 return ret;
91446
91447 td->mutexes[id] = 1;
91448- td->event = atomic_add_return(1, &rttest_event);
91449+ td->event = atomic_add_return_unchecked(1, &rttest_event);
91450 rt_mutex_lock(&mutexes[id]);
91451- td->event = atomic_add_return(1, &rttest_event);
91452+ td->event = atomic_add_return_unchecked(1, &rttest_event);
91453 td->mutexes[id] = 4;
91454 return 0;
91455
91456@@ -106,9 +106,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
91457 return ret;
91458
91459 td->mutexes[id] = 1;
91460- td->event = atomic_add_return(1, &rttest_event);
91461+ td->event = atomic_add_return_unchecked(1, &rttest_event);
91462 ret = rt_mutex_lock_interruptible(&mutexes[id], 0);
91463- td->event = atomic_add_return(1, &rttest_event);
91464+ td->event = atomic_add_return_unchecked(1, &rttest_event);
91465 td->mutexes[id] = ret ? 0 : 4;
91466 return ret ? -EINTR : 0;
91467
91468@@ -117,9 +117,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
91469 if (id < 0 || id >= MAX_RT_TEST_MUTEXES || td->mutexes[id] != 4)
91470 return ret;
91471
91472- td->event = atomic_add_return(1, &rttest_event);
91473+ td->event = atomic_add_return_unchecked(1, &rttest_event);
91474 rt_mutex_unlock(&mutexes[id]);
91475- td->event = atomic_add_return(1, &rttest_event);
91476+ td->event = atomic_add_return_unchecked(1, &rttest_event);
91477 td->mutexes[id] = 0;
91478 return 0;
91479
91480@@ -166,7 +166,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
91481 break;
91482
91483 td->mutexes[dat] = 2;
91484- td->event = atomic_add_return(1, &rttest_event);
91485+ td->event = atomic_add_return_unchecked(1, &rttest_event);
91486 break;
91487
91488 default:
91489@@ -186,7 +186,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
91490 return;
91491
91492 td->mutexes[dat] = 3;
91493- td->event = atomic_add_return(1, &rttest_event);
91494+ td->event = atomic_add_return_unchecked(1, &rttest_event);
91495 break;
91496
91497 case RTTEST_LOCKNOWAIT:
91498@@ -198,7 +198,7 @@ void schedule_rt_mutex_test(struct rt_mutex *mutex)
91499 return;
91500
91501 td->mutexes[dat] = 1;
91502- td->event = atomic_add_return(1, &rttest_event);
91503+ td->event = atomic_add_return_unchecked(1, &rttest_event);
91504 return;
91505
91506 default:
91507diff --git a/kernel/module.c b/kernel/module.c
91508index ec53f59..67d9655 100644
91509--- a/kernel/module.c
91510+++ b/kernel/module.c
91511@@ -59,6 +59,7 @@
91512 #include <linux/jump_label.h>
91513 #include <linux/pfn.h>
91514 #include <linux/bsearch.h>
91515+#include <linux/grsecurity.h>
91516 #include <uapi/linux/module.h>
91517 #include "module-internal.h"
91518
91519@@ -155,7 +156,8 @@ static BLOCKING_NOTIFIER_HEAD(module_notify_list);
91520
91521 /* Bounds of module allocation, for speeding __module_address.
91522 * Protected by module_mutex. */
91523-static unsigned long module_addr_min = -1UL, module_addr_max = 0;
91524+static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0;
91525+static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0;
91526
91527 int register_module_notifier(struct notifier_block *nb)
91528 {
91529@@ -322,7 +324,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
91530 return true;
91531
91532 list_for_each_entry_rcu(mod, &modules, list) {
91533- struct symsearch arr[] = {
91534+ struct symsearch modarr[] = {
91535 { mod->syms, mod->syms + mod->num_syms, mod->crcs,
91536 NOT_GPL_ONLY, false },
91537 { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms,
91538@@ -347,7 +349,7 @@ bool each_symbol_section(bool (*fn)(const struct symsearch *arr,
91539 if (mod->state == MODULE_STATE_UNFORMED)
91540 continue;
91541
91542- if (each_symbol_in_section(arr, ARRAY_SIZE(arr), mod, fn, data))
91543+ if (each_symbol_in_section(modarr, ARRAY_SIZE(modarr), mod, fn, data))
91544 return true;
91545 }
91546 return false;
91547@@ -487,7 +489,7 @@ static int percpu_modalloc(struct module *mod, struct load_info *info)
91548 if (!pcpusec->sh_size)
91549 return 0;
91550
91551- if (align > PAGE_SIZE) {
91552+ if (align-1 >= PAGE_SIZE) {
91553 pr_warn("%s: per-cpu alignment %li > %li\n",
91554 mod->name, align, PAGE_SIZE);
91555 align = PAGE_SIZE;
91556@@ -1053,7 +1055,7 @@ struct module_attribute module_uevent =
91557 static ssize_t show_coresize(struct module_attribute *mattr,
91558 struct module_kobject *mk, char *buffer)
91559 {
91560- return sprintf(buffer, "%u\n", mk->mod->core_size);
91561+ return sprintf(buffer, "%u\n", mk->mod->core_size_rx + mk->mod->core_size_rw);
91562 }
91563
91564 static struct module_attribute modinfo_coresize =
91565@@ -1062,7 +1064,7 @@ static struct module_attribute modinfo_coresize =
91566 static ssize_t show_initsize(struct module_attribute *mattr,
91567 struct module_kobject *mk, char *buffer)
91568 {
91569- return sprintf(buffer, "%u\n", mk->mod->init_size);
91570+ return sprintf(buffer, "%u\n", mk->mod->init_size_rx + mk->mod->init_size_rw);
91571 }
91572
91573 static struct module_attribute modinfo_initsize =
91574@@ -1154,12 +1156,29 @@ static int check_version(Elf_Shdr *sechdrs,
91575 goto bad_version;
91576 }
91577
91578+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
91579+ /*
91580+ * avoid potentially printing jibberish on attempted load
91581+ * of a module randomized with a different seed
91582+ */
91583+ pr_warn("no symbol version for %s\n", symname);
91584+#else
91585 pr_warn("%s: no symbol version for %s\n", mod->name, symname);
91586+#endif
91587 return 0;
91588
91589 bad_version:
91590+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
91591+ /*
91592+ * avoid potentially printing jibberish on attempted load
91593+ * of a module randomized with a different seed
91594+ */
91595+ pr_warn("attempted module disagrees about version of symbol %s\n",
91596+ symname);
91597+#else
91598 pr_warn("%s: disagrees about version of symbol %s\n",
91599 mod->name, symname);
91600+#endif
91601 return 0;
91602 }
91603
91604@@ -1281,7 +1300,7 @@ resolve_symbol_wait(struct module *mod,
91605 */
91606 #ifdef CONFIG_SYSFS
91607
91608-#ifdef CONFIG_KALLSYMS
91609+#if defined(CONFIG_KALLSYMS) && !defined(CONFIG_GRKERNSEC_HIDESYM)
91610 static inline bool sect_empty(const Elf_Shdr *sect)
91611 {
91612 return !(sect->sh_flags & SHF_ALLOC) || sect->sh_size == 0;
91613@@ -1419,7 +1438,7 @@ static void add_notes_attrs(struct module *mod, const struct load_info *info)
91614 {
91615 unsigned int notes, loaded, i;
91616 struct module_notes_attrs *notes_attrs;
91617- struct bin_attribute *nattr;
91618+ bin_attribute_no_const *nattr;
91619
91620 /* failed to create section attributes, so can't create notes */
91621 if (!mod->sect_attrs)
91622@@ -1531,7 +1550,7 @@ static void del_usage_links(struct module *mod)
91623 static int module_add_modinfo_attrs(struct module *mod)
91624 {
91625 struct module_attribute *attr;
91626- struct module_attribute *temp_attr;
91627+ module_attribute_no_const *temp_attr;
91628 int error = 0;
91629 int i;
91630
91631@@ -1741,21 +1760,21 @@ static void set_section_ro_nx(void *base,
91632
91633 static void unset_module_core_ro_nx(struct module *mod)
91634 {
91635- set_page_attributes(mod->module_core + mod->core_text_size,
91636- mod->module_core + mod->core_size,
91637+ set_page_attributes(mod->module_core_rw,
91638+ mod->module_core_rw + mod->core_size_rw,
91639 set_memory_x);
91640- set_page_attributes(mod->module_core,
91641- mod->module_core + mod->core_ro_size,
91642+ set_page_attributes(mod->module_core_rx,
91643+ mod->module_core_rx + mod->core_size_rx,
91644 set_memory_rw);
91645 }
91646
91647 static void unset_module_init_ro_nx(struct module *mod)
91648 {
91649- set_page_attributes(mod->module_init + mod->init_text_size,
91650- mod->module_init + mod->init_size,
91651+ set_page_attributes(mod->module_init_rw,
91652+ mod->module_init_rw + mod->init_size_rw,
91653 set_memory_x);
91654- set_page_attributes(mod->module_init,
91655- mod->module_init + mod->init_ro_size,
91656+ set_page_attributes(mod->module_init_rx,
91657+ mod->module_init_rx + mod->init_size_rx,
91658 set_memory_rw);
91659 }
91660
91661@@ -1768,14 +1787,14 @@ void set_all_modules_text_rw(void)
91662 list_for_each_entry_rcu(mod, &modules, list) {
91663 if (mod->state == MODULE_STATE_UNFORMED)
91664 continue;
91665- if ((mod->module_core) && (mod->core_text_size)) {
91666- set_page_attributes(mod->module_core,
91667- mod->module_core + mod->core_text_size,
91668+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
91669+ set_page_attributes(mod->module_core_rx,
91670+ mod->module_core_rx + mod->core_size_rx,
91671 set_memory_rw);
91672 }
91673- if ((mod->module_init) && (mod->init_text_size)) {
91674- set_page_attributes(mod->module_init,
91675- mod->module_init + mod->init_text_size,
91676+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
91677+ set_page_attributes(mod->module_init_rx,
91678+ mod->module_init_rx + mod->init_size_rx,
91679 set_memory_rw);
91680 }
91681 }
91682@@ -1791,14 +1810,14 @@ void set_all_modules_text_ro(void)
91683 list_for_each_entry_rcu(mod, &modules, list) {
91684 if (mod->state == MODULE_STATE_UNFORMED)
91685 continue;
91686- if ((mod->module_core) && (mod->core_text_size)) {
91687- set_page_attributes(mod->module_core,
91688- mod->module_core + mod->core_text_size,
91689+ if ((mod->module_core_rx) && (mod->core_size_rx)) {
91690+ set_page_attributes(mod->module_core_rx,
91691+ mod->module_core_rx + mod->core_size_rx,
91692 set_memory_ro);
91693 }
91694- if ((mod->module_init) && (mod->init_text_size)) {
91695- set_page_attributes(mod->module_init,
91696- mod->module_init + mod->init_text_size,
91697+ if ((mod->module_init_rx) && (mod->init_size_rx)) {
91698+ set_page_attributes(mod->module_init_rx,
91699+ mod->module_init_rx + mod->init_size_rx,
91700 set_memory_ro);
91701 }
91702 }
91703@@ -1807,7 +1826,15 @@ void set_all_modules_text_ro(void)
91704 #else
91705 static inline void set_section_ro_nx(void *base, unsigned long text_size, unsigned long ro_size, unsigned long total_size) { }
91706 static void unset_module_core_ro_nx(struct module *mod) { }
91707-static void unset_module_init_ro_nx(struct module *mod) { }
91708+static void unset_module_init_ro_nx(struct module *mod)
91709+{
91710+
91711+#ifdef CONFIG_PAX_KERNEXEC
91712+ set_memory_nx((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
91713+ set_memory_rw((unsigned long)mod->module_init_rx, PFN_UP(mod->init_size_rx));
91714+#endif
91715+
91716+}
91717 #endif
91718
91719 void __weak module_memfree(void *module_region)
91720@@ -1861,16 +1888,19 @@ static void free_module(struct module *mod)
91721 /* This may be NULL, but that's OK */
91722 unset_module_init_ro_nx(mod);
91723 module_arch_freeing_init(mod);
91724- module_memfree(mod->module_init);
91725+ module_memfree(mod->module_init_rw);
91726+ module_memfree_exec(mod->module_init_rx);
91727 kfree(mod->args);
91728 percpu_modfree(mod);
91729
91730 /* Free lock-classes; relies on the preceding sync_rcu(). */
91731- lockdep_free_key_range(mod->module_core, mod->core_size);
91732+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
91733+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
91734
91735 /* Finally, free the core (containing the module structure) */
91736 unset_module_core_ro_nx(mod);
91737- module_memfree(mod->module_core);
91738+ module_memfree_exec(mod->module_core_rx);
91739+ module_memfree(mod->module_core_rw);
91740
91741 #ifdef CONFIG_MPU
91742 update_protections(current->mm);
91743@@ -1939,9 +1969,31 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
91744 int ret = 0;
91745 const struct kernel_symbol *ksym;
91746
91747+#ifdef CONFIG_GRKERNSEC_MODHARDEN
91748+ int is_fs_load = 0;
91749+ int register_filesystem_found = 0;
91750+ char *p;
91751+
91752+ p = strstr(mod->args, "grsec_modharden_fs");
91753+ if (p) {
91754+ char *endptr = p + sizeof("grsec_modharden_fs") - 1;
91755+ /* copy \0 as well */
91756+ memmove(p, endptr, strlen(mod->args) - (unsigned int)(endptr - mod->args) + 1);
91757+ is_fs_load = 1;
91758+ }
91759+#endif
91760+
91761 for (i = 1; i < symsec->sh_size / sizeof(Elf_Sym); i++) {
91762 const char *name = info->strtab + sym[i].st_name;
91763
91764+#ifdef CONFIG_GRKERNSEC_MODHARDEN
91765+ /* it's a real shame this will never get ripped and copied
91766+ upstream! ;(
91767+ */
91768+ if (is_fs_load && !strcmp(name, "register_filesystem"))
91769+ register_filesystem_found = 1;
91770+#endif
91771+
91772 switch (sym[i].st_shndx) {
91773 case SHN_COMMON:
91774 /* Ignore common symbols */
91775@@ -1966,7 +2018,9 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
91776 ksym = resolve_symbol_wait(mod, info, name);
91777 /* Ok if resolved. */
91778 if (ksym && !IS_ERR(ksym)) {
91779+ pax_open_kernel();
91780 sym[i].st_value = ksym->value;
91781+ pax_close_kernel();
91782 break;
91783 }
91784
91785@@ -1985,11 +2039,20 @@ static int simplify_symbols(struct module *mod, const struct load_info *info)
91786 secbase = (unsigned long)mod_percpu(mod);
91787 else
91788 secbase = info->sechdrs[sym[i].st_shndx].sh_addr;
91789+ pax_open_kernel();
91790 sym[i].st_value += secbase;
91791+ pax_close_kernel();
91792 break;
91793 }
91794 }
91795
91796+#ifdef CONFIG_GRKERNSEC_MODHARDEN
91797+ if (is_fs_load && !register_filesystem_found) {
91798+ printk(KERN_ALERT "grsec: Denied attempt to load non-fs module %.64s through mount\n", mod->name);
91799+ ret = -EPERM;
91800+ }
91801+#endif
91802+
91803 return ret;
91804 }
91805
91806@@ -2073,22 +2136,12 @@ static void layout_sections(struct module *mod, struct load_info *info)
91807 || s->sh_entsize != ~0UL
91808 || strstarts(sname, ".init"))
91809 continue;
91810- s->sh_entsize = get_offset(mod, &mod->core_size, s, i);
91811+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
91812+ s->sh_entsize = get_offset(mod, &mod->core_size_rw, s, i);
91813+ else
91814+ s->sh_entsize = get_offset(mod, &mod->core_size_rx, s, i);
91815 pr_debug("\t%s\n", sname);
91816 }
91817- switch (m) {
91818- case 0: /* executable */
91819- mod->core_size = debug_align(mod->core_size);
91820- mod->core_text_size = mod->core_size;
91821- break;
91822- case 1: /* RO: text and ro-data */
91823- mod->core_size = debug_align(mod->core_size);
91824- mod->core_ro_size = mod->core_size;
91825- break;
91826- case 3: /* whole core */
91827- mod->core_size = debug_align(mod->core_size);
91828- break;
91829- }
91830 }
91831
91832 pr_debug("Init section allocation order:\n");
91833@@ -2102,23 +2155,13 @@ static void layout_sections(struct module *mod, struct load_info *info)
91834 || s->sh_entsize != ~0UL
91835 || !strstarts(sname, ".init"))
91836 continue;
91837- s->sh_entsize = (get_offset(mod, &mod->init_size, s, i)
91838- | INIT_OFFSET_MASK);
91839+ if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC))
91840+ s->sh_entsize = get_offset(mod, &mod->init_size_rw, s, i);
91841+ else
91842+ s->sh_entsize = get_offset(mod, &mod->init_size_rx, s, i);
91843+ s->sh_entsize |= INIT_OFFSET_MASK;
91844 pr_debug("\t%s\n", sname);
91845 }
91846- switch (m) {
91847- case 0: /* executable */
91848- mod->init_size = debug_align(mod->init_size);
91849- mod->init_text_size = mod->init_size;
91850- break;
91851- case 1: /* RO: text and ro-data */
91852- mod->init_size = debug_align(mod->init_size);
91853- mod->init_ro_size = mod->init_size;
91854- break;
91855- case 3: /* whole init */
91856- mod->init_size = debug_align(mod->init_size);
91857- break;
91858- }
91859 }
91860 }
91861
91862@@ -2291,7 +2334,7 @@ static void layout_symtab(struct module *mod, struct load_info *info)
91863
91864 /* Put symbol section at end of init part of module. */
91865 symsect->sh_flags |= SHF_ALLOC;
91866- symsect->sh_entsize = get_offset(mod, &mod->init_size, symsect,
91867+ symsect->sh_entsize = get_offset(mod, &mod->init_size_rx, symsect,
91868 info->index.sym) | INIT_OFFSET_MASK;
91869 pr_debug("\t%s\n", info->secstrings + symsect->sh_name);
91870
91871@@ -2308,16 +2351,16 @@ static void layout_symtab(struct module *mod, struct load_info *info)
91872 }
91873
91874 /* Append room for core symbols at end of core part. */
91875- info->symoffs = ALIGN(mod->core_size, symsect->sh_addralign ?: 1);
91876- info->stroffs = mod->core_size = info->symoffs + ndst * sizeof(Elf_Sym);
91877- mod->core_size += strtab_size;
91878- mod->core_size = debug_align(mod->core_size);
91879+ info->symoffs = ALIGN(mod->core_size_rx, symsect->sh_addralign ?: 1);
91880+ info->stroffs = mod->core_size_rx = info->symoffs + ndst * sizeof(Elf_Sym);
91881+ mod->core_size_rx += strtab_size;
91882+ mod->core_size_rx = debug_align(mod->core_size_rx);
91883
91884 /* Put string table section at end of init part of module. */
91885 strsect->sh_flags |= SHF_ALLOC;
91886- strsect->sh_entsize = get_offset(mod, &mod->init_size, strsect,
91887+ strsect->sh_entsize = get_offset(mod, &mod->init_size_rx, strsect,
91888 info->index.str) | INIT_OFFSET_MASK;
91889- mod->init_size = debug_align(mod->init_size);
91890+ mod->init_size_rx = debug_align(mod->init_size_rx);
91891 pr_debug("\t%s\n", info->secstrings + strsect->sh_name);
91892 }
91893
91894@@ -2334,12 +2377,14 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
91895 /* Make sure we get permanent strtab: don't use info->strtab. */
91896 mod->strtab = (void *)info->sechdrs[info->index.str].sh_addr;
91897
91898+ pax_open_kernel();
91899+
91900 /* Set types up while we still have access to sections. */
91901 for (i = 0; i < mod->num_symtab; i++)
91902 mod->symtab[i].st_info = elf_type(&mod->symtab[i], info);
91903
91904- mod->core_symtab = dst = mod->module_core + info->symoffs;
91905- mod->core_strtab = s = mod->module_core + info->stroffs;
91906+ mod->core_symtab = dst = mod->module_core_rx + info->symoffs;
91907+ mod->core_strtab = s = mod->module_core_rx + info->stroffs;
91908 src = mod->symtab;
91909 for (ndst = i = 0; i < mod->num_symtab; i++) {
91910 if (i == 0 ||
91911@@ -2351,6 +2396,8 @@ static void add_kallsyms(struct module *mod, const struct load_info *info)
91912 }
91913 }
91914 mod->core_num_syms = ndst;
91915+
91916+ pax_close_kernel();
91917 }
91918 #else
91919 static inline void layout_symtab(struct module *mod, struct load_info *info)
91920@@ -2384,17 +2431,33 @@ void * __weak module_alloc(unsigned long size)
91921 return vmalloc_exec(size);
91922 }
91923
91924-static void *module_alloc_update_bounds(unsigned long size)
91925+static void *module_alloc_update_bounds_rw(unsigned long size)
91926 {
91927 void *ret = module_alloc(size);
91928
91929 if (ret) {
91930 mutex_lock(&module_mutex);
91931 /* Update module bounds. */
91932- if ((unsigned long)ret < module_addr_min)
91933- module_addr_min = (unsigned long)ret;
91934- if ((unsigned long)ret + size > module_addr_max)
91935- module_addr_max = (unsigned long)ret + size;
91936+ if ((unsigned long)ret < module_addr_min_rw)
91937+ module_addr_min_rw = (unsigned long)ret;
91938+ if ((unsigned long)ret + size > module_addr_max_rw)
91939+ module_addr_max_rw = (unsigned long)ret + size;
91940+ mutex_unlock(&module_mutex);
91941+ }
91942+ return ret;
91943+}
91944+
91945+static void *module_alloc_update_bounds_rx(unsigned long size)
91946+{
91947+ void *ret = module_alloc_exec(size);
91948+
91949+ if (ret) {
91950+ mutex_lock(&module_mutex);
91951+ /* Update module bounds. */
91952+ if ((unsigned long)ret < module_addr_min_rx)
91953+ module_addr_min_rx = (unsigned long)ret;
91954+ if ((unsigned long)ret + size > module_addr_max_rx)
91955+ module_addr_max_rx = (unsigned long)ret + size;
91956 mutex_unlock(&module_mutex);
91957 }
91958 return ret;
91959@@ -2665,7 +2728,15 @@ static struct module *setup_load_info(struct load_info *info, int flags)
91960 mod = (void *)info->sechdrs[info->index.mod].sh_addr;
91961
91962 if (info->index.sym == 0) {
91963+#ifdef CONFIG_GRKERNSEC_RANDSTRUCT
91964+ /*
91965+ * avoid potentially printing jibberish on attempted load
91966+ * of a module randomized with a different seed
91967+ */
91968+ pr_warn("module has no symbols (stripped?)\n");
91969+#else
91970 pr_warn("%s: module has no symbols (stripped?)\n", mod->name);
91971+#endif
91972 return ERR_PTR(-ENOEXEC);
91973 }
91974
91975@@ -2681,8 +2752,14 @@ static struct module *setup_load_info(struct load_info *info, int flags)
91976 static int check_modinfo(struct module *mod, struct load_info *info, int flags)
91977 {
91978 const char *modmagic = get_modinfo(info, "vermagic");
91979+ const char *license = get_modinfo(info, "license");
91980 int err;
91981
91982+#ifdef CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_OR
91983+ if (!license || !license_is_gpl_compatible(license))
91984+ return -ENOEXEC;
91985+#endif
91986+
91987 if (flags & MODULE_INIT_IGNORE_VERMAGIC)
91988 modmagic = NULL;
91989
91990@@ -2707,7 +2784,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags)
91991 }
91992
91993 /* Set up license info based on the info section */
91994- set_license(mod, get_modinfo(info, "license"));
91995+ set_license(mod, license);
91996
91997 return 0;
91998 }
91999@@ -2801,7 +2878,7 @@ static int move_module(struct module *mod, struct load_info *info)
92000 void *ptr;
92001
92002 /* Do the allocs. */
92003- ptr = module_alloc_update_bounds(mod->core_size);
92004+ ptr = module_alloc_update_bounds_rw(mod->core_size_rw);
92005 /*
92006 * The pointer to this block is stored in the module structure
92007 * which is inside the block. Just mark it as not being a
92008@@ -2811,11 +2888,11 @@ static int move_module(struct module *mod, struct load_info *info)
92009 if (!ptr)
92010 return -ENOMEM;
92011
92012- memset(ptr, 0, mod->core_size);
92013- mod->module_core = ptr;
92014+ memset(ptr, 0, mod->core_size_rw);
92015+ mod->module_core_rw = ptr;
92016
92017- if (mod->init_size) {
92018- ptr = module_alloc_update_bounds(mod->init_size);
92019+ if (mod->init_size_rw) {
92020+ ptr = module_alloc_update_bounds_rw(mod->init_size_rw);
92021 /*
92022 * The pointer to this block is stored in the module structure
92023 * which is inside the block. This block doesn't need to be
92024@@ -2824,13 +2901,45 @@ static int move_module(struct module *mod, struct load_info *info)
92025 */
92026 kmemleak_ignore(ptr);
92027 if (!ptr) {
92028- module_memfree(mod->module_core);
92029+ module_memfree(mod->module_core_rw);
92030 return -ENOMEM;
92031 }
92032- memset(ptr, 0, mod->init_size);
92033- mod->module_init = ptr;
92034+ memset(ptr, 0, mod->init_size_rw);
92035+ mod->module_init_rw = ptr;
92036 } else
92037- mod->module_init = NULL;
92038+ mod->module_init_rw = NULL;
92039+
92040+ ptr = module_alloc_update_bounds_rx(mod->core_size_rx);
92041+ kmemleak_not_leak(ptr);
92042+ if (!ptr) {
92043+ if (mod->module_init_rw)
92044+ module_memfree(mod->module_init_rw);
92045+ module_memfree(mod->module_core_rw);
92046+ return -ENOMEM;
92047+ }
92048+
92049+ pax_open_kernel();
92050+ memset(ptr, 0, mod->core_size_rx);
92051+ pax_close_kernel();
92052+ mod->module_core_rx = ptr;
92053+
92054+ if (mod->init_size_rx) {
92055+ ptr = module_alloc_update_bounds_rx(mod->init_size_rx);
92056+ kmemleak_ignore(ptr);
92057+ if (!ptr && mod->init_size_rx) {
92058+ module_memfree_exec(mod->module_core_rx);
92059+ if (mod->module_init_rw)
92060+ module_memfree(mod->module_init_rw);
92061+ module_memfree(mod->module_core_rw);
92062+ return -ENOMEM;
92063+ }
92064+
92065+ pax_open_kernel();
92066+ memset(ptr, 0, mod->init_size_rx);
92067+ pax_close_kernel();
92068+ mod->module_init_rx = ptr;
92069+ } else
92070+ mod->module_init_rx = NULL;
92071
92072 /* Transfer each section which specifies SHF_ALLOC */
92073 pr_debug("final section addresses:\n");
92074@@ -2841,16 +2950,45 @@ static int move_module(struct module *mod, struct load_info *info)
92075 if (!(shdr->sh_flags & SHF_ALLOC))
92076 continue;
92077
92078- if (shdr->sh_entsize & INIT_OFFSET_MASK)
92079- dest = mod->module_init
92080- + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
92081- else
92082- dest = mod->module_core + shdr->sh_entsize;
92083+ if (shdr->sh_entsize & INIT_OFFSET_MASK) {
92084+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
92085+ dest = mod->module_init_rw
92086+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
92087+ else
92088+ dest = mod->module_init_rx
92089+ + (shdr->sh_entsize & ~INIT_OFFSET_MASK);
92090+ } else {
92091+ if ((shdr->sh_flags & SHF_WRITE) || !(shdr->sh_flags & SHF_ALLOC))
92092+ dest = mod->module_core_rw + shdr->sh_entsize;
92093+ else
92094+ dest = mod->module_core_rx + shdr->sh_entsize;
92095+ }
92096+
92097+ if (shdr->sh_type != SHT_NOBITS) {
92098+
92099+#ifdef CONFIG_PAX_KERNEXEC
92100+#ifdef CONFIG_X86_64
92101+ if ((shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_EXECINSTR))
92102+ set_memory_x((unsigned long)dest, (shdr->sh_size + PAGE_SIZE) >> PAGE_SHIFT);
92103+#endif
92104+ if (!(shdr->sh_flags & SHF_WRITE) && (shdr->sh_flags & SHF_ALLOC)) {
92105+ pax_open_kernel();
92106+ memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
92107+ pax_close_kernel();
92108+ } else
92109+#endif
92110
92111- if (shdr->sh_type != SHT_NOBITS)
92112 memcpy(dest, (void *)shdr->sh_addr, shdr->sh_size);
92113+ }
92114 /* Update sh_addr to point to copy in image. */
92115- shdr->sh_addr = (unsigned long)dest;
92116+
92117+#ifdef CONFIG_PAX_KERNEXEC
92118+ if (shdr->sh_flags & SHF_EXECINSTR)
92119+ shdr->sh_addr = ktva_ktla((unsigned long)dest);
92120+ else
92121+#endif
92122+
92123+ shdr->sh_addr = (unsigned long)dest;
92124 pr_debug("\t0x%lx %s\n",
92125 (long)shdr->sh_addr, info->secstrings + shdr->sh_name);
92126 }
92127@@ -2907,12 +3045,12 @@ static void flush_module_icache(const struct module *mod)
92128 * Do it before processing of module parameters, so the module
92129 * can provide parameter accessor functions of its own.
92130 */
92131- if (mod->module_init)
92132- flush_icache_range((unsigned long)mod->module_init,
92133- (unsigned long)mod->module_init
92134- + mod->init_size);
92135- flush_icache_range((unsigned long)mod->module_core,
92136- (unsigned long)mod->module_core + mod->core_size);
92137+ if (mod->module_init_rx)
92138+ flush_icache_range((unsigned long)mod->module_init_rx,
92139+ (unsigned long)mod->module_init_rx
92140+ + mod->init_size_rx);
92141+ flush_icache_range((unsigned long)mod->module_core_rx,
92142+ (unsigned long)mod->module_core_rx + mod->core_size_rx);
92143
92144 set_fs(old_fs);
92145 }
92146@@ -2970,8 +3108,10 @@ static void module_deallocate(struct module *mod, struct load_info *info)
92147 {
92148 percpu_modfree(mod);
92149 module_arch_freeing_init(mod);
92150- module_memfree(mod->module_init);
92151- module_memfree(mod->module_core);
92152+ module_memfree_exec(mod->module_init_rx);
92153+ module_memfree_exec(mod->module_core_rx);
92154+ module_memfree(mod->module_init_rw);
92155+ module_memfree(mod->module_core_rw);
92156 }
92157
92158 int __weak module_finalize(const Elf_Ehdr *hdr,
92159@@ -2984,7 +3124,9 @@ int __weak module_finalize(const Elf_Ehdr *hdr,
92160 static int post_relocation(struct module *mod, const struct load_info *info)
92161 {
92162 /* Sort exception table now relocations are done. */
92163+ pax_open_kernel();
92164 sort_extable(mod->extable, mod->extable + mod->num_exentries);
92165+ pax_close_kernel();
92166
92167 /* Copy relocated percpu area over. */
92168 percpu_modcopy(mod, (void *)info->sechdrs[info->index.pcpu].sh_addr,
92169@@ -3032,13 +3174,15 @@ static void do_mod_ctors(struct module *mod)
92170 /* For freeing module_init on success, in case kallsyms traversing */
92171 struct mod_initfree {
92172 struct rcu_head rcu;
92173- void *module_init;
92174+ void *module_init_rw;
92175+ void *module_init_rx;
92176 };
92177
92178 static void do_free_init(struct rcu_head *head)
92179 {
92180 struct mod_initfree *m = container_of(head, struct mod_initfree, rcu);
92181- module_memfree(m->module_init);
92182+ module_memfree(m->module_init_rw);
92183+ module_memfree_exec(m->module_init_rx);
92184 kfree(m);
92185 }
92186
92187@@ -3058,7 +3202,8 @@ static noinline int do_init_module(struct module *mod)
92188 ret = -ENOMEM;
92189 goto fail;
92190 }
92191- freeinit->module_init = mod->module_init;
92192+ freeinit->module_init_rw = mod->module_init_rw;
92193+ freeinit->module_init_rx = mod->module_init_rx;
92194
92195 /*
92196 * We want to find out whether @mod uses async during init. Clear
92197@@ -3117,10 +3262,10 @@ static noinline int do_init_module(struct module *mod)
92198 #endif
92199 unset_module_init_ro_nx(mod);
92200 module_arch_freeing_init(mod);
92201- mod->module_init = NULL;
92202- mod->init_size = 0;
92203- mod->init_ro_size = 0;
92204- mod->init_text_size = 0;
92205+ mod->module_init_rw = NULL;
92206+ mod->module_init_rx = NULL;
92207+ mod->init_size_rw = 0;
92208+ mod->init_size_rx = 0;
92209 /*
92210 * We want to free module_init, but be aware that kallsyms may be
92211 * walking this with preempt disabled. In all the failure paths,
92212@@ -3208,16 +3353,16 @@ static int complete_formation(struct module *mod, struct load_info *info)
92213 module_bug_finalize(info->hdr, info->sechdrs, mod);
92214
92215 /* Set RO and NX regions for core */
92216- set_section_ro_nx(mod->module_core,
92217- mod->core_text_size,
92218- mod->core_ro_size,
92219- mod->core_size);
92220+ set_section_ro_nx(mod->module_core_rx,
92221+ mod->core_size_rx,
92222+ mod->core_size_rx,
92223+ mod->core_size_rx);
92224
92225 /* Set RO and NX regions for init */
92226- set_section_ro_nx(mod->module_init,
92227- mod->init_text_size,
92228- mod->init_ro_size,
92229- mod->init_size);
92230+ set_section_ro_nx(mod->module_init_rx,
92231+ mod->init_size_rx,
92232+ mod->init_size_rx,
92233+ mod->init_size_rx);
92234
92235 /* Mark state as coming so strong_try_module_get() ignores us,
92236 * but kallsyms etc. can see us. */
92237@@ -3301,9 +3446,38 @@ static int load_module(struct load_info *info, const char __user *uargs,
92238 if (err)
92239 goto free_unload;
92240
92241+ /* Now copy in args */
92242+ mod->args = strndup_user(uargs, ~0UL >> 1);
92243+ if (IS_ERR(mod->args)) {
92244+ err = PTR_ERR(mod->args);
92245+ goto free_unload;
92246+ }
92247+
92248 /* Set up MODINFO_ATTR fields */
92249 setup_modinfo(mod, info);
92250
92251+#ifdef CONFIG_GRKERNSEC_MODHARDEN
92252+ {
92253+ char *p, *p2;
92254+
92255+ if (strstr(mod->args, "grsec_modharden_netdev")) {
92256+ 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);
92257+ err = -EPERM;
92258+ goto free_modinfo;
92259+ } else if ((p = strstr(mod->args, "grsec_modharden_normal"))) {
92260+ p += sizeof("grsec_modharden_normal") - 1;
92261+ p2 = strstr(p, "_");
92262+ if (p2) {
92263+ *p2 = '\0';
92264+ printk(KERN_ALERT "grsec: denied kernel module auto-load of %.64s by uid %.9s\n", mod->name, p);
92265+ *p2 = '_';
92266+ }
92267+ err = -EPERM;
92268+ goto free_modinfo;
92269+ }
92270+ }
92271+#endif
92272+
92273 /* Fix up syms, so that st_value is a pointer to location. */
92274 err = simplify_symbols(mod, info);
92275 if (err < 0)
92276@@ -3319,13 +3493,6 @@ static int load_module(struct load_info *info, const char __user *uargs,
92277
92278 flush_module_icache(mod);
92279
92280- /* Now copy in args */
92281- mod->args = strndup_user(uargs, ~0UL >> 1);
92282- if (IS_ERR(mod->args)) {
92283- err = PTR_ERR(mod->args);
92284- goto free_arch_cleanup;
92285- }
92286-
92287 dynamic_debug_setup(info->debug, info->num_debug);
92288
92289 /* Ftrace init must be called in the MODULE_STATE_UNFORMED state */
92290@@ -3373,11 +3540,10 @@ static int load_module(struct load_info *info, const char __user *uargs,
92291 ddebug_cleanup:
92292 dynamic_debug_remove(info->debug);
92293 synchronize_sched();
92294- kfree(mod->args);
92295- free_arch_cleanup:
92296 module_arch_cleanup(mod);
92297 free_modinfo:
92298 free_modinfo(mod);
92299+ kfree(mod->args);
92300 free_unload:
92301 module_unload_free(mod);
92302 unlink_mod:
92303@@ -3390,7 +3556,8 @@ static int load_module(struct load_info *info, const char __user *uargs,
92304 mutex_unlock(&module_mutex);
92305 free_module:
92306 /* Free lock-classes; relies on the preceding sync_rcu() */
92307- lockdep_free_key_range(mod->module_core, mod->core_size);
92308+ lockdep_free_key_range(mod->module_core_rx, mod->core_size_rx);
92309+ lockdep_free_key_range(mod->module_core_rw, mod->core_size_rw);
92310
92311 module_deallocate(mod, info);
92312 free_copy:
92313@@ -3467,10 +3634,16 @@ static const char *get_ksymbol(struct module *mod,
92314 unsigned long nextval;
92315
92316 /* At worse, next value is at end of module */
92317- if (within_module_init(addr, mod))
92318- nextval = (unsigned long)mod->module_init+mod->init_text_size;
92319+ if (within_module_init_rx(addr, mod))
92320+ nextval = (unsigned long)mod->module_init_rx+mod->init_size_rx;
92321+ else if (within_module_init_rw(addr, mod))
92322+ nextval = (unsigned long)mod->module_init_rw+mod->init_size_rw;
92323+ else if (within_module_core_rx(addr, mod))
92324+ nextval = (unsigned long)mod->module_core_rx+mod->core_size_rx;
92325+ else if (within_module_core_rw(addr, mod))
92326+ nextval = (unsigned long)mod->module_core_rw+mod->core_size_rw;
92327 else
92328- nextval = (unsigned long)mod->module_core+mod->core_text_size;
92329+ return NULL;
92330
92331 /* Scan for closest preceding symbol, and next symbol. (ELF
92332 starts real symbols at 1). */
92333@@ -3718,7 +3891,7 @@ static int m_show(struct seq_file *m, void *p)
92334 return 0;
92335
92336 seq_printf(m, "%s %u",
92337- mod->name, mod->init_size + mod->core_size);
92338+ mod->name, mod->init_size_rx + mod->init_size_rw + mod->core_size_rx + mod->core_size_rw);
92339 print_unload_info(m, mod);
92340
92341 /* Informative for users. */
92342@@ -3727,7 +3900,7 @@ static int m_show(struct seq_file *m, void *p)
92343 mod->state == MODULE_STATE_COMING ? "Loading" :
92344 "Live");
92345 /* Used by oprofile and other similar tools. */
92346- seq_printf(m, " 0x%pK", mod->module_core);
92347+ seq_printf(m, " 0x%pK 0x%pK", mod->module_core_rx, mod->module_core_rw);
92348
92349 /* Taints info */
92350 if (mod->taints)
92351@@ -3763,7 +3936,17 @@ static const struct file_operations proc_modules_operations = {
92352
92353 static int __init proc_modules_init(void)
92354 {
92355+#ifndef CONFIG_GRKERNSEC_HIDESYM
92356+#ifdef CONFIG_GRKERNSEC_PROC_USER
92357+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
92358+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
92359+ proc_create("modules", S_IRUSR | S_IRGRP, NULL, &proc_modules_operations);
92360+#else
92361 proc_create("modules", 0, NULL, &proc_modules_operations);
92362+#endif
92363+#else
92364+ proc_create("modules", S_IRUSR, NULL, &proc_modules_operations);
92365+#endif
92366 return 0;
92367 }
92368 module_init(proc_modules_init);
92369@@ -3824,7 +4007,8 @@ struct module *__module_address(unsigned long addr)
92370 {
92371 struct module *mod;
92372
92373- if (addr < module_addr_min || addr > module_addr_max)
92374+ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) &&
92375+ (addr < module_addr_min_rw || addr > module_addr_max_rw))
92376 return NULL;
92377
92378 list_for_each_entry_rcu(mod, &modules, list) {
92379@@ -3865,11 +4049,20 @@ bool is_module_text_address(unsigned long addr)
92380 */
92381 struct module *__module_text_address(unsigned long addr)
92382 {
92383- struct module *mod = __module_address(addr);
92384+ struct module *mod;
92385+
92386+#ifdef CONFIG_X86_32
92387+ addr = ktla_ktva(addr);
92388+#endif
92389+
92390+ if (addr < module_addr_min_rx || addr > module_addr_max_rx)
92391+ return NULL;
92392+
92393+ mod = __module_address(addr);
92394+
92395 if (mod) {
92396 /* Make sure it's within the text section. */
92397- if (!within(addr, mod->module_init, mod->init_text_size)
92398- && !within(addr, mod->module_core, mod->core_text_size))
92399+ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod))
92400 mod = NULL;
92401 }
92402 return mod;
92403diff --git a/kernel/notifier.c b/kernel/notifier.c
92404index ae9fc7c..5085fbf 100644
92405--- a/kernel/notifier.c
92406+++ b/kernel/notifier.c
92407@@ -5,6 +5,7 @@
92408 #include <linux/rcupdate.h>
92409 #include <linux/vmalloc.h>
92410 #include <linux/reboot.h>
92411+#include <linux/mm.h>
92412
92413 /*
92414 * Notifier list for kernel code which wants to be called
92415@@ -24,10 +25,12 @@ static int notifier_chain_register(struct notifier_block **nl,
92416 while ((*nl) != NULL) {
92417 if (n->priority > (*nl)->priority)
92418 break;
92419- nl = &((*nl)->next);
92420+ nl = (struct notifier_block **)&((*nl)->next);
92421 }
92422- n->next = *nl;
92423+ pax_open_kernel();
92424+ *(const void **)&n->next = *nl;
92425 rcu_assign_pointer(*nl, n);
92426+ pax_close_kernel();
92427 return 0;
92428 }
92429
92430@@ -39,10 +42,12 @@ static int notifier_chain_cond_register(struct notifier_block **nl,
92431 return 0;
92432 if (n->priority > (*nl)->priority)
92433 break;
92434- nl = &((*nl)->next);
92435+ nl = (struct notifier_block **)&((*nl)->next);
92436 }
92437- n->next = *nl;
92438+ pax_open_kernel();
92439+ *(const void **)&n->next = *nl;
92440 rcu_assign_pointer(*nl, n);
92441+ pax_close_kernel();
92442 return 0;
92443 }
92444
92445@@ -51,10 +56,12 @@ static int notifier_chain_unregister(struct notifier_block **nl,
92446 {
92447 while ((*nl) != NULL) {
92448 if ((*nl) == n) {
92449+ pax_open_kernel();
92450 rcu_assign_pointer(*nl, n->next);
92451+ pax_close_kernel();
92452 return 0;
92453 }
92454- nl = &((*nl)->next);
92455+ nl = (struct notifier_block **)&((*nl)->next);
92456 }
92457 return -ENOENT;
92458 }
92459diff --git a/kernel/padata.c b/kernel/padata.c
92460index b38bea9..91acfbe 100644
92461--- a/kernel/padata.c
92462+++ b/kernel/padata.c
92463@@ -54,7 +54,7 @@ static int padata_cpu_hash(struct parallel_data *pd)
92464 * seq_nr mod. number of cpus in use.
92465 */
92466
92467- seq_nr = atomic_inc_return(&pd->seq_nr);
92468+ seq_nr = atomic_inc_return_unchecked(&pd->seq_nr);
92469 cpu_index = seq_nr % cpumask_weight(pd->cpumask.pcpu);
92470
92471 return padata_index_to_cpu(pd, cpu_index);
92472@@ -428,7 +428,7 @@ static struct parallel_data *padata_alloc_pd(struct padata_instance *pinst,
92473 padata_init_pqueues(pd);
92474 padata_init_squeues(pd);
92475 setup_timer(&pd->timer, padata_reorder_timer, (unsigned long)pd);
92476- atomic_set(&pd->seq_nr, -1);
92477+ atomic_set_unchecked(&pd->seq_nr, -1);
92478 atomic_set(&pd->reorder_objects, 0);
92479 atomic_set(&pd->refcnt, 0);
92480 pd->pinst = pinst;
92481diff --git a/kernel/panic.c b/kernel/panic.c
92482index 8136ad7..15c857b 100644
92483--- a/kernel/panic.c
92484+++ b/kernel/panic.c
92485@@ -54,7 +54,7 @@ EXPORT_SYMBOL(panic_blink);
92486 /*
92487 * Stop ourself in panic -- architecture code may override this
92488 */
92489-void __weak panic_smp_self_stop(void)
92490+void __weak __noreturn panic_smp_self_stop(void)
92491 {
92492 while (1)
92493 cpu_relax();
92494@@ -425,7 +425,7 @@ static void warn_slowpath_common(const char *file, int line, void *caller,
92495 disable_trace_on_warning();
92496
92497 pr_warn("------------[ cut here ]------------\n");
92498- pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS()\n",
92499+ pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pA()\n",
92500 raw_smp_processor_id(), current->pid, file, line, caller);
92501
92502 if (args)
92503@@ -490,7 +490,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
92504 */
92505 __visible void __stack_chk_fail(void)
92506 {
92507- panic("stack-protector: Kernel stack is corrupted in: %p\n",
92508+ dump_stack();
92509+ panic("stack-protector: Kernel stack is corrupted in: %pA\n",
92510 __builtin_return_address(0));
92511 }
92512 EXPORT_SYMBOL(__stack_chk_fail);
92513diff --git a/kernel/pid.c b/kernel/pid.c
92514index cd36a5e..11f185d 100644
92515--- a/kernel/pid.c
92516+++ b/kernel/pid.c
92517@@ -33,6 +33,7 @@
92518 #include <linux/rculist.h>
92519 #include <linux/bootmem.h>
92520 #include <linux/hash.h>
92521+#include <linux/security.h>
92522 #include <linux/pid_namespace.h>
92523 #include <linux/init_task.h>
92524 #include <linux/syscalls.h>
92525@@ -47,7 +48,7 @@ struct pid init_struct_pid = INIT_STRUCT_PID;
92526
92527 int pid_max = PID_MAX_DEFAULT;
92528
92529-#define RESERVED_PIDS 300
92530+#define RESERVED_PIDS 500
92531
92532 int pid_max_min = RESERVED_PIDS + 1;
92533 int pid_max_max = PID_MAX_LIMIT;
92534@@ -450,10 +451,18 @@ EXPORT_SYMBOL(pid_task);
92535 */
92536 struct task_struct *find_task_by_pid_ns(pid_t nr, struct pid_namespace *ns)
92537 {
92538+ struct task_struct *task;
92539+
92540 rcu_lockdep_assert(rcu_read_lock_held(),
92541 "find_task_by_pid_ns() needs rcu_read_lock()"
92542 " protection");
92543- return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
92544+
92545+ task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
92546+
92547+ if (gr_pid_is_chrooted(task))
92548+ return NULL;
92549+
92550+ return task;
92551 }
92552
92553 struct task_struct *find_task_by_vpid(pid_t vnr)
92554@@ -461,6 +470,14 @@ struct task_struct *find_task_by_vpid(pid_t vnr)
92555 return find_task_by_pid_ns(vnr, task_active_pid_ns(current));
92556 }
92557
92558+struct task_struct *find_task_by_vpid_unrestricted(pid_t vnr)
92559+{
92560+ rcu_lockdep_assert(rcu_read_lock_held(),
92561+ "find_task_by_pid_ns() needs rcu_read_lock()"
92562+ " protection");
92563+ return pid_task(find_pid_ns(vnr, task_active_pid_ns(current)), PIDTYPE_PID);
92564+}
92565+
92566 struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
92567 {
92568 struct pid *pid;
92569diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
92570index a65ba13..f600dbb 100644
92571--- a/kernel/pid_namespace.c
92572+++ b/kernel/pid_namespace.c
92573@@ -274,7 +274,7 @@ static int pid_ns_ctl_handler(struct ctl_table *table, int write,
92574 void __user *buffer, size_t *lenp, loff_t *ppos)
92575 {
92576 struct pid_namespace *pid_ns = task_active_pid_ns(current);
92577- struct ctl_table tmp = *table;
92578+ ctl_table_no_const tmp = *table;
92579
92580 if (write && !ns_capable(pid_ns->user_ns, CAP_SYS_ADMIN))
92581 return -EPERM;
92582diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
92583index 7e01f78..f5da19d 100644
92584--- a/kernel/power/Kconfig
92585+++ b/kernel/power/Kconfig
92586@@ -24,6 +24,8 @@ config HIBERNATE_CALLBACKS
92587 config HIBERNATION
92588 bool "Hibernation (aka 'suspend to disk')"
92589 depends on SWAP && ARCH_HIBERNATION_POSSIBLE
92590+ depends on !GRKERNSEC_KMEM
92591+ depends on !PAX_MEMORY_SANITIZE
92592 select HIBERNATE_CALLBACKS
92593 select LZO_COMPRESS
92594 select LZO_DECOMPRESS
92595diff --git a/kernel/power/process.c b/kernel/power/process.c
92596index 564f786..361a18e 100644
92597--- a/kernel/power/process.c
92598+++ b/kernel/power/process.c
92599@@ -35,6 +35,7 @@ static int try_to_freeze_tasks(bool user_only)
92600 unsigned int elapsed_msecs;
92601 bool wakeup = false;
92602 int sleep_usecs = USEC_PER_MSEC;
92603+ bool timedout = false;
92604
92605 do_gettimeofday(&start);
92606
92607@@ -45,13 +46,20 @@ static int try_to_freeze_tasks(bool user_only)
92608
92609 while (true) {
92610 todo = 0;
92611+ if (time_after(jiffies, end_time))
92612+ timedout = true;
92613 read_lock(&tasklist_lock);
92614 for_each_process_thread(g, p) {
92615 if (p == current || !freeze_task(p))
92616 continue;
92617
92618- if (!freezer_should_skip(p))
92619+ if (!freezer_should_skip(p)) {
92620 todo++;
92621+ if (timedout) {
92622+ printk(KERN_ERR "Task refusing to freeze:\n");
92623+ sched_show_task(p);
92624+ }
92625+ }
92626 }
92627 read_unlock(&tasklist_lock);
92628
92629@@ -60,7 +68,7 @@ static int try_to_freeze_tasks(bool user_only)
92630 todo += wq_busy;
92631 }
92632
92633- if (!todo || time_after(jiffies, end_time))
92634+ if (!todo || timedout)
92635 break;
92636
92637 if (pm_wakeup_pending()) {
92638diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
92639index bb0635b..9aff9f3 100644
92640--- a/kernel/printk/printk.c
92641+++ b/kernel/printk/printk.c
92642@@ -486,6 +486,11 @@ int check_syslog_permissions(int type, bool from_file)
92643 if (from_file && type != SYSLOG_ACTION_OPEN)
92644 return 0;
92645
92646+#ifdef CONFIG_GRKERNSEC_DMESG
92647+ if (grsec_enable_dmesg && !capable(CAP_SYSLOG) && !capable_nolog(CAP_SYS_ADMIN))
92648+ return -EPERM;
92649+#endif
92650+
92651 if (syslog_action_restricted(type)) {
92652 if (capable(CAP_SYSLOG))
92653 return 0;
92654diff --git a/kernel/profile.c b/kernel/profile.c
92655index a7bcd28..5b368fa 100644
92656--- a/kernel/profile.c
92657+++ b/kernel/profile.c
92658@@ -37,7 +37,7 @@ struct profile_hit {
92659 #define NR_PROFILE_HIT (PAGE_SIZE/sizeof(struct profile_hit))
92660 #define NR_PROFILE_GRP (NR_PROFILE_HIT/PROFILE_GRPSZ)
92661
92662-static atomic_t *prof_buffer;
92663+static atomic_unchecked_t *prof_buffer;
92664 static unsigned long prof_len, prof_shift;
92665
92666 int prof_on __read_mostly;
92667@@ -256,7 +256,7 @@ static void profile_flip_buffers(void)
92668 hits[i].pc = 0;
92669 continue;
92670 }
92671- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
92672+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
92673 hits[i].hits = hits[i].pc = 0;
92674 }
92675 }
92676@@ -317,9 +317,9 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
92677 * Add the current hit(s) and flush the write-queue out
92678 * to the global buffer:
92679 */
92680- atomic_add(nr_hits, &prof_buffer[pc]);
92681+ atomic_add_unchecked(nr_hits, &prof_buffer[pc]);
92682 for (i = 0; i < NR_PROFILE_HIT; ++i) {
92683- atomic_add(hits[i].hits, &prof_buffer[hits[i].pc]);
92684+ atomic_add_unchecked(hits[i].hits, &prof_buffer[hits[i].pc]);
92685 hits[i].pc = hits[i].hits = 0;
92686 }
92687 out:
92688@@ -394,7 +394,7 @@ static void do_profile_hits(int type, void *__pc, unsigned int nr_hits)
92689 {
92690 unsigned long pc;
92691 pc = ((unsigned long)__pc - (unsigned long)_stext) >> prof_shift;
92692- atomic_add(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
92693+ atomic_add_unchecked(nr_hits, &prof_buffer[min(pc, prof_len - 1)]);
92694 }
92695 #endif /* !CONFIG_SMP */
92696
92697@@ -489,7 +489,7 @@ read_profile(struct file *file, char __user *buf, size_t count, loff_t *ppos)
92698 return -EFAULT;
92699 buf++; p++; count--; read++;
92700 }
92701- pnt = (char *)prof_buffer + p - sizeof(atomic_t);
92702+ pnt = (char *)prof_buffer + p - sizeof(atomic_unchecked_t);
92703 if (copy_to_user(buf, (void *)pnt, count))
92704 return -EFAULT;
92705 read += count;
92706@@ -520,7 +520,7 @@ static ssize_t write_profile(struct file *file, const char __user *buf,
92707 }
92708 #endif
92709 profile_discard_flip_buffers();
92710- memset(prof_buffer, 0, prof_len * sizeof(atomic_t));
92711+ memset(prof_buffer, 0, prof_len * sizeof(atomic_unchecked_t));
92712 return count;
92713 }
92714
92715diff --git a/kernel/ptrace.c b/kernel/ptrace.c
92716index 9a34bd8..38d90e5 100644
92717--- a/kernel/ptrace.c
92718+++ b/kernel/ptrace.c
92719@@ -321,7 +321,7 @@ static int ptrace_attach(struct task_struct *task, long request,
92720 if (seize)
92721 flags |= PT_SEIZED;
92722 rcu_read_lock();
92723- if (ns_capable(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
92724+ if (ns_capable_nolog(__task_cred(task)->user_ns, CAP_SYS_PTRACE))
92725 flags |= PT_PTRACE_CAP;
92726 rcu_read_unlock();
92727 task->ptrace = flags;
92728@@ -515,7 +515,7 @@ int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst
92729 break;
92730 return -EIO;
92731 }
92732- if (copy_to_user(dst, buf, retval))
92733+ if (retval > sizeof(buf) || copy_to_user(dst, buf, retval))
92734 return -EFAULT;
92735 copied += retval;
92736 src += retval;
92737@@ -803,7 +803,7 @@ int ptrace_request(struct task_struct *child, long request,
92738 bool seized = child->ptrace & PT_SEIZED;
92739 int ret = -EIO;
92740 siginfo_t siginfo, *si;
92741- void __user *datavp = (void __user *) data;
92742+ void __user *datavp = (__force void __user *) data;
92743 unsigned long __user *datalp = datavp;
92744 unsigned long flags;
92745
92746@@ -1049,14 +1049,21 @@ SYSCALL_DEFINE4(ptrace, long, request, long, pid, unsigned long, addr,
92747 goto out;
92748 }
92749
92750+ if (gr_handle_ptrace(child, request)) {
92751+ ret = -EPERM;
92752+ goto out_put_task_struct;
92753+ }
92754+
92755 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
92756 ret = ptrace_attach(child, request, addr, data);
92757 /*
92758 * Some architectures need to do book-keeping after
92759 * a ptrace attach.
92760 */
92761- if (!ret)
92762+ if (!ret) {
92763 arch_ptrace_attach(child);
92764+ gr_audit_ptrace(child);
92765+ }
92766 goto out_put_task_struct;
92767 }
92768
92769@@ -1084,7 +1091,7 @@ int generic_ptrace_peekdata(struct task_struct *tsk, unsigned long addr,
92770 copied = access_process_vm(tsk, addr, &tmp, sizeof(tmp), 0);
92771 if (copied != sizeof(tmp))
92772 return -EIO;
92773- return put_user(tmp, (unsigned long __user *)data);
92774+ return put_user(tmp, (__force unsigned long __user *)data);
92775 }
92776
92777 int generic_ptrace_pokedata(struct task_struct *tsk, unsigned long addr,
92778@@ -1177,7 +1184,7 @@ int compat_ptrace_request(struct task_struct *child, compat_long_t request,
92779 }
92780
92781 COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
92782- compat_long_t, addr, compat_long_t, data)
92783+ compat_ulong_t, addr, compat_ulong_t, data)
92784 {
92785 struct task_struct *child;
92786 long ret;
92787@@ -1193,14 +1200,21 @@ COMPAT_SYSCALL_DEFINE4(ptrace, compat_long_t, request, compat_long_t, pid,
92788 goto out;
92789 }
92790
92791+ if (gr_handle_ptrace(child, request)) {
92792+ ret = -EPERM;
92793+ goto out_put_task_struct;
92794+ }
92795+
92796 if (request == PTRACE_ATTACH || request == PTRACE_SEIZE) {
92797 ret = ptrace_attach(child, request, addr, data);
92798 /*
92799 * Some architectures need to do book-keeping after
92800 * a ptrace attach.
92801 */
92802- if (!ret)
92803+ if (!ret) {
92804 arch_ptrace_attach(child);
92805+ gr_audit_ptrace(child);
92806+ }
92807 goto out_put_task_struct;
92808 }
92809
92810diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
92811index 30d42aa..cac5d66 100644
92812--- a/kernel/rcu/rcutorture.c
92813+++ b/kernel/rcu/rcutorture.c
92814@@ -134,12 +134,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
92815 rcu_torture_count) = { 0 };
92816 static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1],
92817 rcu_torture_batch) = { 0 };
92818-static atomic_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
92819-static atomic_t n_rcu_torture_alloc;
92820-static atomic_t n_rcu_torture_alloc_fail;
92821-static atomic_t n_rcu_torture_free;
92822-static atomic_t n_rcu_torture_mberror;
92823-static atomic_t n_rcu_torture_error;
92824+static atomic_unchecked_t rcu_torture_wcount[RCU_TORTURE_PIPE_LEN + 1];
92825+static atomic_unchecked_t n_rcu_torture_alloc;
92826+static atomic_unchecked_t n_rcu_torture_alloc_fail;
92827+static atomic_unchecked_t n_rcu_torture_free;
92828+static atomic_unchecked_t n_rcu_torture_mberror;
92829+static atomic_unchecked_t n_rcu_torture_error;
92830 static long n_rcu_torture_barrier_error;
92831 static long n_rcu_torture_boost_ktrerror;
92832 static long n_rcu_torture_boost_rterror;
92833@@ -148,7 +148,7 @@ static long n_rcu_torture_boosts;
92834 static long n_rcu_torture_timers;
92835 static long n_barrier_attempts;
92836 static long n_barrier_successes;
92837-static atomic_long_t n_cbfloods;
92838+static atomic_long_unchecked_t n_cbfloods;
92839 static struct list_head rcu_torture_removed;
92840
92841 static int rcu_torture_writer_state;
92842@@ -211,11 +211,11 @@ rcu_torture_alloc(void)
92843
92844 spin_lock_bh(&rcu_torture_lock);
92845 if (list_empty(&rcu_torture_freelist)) {
92846- atomic_inc(&n_rcu_torture_alloc_fail);
92847+ atomic_inc_unchecked(&n_rcu_torture_alloc_fail);
92848 spin_unlock_bh(&rcu_torture_lock);
92849 return NULL;
92850 }
92851- atomic_inc(&n_rcu_torture_alloc);
92852+ atomic_inc_unchecked(&n_rcu_torture_alloc);
92853 p = rcu_torture_freelist.next;
92854 list_del_init(p);
92855 spin_unlock_bh(&rcu_torture_lock);
92856@@ -228,7 +228,7 @@ rcu_torture_alloc(void)
92857 static void
92858 rcu_torture_free(struct rcu_torture *p)
92859 {
92860- atomic_inc(&n_rcu_torture_free);
92861+ atomic_inc_unchecked(&n_rcu_torture_free);
92862 spin_lock_bh(&rcu_torture_lock);
92863 list_add_tail(&p->rtort_free, &rcu_torture_freelist);
92864 spin_unlock_bh(&rcu_torture_lock);
92865@@ -308,7 +308,7 @@ rcu_torture_pipe_update_one(struct rcu_torture *rp)
92866 i = rp->rtort_pipe_count;
92867 if (i > RCU_TORTURE_PIPE_LEN)
92868 i = RCU_TORTURE_PIPE_LEN;
92869- atomic_inc(&rcu_torture_wcount[i]);
92870+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
92871 if (++rp->rtort_pipe_count >= RCU_TORTURE_PIPE_LEN) {
92872 rp->rtort_mbtest = 0;
92873 return true;
92874@@ -796,7 +796,7 @@ rcu_torture_cbflood(void *arg)
92875 VERBOSE_TOROUT_STRING("rcu_torture_cbflood task started");
92876 do {
92877 schedule_timeout_interruptible(cbflood_inter_holdoff);
92878- atomic_long_inc(&n_cbfloods);
92879+ atomic_long_inc_unchecked(&n_cbfloods);
92880 WARN_ON(signal_pending(current));
92881 for (i = 0; i < cbflood_n_burst; i++) {
92882 for (j = 0; j < cbflood_n_per_burst; j++) {
92883@@ -915,7 +915,7 @@ rcu_torture_writer(void *arg)
92884 i = old_rp->rtort_pipe_count;
92885 if (i > RCU_TORTURE_PIPE_LEN)
92886 i = RCU_TORTURE_PIPE_LEN;
92887- atomic_inc(&rcu_torture_wcount[i]);
92888+ atomic_inc_unchecked(&rcu_torture_wcount[i]);
92889 old_rp->rtort_pipe_count++;
92890 switch (synctype[torture_random(&rand) % nsynctypes]) {
92891 case RTWS_DEF_FREE:
92892@@ -1036,7 +1036,7 @@ static void rcu_torture_timer(unsigned long unused)
92893 return;
92894 }
92895 if (p->rtort_mbtest == 0)
92896- atomic_inc(&n_rcu_torture_mberror);
92897+ atomic_inc_unchecked(&n_rcu_torture_mberror);
92898 spin_lock(&rand_lock);
92899 cur_ops->read_delay(&rand);
92900 n_rcu_torture_timers++;
92901@@ -1111,7 +1111,7 @@ rcu_torture_reader(void *arg)
92902 continue;
92903 }
92904 if (p->rtort_mbtest == 0)
92905- atomic_inc(&n_rcu_torture_mberror);
92906+ atomic_inc_unchecked(&n_rcu_torture_mberror);
92907 cur_ops->read_delay(&rand);
92908 preempt_disable();
92909 pipe_count = p->rtort_pipe_count;
92910@@ -1180,11 +1180,11 @@ rcu_torture_stats_print(void)
92911 rcu_torture_current,
92912 rcu_torture_current_version,
92913 list_empty(&rcu_torture_freelist),
92914- atomic_read(&n_rcu_torture_alloc),
92915- atomic_read(&n_rcu_torture_alloc_fail),
92916- atomic_read(&n_rcu_torture_free));
92917+ atomic_read_unchecked(&n_rcu_torture_alloc),
92918+ atomic_read_unchecked(&n_rcu_torture_alloc_fail),
92919+ atomic_read_unchecked(&n_rcu_torture_free));
92920 pr_cont("rtmbe: %d rtbke: %ld rtbre: %ld ",
92921- atomic_read(&n_rcu_torture_mberror),
92922+ atomic_read_unchecked(&n_rcu_torture_mberror),
92923 n_rcu_torture_boost_ktrerror,
92924 n_rcu_torture_boost_rterror);
92925 pr_cont("rtbf: %ld rtb: %ld nt: %ld ",
92926@@ -1196,17 +1196,17 @@ rcu_torture_stats_print(void)
92927 n_barrier_successes,
92928 n_barrier_attempts,
92929 n_rcu_torture_barrier_error);
92930- pr_cont("cbflood: %ld\n", atomic_long_read(&n_cbfloods));
92931+ pr_cont("cbflood: %ld\n", atomic_long_read_unchecked(&n_cbfloods));
92932
92933 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
92934- if (atomic_read(&n_rcu_torture_mberror) != 0 ||
92935+ if (atomic_read_unchecked(&n_rcu_torture_mberror) != 0 ||
92936 n_rcu_torture_barrier_error != 0 ||
92937 n_rcu_torture_boost_ktrerror != 0 ||
92938 n_rcu_torture_boost_rterror != 0 ||
92939 n_rcu_torture_boost_failure != 0 ||
92940 i > 1) {
92941 pr_cont("%s", "!!! ");
92942- atomic_inc(&n_rcu_torture_error);
92943+ atomic_inc_unchecked(&n_rcu_torture_error);
92944 WARN_ON_ONCE(1);
92945 }
92946 pr_cont("Reader Pipe: ");
92947@@ -1223,7 +1223,7 @@ rcu_torture_stats_print(void)
92948 pr_alert("%s%s ", torture_type, TORTURE_FLAG);
92949 pr_cont("Free-Block Circulation: ");
92950 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
92951- pr_cont(" %d", atomic_read(&rcu_torture_wcount[i]));
92952+ pr_cont(" %d", atomic_read_unchecked(&rcu_torture_wcount[i]));
92953 }
92954 pr_cont("\n");
92955
92956@@ -1570,7 +1570,7 @@ rcu_torture_cleanup(void)
92957
92958 rcu_torture_stats_print(); /* -After- the stats thread is stopped! */
92959
92960- if (atomic_read(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
92961+ if (atomic_read_unchecked(&n_rcu_torture_error) || n_rcu_torture_barrier_error)
92962 rcu_torture_print_module_parms(cur_ops, "End of test: FAILURE");
92963 else if (torture_onoff_failures())
92964 rcu_torture_print_module_parms(cur_ops,
92965@@ -1695,18 +1695,18 @@ rcu_torture_init(void)
92966
92967 rcu_torture_current = NULL;
92968 rcu_torture_current_version = 0;
92969- atomic_set(&n_rcu_torture_alloc, 0);
92970- atomic_set(&n_rcu_torture_alloc_fail, 0);
92971- atomic_set(&n_rcu_torture_free, 0);
92972- atomic_set(&n_rcu_torture_mberror, 0);
92973- atomic_set(&n_rcu_torture_error, 0);
92974+ atomic_set_unchecked(&n_rcu_torture_alloc, 0);
92975+ atomic_set_unchecked(&n_rcu_torture_alloc_fail, 0);
92976+ atomic_set_unchecked(&n_rcu_torture_free, 0);
92977+ atomic_set_unchecked(&n_rcu_torture_mberror, 0);
92978+ atomic_set_unchecked(&n_rcu_torture_error, 0);
92979 n_rcu_torture_barrier_error = 0;
92980 n_rcu_torture_boost_ktrerror = 0;
92981 n_rcu_torture_boost_rterror = 0;
92982 n_rcu_torture_boost_failure = 0;
92983 n_rcu_torture_boosts = 0;
92984 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++)
92985- atomic_set(&rcu_torture_wcount[i], 0);
92986+ atomic_set_unchecked(&rcu_torture_wcount[i], 0);
92987 for_each_possible_cpu(cpu) {
92988 for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
92989 per_cpu(rcu_torture_count, cpu)[i] = 0;
92990diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
92991index cc9ceca..ce075a6 100644
92992--- a/kernel/rcu/tiny.c
92993+++ b/kernel/rcu/tiny.c
92994@@ -42,7 +42,7 @@
92995 /* Forward declarations for tiny_plugin.h. */
92996 struct rcu_ctrlblk;
92997 static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp);
92998-static void rcu_process_callbacks(struct softirq_action *unused);
92999+static void rcu_process_callbacks(void);
93000 static void __call_rcu(struct rcu_head *head,
93001 void (*func)(struct rcu_head *rcu),
93002 struct rcu_ctrlblk *rcp);
93003@@ -210,7 +210,7 @@ static void __rcu_process_callbacks(struct rcu_ctrlblk *rcp)
93004 false));
93005 }
93006
93007-static void rcu_process_callbacks(struct softirq_action *unused)
93008+static __latent_entropy void rcu_process_callbacks(void)
93009 {
93010 __rcu_process_callbacks(&rcu_sched_ctrlblk);
93011 __rcu_process_callbacks(&rcu_bh_ctrlblk);
93012diff --git a/kernel/rcu/tiny_plugin.h b/kernel/rcu/tiny_plugin.h
93013index f94e209..d2985bd 100644
93014--- a/kernel/rcu/tiny_plugin.h
93015+++ b/kernel/rcu/tiny_plugin.h
93016@@ -150,10 +150,10 @@ static void check_cpu_stall(struct rcu_ctrlblk *rcp)
93017 rcp->name, rcp->ticks_this_gp, DYNTICK_TASK_EXIT_IDLE,
93018 jiffies - rcp->gp_start, rcp->qlen);
93019 dump_stack();
93020- ACCESS_ONCE(rcp->jiffies_stall) = jiffies +
93021+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies +
93022 3 * rcu_jiffies_till_stall_check() + 3;
93023 } else if (ULONG_CMP_GE(j, js)) {
93024- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
93025+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
93026 }
93027 }
93028
93029@@ -161,7 +161,7 @@ static void reset_cpu_stall_ticks(struct rcu_ctrlblk *rcp)
93030 {
93031 rcp->ticks_this_gp = 0;
93032 rcp->gp_start = jiffies;
93033- ACCESS_ONCE(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
93034+ ACCESS_ONCE_RW(rcp->jiffies_stall) = jiffies + rcu_jiffies_till_stall_check();
93035 }
93036
93037 static void check_cpu_stalls(void)
93038diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
93039index 48d640c..9401d30 100644
93040--- a/kernel/rcu/tree.c
93041+++ b/kernel/rcu/tree.c
93042@@ -268,7 +268,7 @@ static void rcu_momentary_dyntick_idle(void)
93043 */
93044 rdtp = this_cpu_ptr(&rcu_dynticks);
93045 smp_mb__before_atomic(); /* Earlier stuff before QS. */
93046- atomic_add(2, &rdtp->dynticks); /* QS. */
93047+ atomic_add_unchecked(2, &rdtp->dynticks); /* QS. */
93048 smp_mb__after_atomic(); /* Later stuff after QS. */
93049 break;
93050 }
93051@@ -580,9 +580,9 @@ static void rcu_eqs_enter_common(long long oldval, bool user)
93052 rcu_prepare_for_idle();
93053 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
93054 smp_mb__before_atomic(); /* See above. */
93055- atomic_inc(&rdtp->dynticks);
93056+ atomic_inc_unchecked(&rdtp->dynticks);
93057 smp_mb__after_atomic(); /* Force ordering with next sojourn. */
93058- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
93059+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
93060 rcu_dynticks_task_enter();
93061
93062 /*
93063@@ -703,10 +703,10 @@ static void rcu_eqs_exit_common(long long oldval, int user)
93064
93065 rcu_dynticks_task_exit();
93066 smp_mb__before_atomic(); /* Force ordering w/previous sojourn. */
93067- atomic_inc(&rdtp->dynticks);
93068+ atomic_inc_unchecked(&rdtp->dynticks);
93069 /* CPUs seeing atomic_inc() must see later RCU read-side crit sects */
93070 smp_mb__after_atomic(); /* See above. */
93071- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
93072+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
93073 rcu_cleanup_after_idle();
93074 trace_rcu_dyntick(TPS("End"), oldval, rdtp->dynticks_nesting);
93075 if (!user && !is_idle_task(current)) {
93076@@ -840,12 +840,12 @@ void rcu_nmi_enter(void)
93077 * to be in the outermost NMI handler that interrupted an RCU-idle
93078 * period (observation due to Andy Lutomirski).
93079 */
93080- if (!(atomic_read(&rdtp->dynticks) & 0x1)) {
93081+ if (!(atomic_read_unchecked(&rdtp->dynticks) & 0x1)) {
93082 smp_mb__before_atomic(); /* Force delay from prior write. */
93083- atomic_inc(&rdtp->dynticks);
93084+ atomic_inc_unchecked(&rdtp->dynticks);
93085 /* atomic_inc() before later RCU read-side crit sects */
93086 smp_mb__after_atomic(); /* See above. */
93087- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
93088+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
93089 incby = 1;
93090 }
93091 rdtp->dynticks_nmi_nesting += incby;
93092@@ -870,7 +870,7 @@ void rcu_nmi_exit(void)
93093 * to us!)
93094 */
93095 WARN_ON_ONCE(rdtp->dynticks_nmi_nesting <= 0);
93096- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks) & 0x1));
93097+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks) & 0x1));
93098
93099 /*
93100 * If the nesting level is not 1, the CPU wasn't RCU-idle, so
93101@@ -885,9 +885,9 @@ void rcu_nmi_exit(void)
93102 rdtp->dynticks_nmi_nesting = 0;
93103 /* CPUs seeing atomic_inc() must see prior RCU read-side crit sects */
93104 smp_mb__before_atomic(); /* See above. */
93105- atomic_inc(&rdtp->dynticks);
93106+ atomic_inc_unchecked(&rdtp->dynticks);
93107 smp_mb__after_atomic(); /* Force delay to next write. */
93108- WARN_ON_ONCE(atomic_read(&rdtp->dynticks) & 0x1);
93109+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks) & 0x1);
93110 }
93111
93112 /**
93113@@ -900,7 +900,7 @@ void rcu_nmi_exit(void)
93114 */
93115 bool notrace __rcu_is_watching(void)
93116 {
93117- return atomic_read(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
93118+ return atomic_read_unchecked(this_cpu_ptr(&rcu_dynticks.dynticks)) & 0x1;
93119 }
93120
93121 /**
93122@@ -983,7 +983,7 @@ static int rcu_is_cpu_rrupt_from_idle(void)
93123 static int dyntick_save_progress_counter(struct rcu_data *rdp,
93124 bool *isidle, unsigned long *maxj)
93125 {
93126- rdp->dynticks_snap = atomic_add_return(0, &rdp->dynticks->dynticks);
93127+ rdp->dynticks_snap = atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
93128 rcu_sysidle_check_cpu(rdp, isidle, maxj);
93129 if ((rdp->dynticks_snap & 0x1) == 0) {
93130 trace_rcu_fqs(rdp->rsp->name, rdp->gpnum, rdp->cpu, TPS("dti"));
93131@@ -991,7 +991,7 @@ static int dyntick_save_progress_counter(struct rcu_data *rdp,
93132 } else {
93133 if (ULONG_CMP_LT(ACCESS_ONCE(rdp->gpnum) + ULONG_MAX / 4,
93134 rdp->mynode->gpnum))
93135- ACCESS_ONCE(rdp->gpwrap) = true;
93136+ ACCESS_ONCE_RW(rdp->gpwrap) = true;
93137 return 0;
93138 }
93139 }
93140@@ -1009,7 +1009,7 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
93141 int *rcrmp;
93142 unsigned int snap;
93143
93144- curr = (unsigned int)atomic_add_return(0, &rdp->dynticks->dynticks);
93145+ curr = (unsigned int)atomic_add_return_unchecked(0, &rdp->dynticks->dynticks);
93146 snap = (unsigned int)rdp->dynticks_snap;
93147
93148 /*
93149@@ -1072,10 +1072,10 @@ static int rcu_implicit_dynticks_qs(struct rcu_data *rdp,
93150 rdp->rsp->gp_start + jiffies_till_sched_qs) ||
93151 ULONG_CMP_GE(jiffies, rdp->rsp->jiffies_resched)) {
93152 if (!(ACCESS_ONCE(*rcrmp) & rdp->rsp->flavor_mask)) {
93153- ACCESS_ONCE(rdp->cond_resched_completed) =
93154+ ACCESS_ONCE_RW(rdp->cond_resched_completed) =
93155 ACCESS_ONCE(rdp->mynode->completed);
93156 smp_mb(); /* ->cond_resched_completed before *rcrmp. */
93157- ACCESS_ONCE(*rcrmp) =
93158+ ACCESS_ONCE_RW(*rcrmp) =
93159 ACCESS_ONCE(*rcrmp) + rdp->rsp->flavor_mask;
93160 resched_cpu(rdp->cpu); /* Force CPU into scheduler. */
93161 rdp->rsp->jiffies_resched += 5; /* Enable beating. */
93162@@ -1097,7 +1097,7 @@ static void record_gp_stall_check_time(struct rcu_state *rsp)
93163 rsp->gp_start = j;
93164 smp_wmb(); /* Record start time before stall time. */
93165 j1 = rcu_jiffies_till_stall_check();
93166- ACCESS_ONCE(rsp->jiffies_stall) = j + j1;
93167+ ACCESS_ONCE_RW(rsp->jiffies_stall) = j + j1;
93168 rsp->jiffies_resched = j + j1 / 2;
93169 rsp->n_force_qs_gpstart = ACCESS_ONCE(rsp->n_force_qs);
93170 }
93171@@ -1156,7 +1156,7 @@ static void print_other_cpu_stall(struct rcu_state *rsp, unsigned long gpnum)
93172 raw_spin_unlock_irqrestore(&rnp->lock, flags);
93173 return;
93174 }
93175- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
93176+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + 3 * rcu_jiffies_till_stall_check() + 3;
93177 raw_spin_unlock_irqrestore(&rnp->lock, flags);
93178
93179 /*
93180@@ -1240,7 +1240,7 @@ static void print_cpu_stall(struct rcu_state *rsp)
93181
93182 raw_spin_lock_irqsave(&rnp->lock, flags);
93183 if (ULONG_CMP_GE(jiffies, ACCESS_ONCE(rsp->jiffies_stall)))
93184- ACCESS_ONCE(rsp->jiffies_stall) = jiffies +
93185+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies +
93186 3 * rcu_jiffies_till_stall_check() + 3;
93187 raw_spin_unlock_irqrestore(&rnp->lock, flags);
93188
93189@@ -1324,7 +1324,7 @@ void rcu_cpu_stall_reset(void)
93190 struct rcu_state *rsp;
93191
93192 for_each_rcu_flavor(rsp)
93193- ACCESS_ONCE(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
93194+ ACCESS_ONCE_RW(rsp->jiffies_stall) = jiffies + ULONG_MAX / 2;
93195 }
93196
93197 /*
93198@@ -1671,7 +1671,7 @@ static bool __note_gp_changes(struct rcu_state *rsp, struct rcu_node *rnp,
93199 rdp->rcu_qs_ctr_snap = __this_cpu_read(rcu_qs_ctr);
93200 rdp->qs_pending = !!(rnp->qsmask & rdp->grpmask);
93201 zero_cpu_stall_ticks(rdp);
93202- ACCESS_ONCE(rdp->gpwrap) = false;
93203+ ACCESS_ONCE_RW(rdp->gpwrap) = false;
93204 }
93205 return ret;
93206 }
93207@@ -1706,7 +1706,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
93208 struct rcu_data *rdp;
93209 struct rcu_node *rnp = rcu_get_root(rsp);
93210
93211- ACCESS_ONCE(rsp->gp_activity) = jiffies;
93212+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
93213 rcu_bind_gp_kthread();
93214 raw_spin_lock_irq(&rnp->lock);
93215 smp_mb__after_unlock_lock();
93216@@ -1715,7 +1715,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
93217 raw_spin_unlock_irq(&rnp->lock);
93218 return 0;
93219 }
93220- ACCESS_ONCE(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
93221+ ACCESS_ONCE_RW(rsp->gp_flags) = 0; /* Clear all flags: New grace period. */
93222
93223 if (WARN_ON_ONCE(rcu_gp_in_progress(rsp))) {
93224 /*
93225@@ -1756,9 +1756,9 @@ static int rcu_gp_init(struct rcu_state *rsp)
93226 rdp = this_cpu_ptr(rsp->rda);
93227 rcu_preempt_check_blocked_tasks(rnp);
93228 rnp->qsmask = rnp->qsmaskinit;
93229- ACCESS_ONCE(rnp->gpnum) = rsp->gpnum;
93230+ ACCESS_ONCE_RW(rnp->gpnum) = rsp->gpnum;
93231 WARN_ON_ONCE(rnp->completed != rsp->completed);
93232- ACCESS_ONCE(rnp->completed) = rsp->completed;
93233+ ACCESS_ONCE_RW(rnp->completed) = rsp->completed;
93234 if (rnp == rdp->mynode)
93235 (void)__note_gp_changes(rsp, rnp, rdp);
93236 rcu_preempt_boost_start_gp(rnp);
93237@@ -1767,7 +1767,7 @@ static int rcu_gp_init(struct rcu_state *rsp)
93238 rnp->grphi, rnp->qsmask);
93239 raw_spin_unlock_irq(&rnp->lock);
93240 cond_resched_rcu_qs();
93241- ACCESS_ONCE(rsp->gp_activity) = jiffies;
93242+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
93243 }
93244
93245 mutex_unlock(&rsp->onoff_mutex);
93246@@ -1784,7 +1784,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
93247 unsigned long maxj;
93248 struct rcu_node *rnp = rcu_get_root(rsp);
93249
93250- ACCESS_ONCE(rsp->gp_activity) = jiffies;
93251+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
93252 rsp->n_force_qs++;
93253 if (fqs_state == RCU_SAVE_DYNTICK) {
93254 /* Collect dyntick-idle snapshots. */
93255@@ -1805,7 +1805,7 @@ static int rcu_gp_fqs(struct rcu_state *rsp, int fqs_state_in)
93256 if (ACCESS_ONCE(rsp->gp_flags) & RCU_GP_FLAG_FQS) {
93257 raw_spin_lock_irq(&rnp->lock);
93258 smp_mb__after_unlock_lock();
93259- ACCESS_ONCE(rsp->gp_flags) =
93260+ ACCESS_ONCE_RW(rsp->gp_flags) =
93261 ACCESS_ONCE(rsp->gp_flags) & ~RCU_GP_FLAG_FQS;
93262 raw_spin_unlock_irq(&rnp->lock);
93263 }
93264@@ -1823,7 +1823,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
93265 struct rcu_data *rdp;
93266 struct rcu_node *rnp = rcu_get_root(rsp);
93267
93268- ACCESS_ONCE(rsp->gp_activity) = jiffies;
93269+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
93270 raw_spin_lock_irq(&rnp->lock);
93271 smp_mb__after_unlock_lock();
93272 gp_duration = jiffies - rsp->gp_start;
93273@@ -1852,7 +1852,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
93274 rcu_for_each_node_breadth_first(rsp, rnp) {
93275 raw_spin_lock_irq(&rnp->lock);
93276 smp_mb__after_unlock_lock();
93277- ACCESS_ONCE(rnp->completed) = rsp->gpnum;
93278+ ACCESS_ONCE_RW(rnp->completed) = rsp->gpnum;
93279 rdp = this_cpu_ptr(rsp->rda);
93280 if (rnp == rdp->mynode)
93281 needgp = __note_gp_changes(rsp, rnp, rdp) || needgp;
93282@@ -1860,7 +1860,7 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
93283 nocb += rcu_future_gp_cleanup(rsp, rnp);
93284 raw_spin_unlock_irq(&rnp->lock);
93285 cond_resched_rcu_qs();
93286- ACCESS_ONCE(rsp->gp_activity) = jiffies;
93287+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
93288 }
93289 rnp = rcu_get_root(rsp);
93290 raw_spin_lock_irq(&rnp->lock);
93291@@ -1868,14 +1868,14 @@ static void rcu_gp_cleanup(struct rcu_state *rsp)
93292 rcu_nocb_gp_set(rnp, nocb);
93293
93294 /* Declare grace period done. */
93295- ACCESS_ONCE(rsp->completed) = rsp->gpnum;
93296+ ACCESS_ONCE_RW(rsp->completed) = rsp->gpnum;
93297 trace_rcu_grace_period(rsp->name, rsp->completed, TPS("end"));
93298 rsp->fqs_state = RCU_GP_IDLE;
93299 rdp = this_cpu_ptr(rsp->rda);
93300 /* Advance CBs to reduce false positives below. */
93301 needgp = rcu_advance_cbs(rsp, rnp, rdp) || needgp;
93302 if (needgp || cpu_needs_another_gp(rsp, rdp)) {
93303- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
93304+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
93305 trace_rcu_grace_period(rsp->name,
93306 ACCESS_ONCE(rsp->gpnum),
93307 TPS("newreq"));
93308@@ -1910,7 +1910,7 @@ static int __noreturn rcu_gp_kthread(void *arg)
93309 if (rcu_gp_init(rsp))
93310 break;
93311 cond_resched_rcu_qs();
93312- ACCESS_ONCE(rsp->gp_activity) = jiffies;
93313+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
93314 WARN_ON(signal_pending(current));
93315 trace_rcu_grace_period(rsp->name,
93316 ACCESS_ONCE(rsp->gpnum),
93317@@ -1954,11 +1954,11 @@ static int __noreturn rcu_gp_kthread(void *arg)
93318 ACCESS_ONCE(rsp->gpnum),
93319 TPS("fqsend"));
93320 cond_resched_rcu_qs();
93321- ACCESS_ONCE(rsp->gp_activity) = jiffies;
93322+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
93323 } else {
93324 /* Deal with stray signal. */
93325 cond_resched_rcu_qs();
93326- ACCESS_ONCE(rsp->gp_activity) = jiffies;
93327+ ACCESS_ONCE_RW(rsp->gp_activity) = jiffies;
93328 WARN_ON(signal_pending(current));
93329 trace_rcu_grace_period(rsp->name,
93330 ACCESS_ONCE(rsp->gpnum),
93331@@ -2003,7 +2003,7 @@ rcu_start_gp_advanced(struct rcu_state *rsp, struct rcu_node *rnp,
93332 */
93333 return false;
93334 }
93335- ACCESS_ONCE(rsp->gp_flags) = RCU_GP_FLAG_INIT;
93336+ ACCESS_ONCE_RW(rsp->gp_flags) = RCU_GP_FLAG_INIT;
93337 trace_rcu_grace_period(rsp->name, ACCESS_ONCE(rsp->gpnum),
93338 TPS("newreq"));
93339
93340@@ -2228,7 +2228,7 @@ rcu_send_cbs_to_orphanage(int cpu, struct rcu_state *rsp,
93341 rsp->qlen += rdp->qlen;
93342 rdp->n_cbs_orphaned += rdp->qlen;
93343 rdp->qlen_lazy = 0;
93344- ACCESS_ONCE(rdp->qlen) = 0;
93345+ ACCESS_ONCE_RW(rdp->qlen) = 0;
93346 }
93347
93348 /*
93349@@ -2490,7 +2490,7 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
93350 }
93351 smp_mb(); /* List handling before counting for rcu_barrier(). */
93352 rdp->qlen_lazy -= count_lazy;
93353- ACCESS_ONCE(rdp->qlen) = rdp->qlen - count;
93354+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen - count;
93355 rdp->n_cbs_invoked += count;
93356
93357 /* Reinstate batch limit if we have worked down the excess. */
93358@@ -2647,7 +2647,7 @@ static void force_quiescent_state(struct rcu_state *rsp)
93359 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
93360 return; /* Someone beat us to it. */
93361 }
93362- ACCESS_ONCE(rsp->gp_flags) =
93363+ ACCESS_ONCE_RW(rsp->gp_flags) =
93364 ACCESS_ONCE(rsp->gp_flags) | RCU_GP_FLAG_FQS;
93365 raw_spin_unlock_irqrestore(&rnp_old->lock, flags);
93366 rcu_gp_kthread_wake(rsp);
93367@@ -2693,7 +2693,7 @@ __rcu_process_callbacks(struct rcu_state *rsp)
93368 /*
93369 * Do RCU core processing for the current CPU.
93370 */
93371-static void rcu_process_callbacks(struct softirq_action *unused)
93372+static void rcu_process_callbacks(void)
93373 {
93374 struct rcu_state *rsp;
93375
93376@@ -2805,7 +2805,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
93377 WARN_ON_ONCE((unsigned long)head & 0x1); /* Misaligned rcu_head! */
93378 if (debug_rcu_head_queue(head)) {
93379 /* Probable double call_rcu(), so leak the callback. */
93380- ACCESS_ONCE(head->func) = rcu_leak_callback;
93381+ ACCESS_ONCE_RW(head->func) = rcu_leak_callback;
93382 WARN_ONCE(1, "__call_rcu(): Leaked duplicate callback\n");
93383 return;
93384 }
93385@@ -2833,7 +2833,7 @@ __call_rcu(struct rcu_head *head, void (*func)(struct rcu_head *rcu),
93386 local_irq_restore(flags);
93387 return;
93388 }
93389- ACCESS_ONCE(rdp->qlen) = rdp->qlen + 1;
93390+ ACCESS_ONCE_RW(rdp->qlen) = rdp->qlen + 1;
93391 if (lazy)
93392 rdp->qlen_lazy++;
93393 else
93394@@ -3106,11 +3106,11 @@ void synchronize_sched_expedited(void)
93395 * counter wrap on a 32-bit system. Quite a few more CPUs would of
93396 * course be required on a 64-bit system.
93397 */
93398- if (ULONG_CMP_GE((ulong)atomic_long_read(&rsp->expedited_start),
93399+ if (ULONG_CMP_GE((ulong)atomic_long_read_unchecked(&rsp->expedited_start),
93400 (ulong)atomic_long_read(&rsp->expedited_done) +
93401 ULONG_MAX / 8)) {
93402 synchronize_sched();
93403- atomic_long_inc(&rsp->expedited_wrap);
93404+ atomic_long_inc_unchecked(&rsp->expedited_wrap);
93405 return;
93406 }
93407
93408@@ -3118,12 +3118,12 @@ void synchronize_sched_expedited(void)
93409 * Take a ticket. Note that atomic_inc_return() implies a
93410 * full memory barrier.
93411 */
93412- snap = atomic_long_inc_return(&rsp->expedited_start);
93413+ snap = atomic_long_inc_return_unchecked(&rsp->expedited_start);
93414 firstsnap = snap;
93415 if (!try_get_online_cpus()) {
93416 /* CPU hotplug operation in flight, fall back to normal GP. */
93417 wait_rcu_gp(call_rcu_sched);
93418- atomic_long_inc(&rsp->expedited_normal);
93419+ atomic_long_inc_unchecked(&rsp->expedited_normal);
93420 return;
93421 }
93422 WARN_ON_ONCE(cpu_is_offline(raw_smp_processor_id()));
93423@@ -3136,7 +3136,7 @@ void synchronize_sched_expedited(void)
93424 for_each_cpu(cpu, cm) {
93425 struct rcu_dynticks *rdtp = &per_cpu(rcu_dynticks, cpu);
93426
93427- if (!(atomic_add_return(0, &rdtp->dynticks) & 0x1))
93428+ if (!(atomic_add_return_unchecked(0, &rdtp->dynticks) & 0x1))
93429 cpumask_clear_cpu(cpu, cm);
93430 }
93431 if (cpumask_weight(cm) == 0)
93432@@ -3151,14 +3151,14 @@ void synchronize_sched_expedited(void)
93433 synchronize_sched_expedited_cpu_stop,
93434 NULL) == -EAGAIN) {
93435 put_online_cpus();
93436- atomic_long_inc(&rsp->expedited_tryfail);
93437+ atomic_long_inc_unchecked(&rsp->expedited_tryfail);
93438
93439 /* Check to see if someone else did our work for us. */
93440 s = atomic_long_read(&rsp->expedited_done);
93441 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
93442 /* ensure test happens before caller kfree */
93443 smp_mb__before_atomic(); /* ^^^ */
93444- atomic_long_inc(&rsp->expedited_workdone1);
93445+ atomic_long_inc_unchecked(&rsp->expedited_workdone1);
93446 free_cpumask_var(cm);
93447 return;
93448 }
93449@@ -3168,7 +3168,7 @@ void synchronize_sched_expedited(void)
93450 udelay(trycount * num_online_cpus());
93451 } else {
93452 wait_rcu_gp(call_rcu_sched);
93453- atomic_long_inc(&rsp->expedited_normal);
93454+ atomic_long_inc_unchecked(&rsp->expedited_normal);
93455 free_cpumask_var(cm);
93456 return;
93457 }
93458@@ -3178,7 +3178,7 @@ void synchronize_sched_expedited(void)
93459 if (ULONG_CMP_GE((ulong)s, (ulong)firstsnap)) {
93460 /* ensure test happens before caller kfree */
93461 smp_mb__before_atomic(); /* ^^^ */
93462- atomic_long_inc(&rsp->expedited_workdone2);
93463+ atomic_long_inc_unchecked(&rsp->expedited_workdone2);
93464 free_cpumask_var(cm);
93465 return;
93466 }
93467@@ -3193,14 +3193,14 @@ void synchronize_sched_expedited(void)
93468 if (!try_get_online_cpus()) {
93469 /* CPU hotplug operation in flight, use normal GP. */
93470 wait_rcu_gp(call_rcu_sched);
93471- atomic_long_inc(&rsp->expedited_normal);
93472+ atomic_long_inc_unchecked(&rsp->expedited_normal);
93473 free_cpumask_var(cm);
93474 return;
93475 }
93476- snap = atomic_long_read(&rsp->expedited_start);
93477+ snap = atomic_long_read_unchecked(&rsp->expedited_start);
93478 smp_mb(); /* ensure read is before try_stop_cpus(). */
93479 }
93480- atomic_long_inc(&rsp->expedited_stoppedcpus);
93481+ atomic_long_inc_unchecked(&rsp->expedited_stoppedcpus);
93482
93483 all_cpus_idle:
93484 free_cpumask_var(cm);
93485@@ -3212,16 +3212,16 @@ all_cpus_idle:
93486 * than we did already did their update.
93487 */
93488 do {
93489- atomic_long_inc(&rsp->expedited_done_tries);
93490+ atomic_long_inc_unchecked(&rsp->expedited_done_tries);
93491 s = atomic_long_read(&rsp->expedited_done);
93492 if (ULONG_CMP_GE((ulong)s, (ulong)snap)) {
93493 /* ensure test happens before caller kfree */
93494 smp_mb__before_atomic(); /* ^^^ */
93495- atomic_long_inc(&rsp->expedited_done_lost);
93496+ atomic_long_inc_unchecked(&rsp->expedited_done_lost);
93497 break;
93498 }
93499 } while (atomic_long_cmpxchg(&rsp->expedited_done, s, snap) != s);
93500- atomic_long_inc(&rsp->expedited_done_exit);
93501+ atomic_long_inc_unchecked(&rsp->expedited_done_exit);
93502
93503 put_online_cpus();
93504 }
93505@@ -3431,7 +3431,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
93506 * ACCESS_ONCE() to prevent the compiler from speculating
93507 * the increment to precede the early-exit check.
93508 */
93509- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
93510+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
93511 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 1);
93512 _rcu_barrier_trace(rsp, "Inc1", -1, rsp->n_barrier_done);
93513 smp_mb(); /* Order ->n_barrier_done increment with below mechanism. */
93514@@ -3487,7 +3487,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
93515
93516 /* Increment ->n_barrier_done to prevent duplicate work. */
93517 smp_mb(); /* Keep increment after above mechanism. */
93518- ACCESS_ONCE(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
93519+ ACCESS_ONCE_RW(rsp->n_barrier_done) = rsp->n_barrier_done + 1;
93520 WARN_ON_ONCE((rsp->n_barrier_done & 0x1) != 0);
93521 _rcu_barrier_trace(rsp, "Inc2", -1, rsp->n_barrier_done);
93522 smp_mb(); /* Keep increment before caller's subsequent code. */
93523@@ -3532,7 +3532,7 @@ rcu_boot_init_percpu_data(int cpu, struct rcu_state *rsp)
93524 rdp->grpmask = 1UL << (cpu - rdp->mynode->grplo);
93525 rdp->dynticks = &per_cpu(rcu_dynticks, cpu);
93526 WARN_ON_ONCE(rdp->dynticks->dynticks_nesting != DYNTICK_TASK_EXIT_IDLE);
93527- WARN_ON_ONCE(atomic_read(&rdp->dynticks->dynticks) != 1);
93528+ WARN_ON_ONCE(atomic_read_unchecked(&rdp->dynticks->dynticks) != 1);
93529 rdp->cpu = cpu;
93530 rdp->rsp = rsp;
93531 rcu_boot_init_nocb_percpu_data(rdp);
93532@@ -3565,8 +3565,8 @@ rcu_init_percpu_data(int cpu, struct rcu_state *rsp)
93533 init_callback_list(rdp); /* Re-enable callbacks on this CPU. */
93534 rdp->dynticks->dynticks_nesting = DYNTICK_TASK_EXIT_IDLE;
93535 rcu_sysidle_init_percpu_data(rdp->dynticks);
93536- atomic_set(&rdp->dynticks->dynticks,
93537- (atomic_read(&rdp->dynticks->dynticks) & ~0x1) + 1);
93538+ atomic_set_unchecked(&rdp->dynticks->dynticks,
93539+ (atomic_read_unchecked(&rdp->dynticks->dynticks) & ~0x1) + 1);
93540 raw_spin_unlock(&rnp->lock); /* irqs remain disabled. */
93541
93542 /* Add CPU to rcu_node bitmasks. */
93543diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
93544index 119de39..f07d31a 100644
93545--- a/kernel/rcu/tree.h
93546+++ b/kernel/rcu/tree.h
93547@@ -86,11 +86,11 @@ struct rcu_dynticks {
93548 long long dynticks_nesting; /* Track irq/process nesting level. */
93549 /* Process level is worth LLONG_MAX/2. */
93550 int dynticks_nmi_nesting; /* Track NMI nesting level. */
93551- atomic_t dynticks; /* Even value for idle, else odd. */
93552+ atomic_unchecked_t dynticks;/* Even value for idle, else odd. */
93553 #ifdef CONFIG_NO_HZ_FULL_SYSIDLE
93554 long long dynticks_idle_nesting;
93555 /* irq/process nesting level from idle. */
93556- atomic_t dynticks_idle; /* Even value for idle, else odd. */
93557+ atomic_unchecked_t dynticks_idle;/* Even value for idle, else odd. */
93558 /* "Idle" excludes userspace execution. */
93559 unsigned long dynticks_idle_jiffies;
93560 /* End of last non-NMI non-idle period. */
93561@@ -457,17 +457,17 @@ struct rcu_state {
93562 /* _rcu_barrier(). */
93563 /* End of fields guarded by barrier_mutex. */
93564
93565- atomic_long_t expedited_start; /* Starting ticket. */
93566- atomic_long_t expedited_done; /* Done ticket. */
93567- atomic_long_t expedited_wrap; /* # near-wrap incidents. */
93568- atomic_long_t expedited_tryfail; /* # acquisition failures. */
93569- atomic_long_t expedited_workdone1; /* # done by others #1. */
93570- atomic_long_t expedited_workdone2; /* # done by others #2. */
93571- atomic_long_t expedited_normal; /* # fallbacks to normal. */
93572- atomic_long_t expedited_stoppedcpus; /* # successful stop_cpus. */
93573- atomic_long_t expedited_done_tries; /* # tries to update _done. */
93574- atomic_long_t expedited_done_lost; /* # times beaten to _done. */
93575- atomic_long_t expedited_done_exit; /* # times exited _done loop. */
93576+ atomic_long_unchecked_t expedited_start; /* Starting ticket. */
93577+ atomic_long_t expedited_done; /* Done ticket. */
93578+ atomic_long_unchecked_t expedited_wrap; /* # near-wrap incidents. */
93579+ atomic_long_unchecked_t expedited_tryfail; /* # acquisition failures. */
93580+ atomic_long_unchecked_t expedited_workdone1; /* # done by others #1. */
93581+ atomic_long_unchecked_t expedited_workdone2; /* # done by others #2. */
93582+ atomic_long_unchecked_t expedited_normal; /* # fallbacks to normal. */
93583+ atomic_long_unchecked_t expedited_stoppedcpus; /* # successful stop_cpus. */
93584+ atomic_long_unchecked_t expedited_done_tries; /* # tries to update _done. */
93585+ atomic_long_unchecked_t expedited_done_lost; /* # times beaten to _done. */
93586+ atomic_long_unchecked_t expedited_done_exit; /* # times exited _done loop. */
93587
93588 unsigned long jiffies_force_qs; /* Time at which to invoke */
93589 /* force_quiescent_state(). */
93590diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
93591index 0a571e9..fbfd611 100644
93592--- a/kernel/rcu/tree_plugin.h
93593+++ b/kernel/rcu/tree_plugin.h
93594@@ -619,7 +619,7 @@ static int rcu_preempted_readers_exp(struct rcu_node *rnp)
93595 static int sync_rcu_preempt_exp_done(struct rcu_node *rnp)
93596 {
93597 return !rcu_preempted_readers_exp(rnp) &&
93598- ACCESS_ONCE(rnp->expmask) == 0;
93599+ ACCESS_ONCE_RW(rnp->expmask) == 0;
93600 }
93601
93602 /*
93603@@ -780,7 +780,7 @@ void synchronize_rcu_expedited(void)
93604
93605 /* Clean up and exit. */
93606 smp_mb(); /* ensure expedited GP seen before counter increment. */
93607- ACCESS_ONCE(sync_rcu_preempt_exp_count) =
93608+ ACCESS_ONCE_RW(sync_rcu_preempt_exp_count) =
93609 sync_rcu_preempt_exp_count + 1;
93610 unlock_mb_ret:
93611 mutex_unlock(&sync_rcu_preempt_exp_mutex);
93612@@ -1290,7 +1290,7 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
93613 free_cpumask_var(cm);
93614 }
93615
93616-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
93617+static struct smp_hotplug_thread rcu_cpu_thread_spec __read_only = {
93618 .store = &rcu_cpu_kthread_task,
93619 .thread_should_run = rcu_cpu_kthread_should_run,
93620 .thread_fn = rcu_cpu_kthread,
93621@@ -1761,7 +1761,7 @@ static void print_cpu_stall_info(struct rcu_state *rsp, int cpu)
93622 print_cpu_stall_fast_no_hz(fast_no_hz, cpu);
93623 pr_err("\t%d: (%lu %s) idle=%03x/%llx/%d softirq=%u/%u fqs=%ld %s\n",
93624 cpu, ticks_value, ticks_title,
93625- atomic_read(&rdtp->dynticks) & 0xfff,
93626+ atomic_read_unchecked(&rdtp->dynticks) & 0xfff,
93627 rdtp->dynticks_nesting, rdtp->dynticks_nmi_nesting,
93628 rdp->softirq_snap, kstat_softirqs_cpu(RCU_SOFTIRQ, cpu),
93629 ACCESS_ONCE(rsp->n_force_qs) - rsp->n_force_qs_gpstart,
93630@@ -1906,7 +1906,7 @@ static void wake_nocb_leader(struct rcu_data *rdp, bool force)
93631 return;
93632 if (ACCESS_ONCE(rdp_leader->nocb_leader_sleep) || force) {
93633 /* Prior smp_mb__after_atomic() orders against prior enqueue. */
93634- ACCESS_ONCE(rdp_leader->nocb_leader_sleep) = false;
93635+ ACCESS_ONCE_RW(rdp_leader->nocb_leader_sleep) = false;
93636 wake_up(&rdp_leader->nocb_wq);
93637 }
93638 }
93639@@ -1978,7 +1978,7 @@ static void __call_rcu_nocb_enqueue(struct rcu_data *rdp,
93640 atomic_long_add(rhcount, &rdp->nocb_q_count);
93641 /* rcu_barrier() relies on ->nocb_q_count add before xchg. */
93642 old_rhpp = xchg(&rdp->nocb_tail, rhtp);
93643- ACCESS_ONCE(*old_rhpp) = rhp;
93644+ ACCESS_ONCE_RW(*old_rhpp) = rhp;
93645 atomic_long_add(rhcount_lazy, &rdp->nocb_q_count_lazy);
93646 smp_mb__after_atomic(); /* Store *old_rhpp before _wake test. */
93647
93648@@ -2167,7 +2167,7 @@ wait_again:
93649 continue; /* No CBs here, try next follower. */
93650
93651 /* Move callbacks to wait-for-GP list, which is empty. */
93652- ACCESS_ONCE(rdp->nocb_head) = NULL;
93653+ ACCESS_ONCE_RW(rdp->nocb_head) = NULL;
93654 rdp->nocb_gp_tail = xchg(&rdp->nocb_tail, &rdp->nocb_head);
93655 gotcbs = true;
93656 }
93657@@ -2288,7 +2288,7 @@ static int rcu_nocb_kthread(void *arg)
93658 list = ACCESS_ONCE(rdp->nocb_follower_head);
93659 BUG_ON(!list);
93660 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, "WokeNonEmpty");
93661- ACCESS_ONCE(rdp->nocb_follower_head) = NULL;
93662+ ACCESS_ONCE_RW(rdp->nocb_follower_head) = NULL;
93663 tail = xchg(&rdp->nocb_follower_tail, &rdp->nocb_follower_head);
93664
93665 /* Each pass through the following loop invokes a callback. */
93666@@ -2338,7 +2338,7 @@ static void do_nocb_deferred_wakeup(struct rcu_data *rdp)
93667 if (!rcu_nocb_need_deferred_wakeup(rdp))
93668 return;
93669 ndw = ACCESS_ONCE(rdp->nocb_defer_wakeup);
93670- ACCESS_ONCE(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
93671+ ACCESS_ONCE_RW(rdp->nocb_defer_wakeup) = RCU_NOGP_WAKE_NOT;
93672 wake_nocb_leader(rdp, ndw == RCU_NOGP_WAKE_FORCE);
93673 trace_rcu_nocb_wake(rdp->rsp->name, rdp->cpu, TPS("DeferredWake"));
93674 }
93675@@ -2461,7 +2461,7 @@ static void rcu_spawn_one_nocb_kthread(struct rcu_state *rsp, int cpu)
93676 t = kthread_run(rcu_nocb_kthread, rdp_spawn,
93677 "rcuo%c/%d", rsp->abbr, cpu);
93678 BUG_ON(IS_ERR(t));
93679- ACCESS_ONCE(rdp_spawn->nocb_kthread) = t;
93680+ ACCESS_ONCE_RW(rdp_spawn->nocb_kthread) = t;
93681 }
93682
93683 /*
93684@@ -2666,11 +2666,11 @@ static void rcu_sysidle_enter(int irq)
93685
93686 /* Record start of fully idle period. */
93687 j = jiffies;
93688- ACCESS_ONCE(rdtp->dynticks_idle_jiffies) = j;
93689+ ACCESS_ONCE_RW(rdtp->dynticks_idle_jiffies) = j;
93690 smp_mb__before_atomic();
93691- atomic_inc(&rdtp->dynticks_idle);
93692+ atomic_inc_unchecked(&rdtp->dynticks_idle);
93693 smp_mb__after_atomic();
93694- WARN_ON_ONCE(atomic_read(&rdtp->dynticks_idle) & 0x1);
93695+ WARN_ON_ONCE(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1);
93696 }
93697
93698 /*
93699@@ -2741,9 +2741,9 @@ static void rcu_sysidle_exit(int irq)
93700
93701 /* Record end of idle period. */
93702 smp_mb__before_atomic();
93703- atomic_inc(&rdtp->dynticks_idle);
93704+ atomic_inc_unchecked(&rdtp->dynticks_idle);
93705 smp_mb__after_atomic();
93706- WARN_ON_ONCE(!(atomic_read(&rdtp->dynticks_idle) & 0x1));
93707+ WARN_ON_ONCE(!(atomic_read_unchecked(&rdtp->dynticks_idle) & 0x1));
93708
93709 /*
93710 * If we are the timekeeping CPU, we are permitted to be non-idle
93711@@ -2788,7 +2788,7 @@ static void rcu_sysidle_check_cpu(struct rcu_data *rdp, bool *isidle,
93712 WARN_ON_ONCE(smp_processor_id() != tick_do_timer_cpu);
93713
93714 /* Pick up current idle and NMI-nesting counter and check. */
93715- cur = atomic_read(&rdtp->dynticks_idle);
93716+ cur = atomic_read_unchecked(&rdtp->dynticks_idle);
93717 if (cur & 0x1) {
93718 *isidle = false; /* We are not idle! */
93719 return;
93720@@ -2837,7 +2837,7 @@ static void rcu_sysidle(unsigned long j)
93721 case RCU_SYSIDLE_NOT:
93722
93723 /* First time all are idle, so note a short idle period. */
93724- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_SHORT;
93725+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_SHORT;
93726 break;
93727
93728 case RCU_SYSIDLE_SHORT:
93729@@ -2875,7 +2875,7 @@ static void rcu_sysidle_cancel(void)
93730 {
93731 smp_mb();
93732 if (full_sysidle_state > RCU_SYSIDLE_SHORT)
93733- ACCESS_ONCE(full_sysidle_state) = RCU_SYSIDLE_NOT;
93734+ ACCESS_ONCE_RW(full_sysidle_state) = RCU_SYSIDLE_NOT;
93735 }
93736
93737 /*
93738@@ -2927,7 +2927,7 @@ static void rcu_sysidle_cb(struct rcu_head *rhp)
93739 smp_mb(); /* grace period precedes setting inuse. */
93740
93741 rshp = container_of(rhp, struct rcu_sysidle_head, rh);
93742- ACCESS_ONCE(rshp->inuse) = 0;
93743+ ACCESS_ONCE_RW(rshp->inuse) = 0;
93744 }
93745
93746 /*
93747@@ -3080,7 +3080,7 @@ static void rcu_bind_gp_kthread(void)
93748 static void rcu_dynticks_task_enter(void)
93749 {
93750 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
93751- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = smp_processor_id();
93752+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = smp_processor_id();
93753 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
93754 }
93755
93756@@ -3088,6 +3088,6 @@ static void rcu_dynticks_task_enter(void)
93757 static void rcu_dynticks_task_exit(void)
93758 {
93759 #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL)
93760- ACCESS_ONCE(current->rcu_tasks_idle_cpu) = -1;
93761+ ACCESS_ONCE_RW(current->rcu_tasks_idle_cpu) = -1;
93762 #endif /* #if defined(CONFIG_TASKS_RCU) && defined(CONFIG_NO_HZ_FULL) */
93763 }
93764diff --git a/kernel/rcu/tree_trace.c b/kernel/rcu/tree_trace.c
93765index fbb6240..f6c5097 100644
93766--- a/kernel/rcu/tree_trace.c
93767+++ b/kernel/rcu/tree_trace.c
93768@@ -125,7 +125,7 @@ static void print_one_rcu_data(struct seq_file *m, struct rcu_data *rdp)
93769 rdp->rcu_qs_ctr_snap == per_cpu(rcu_qs_ctr, rdp->cpu),
93770 rdp->qs_pending);
93771 seq_printf(m, " dt=%d/%llx/%d df=%lu",
93772- atomic_read(&rdp->dynticks->dynticks),
93773+ atomic_read_unchecked(&rdp->dynticks->dynticks),
93774 rdp->dynticks->dynticks_nesting,
93775 rdp->dynticks->dynticks_nmi_nesting,
93776 rdp->dynticks_fqs);
93777@@ -186,17 +186,17 @@ static int show_rcuexp(struct seq_file *m, void *v)
93778 struct rcu_state *rsp = (struct rcu_state *)m->private;
93779
93780 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",
93781- atomic_long_read(&rsp->expedited_start),
93782+ atomic_long_read_unchecked(&rsp->expedited_start),
93783 atomic_long_read(&rsp->expedited_done),
93784- atomic_long_read(&rsp->expedited_wrap),
93785- atomic_long_read(&rsp->expedited_tryfail),
93786- atomic_long_read(&rsp->expedited_workdone1),
93787- atomic_long_read(&rsp->expedited_workdone2),
93788- atomic_long_read(&rsp->expedited_normal),
93789- atomic_long_read(&rsp->expedited_stoppedcpus),
93790- atomic_long_read(&rsp->expedited_done_tries),
93791- atomic_long_read(&rsp->expedited_done_lost),
93792- atomic_long_read(&rsp->expedited_done_exit));
93793+ atomic_long_read_unchecked(&rsp->expedited_wrap),
93794+ atomic_long_read_unchecked(&rsp->expedited_tryfail),
93795+ atomic_long_read_unchecked(&rsp->expedited_workdone1),
93796+ atomic_long_read_unchecked(&rsp->expedited_workdone2),
93797+ atomic_long_read_unchecked(&rsp->expedited_normal),
93798+ atomic_long_read_unchecked(&rsp->expedited_stoppedcpus),
93799+ atomic_long_read_unchecked(&rsp->expedited_done_tries),
93800+ atomic_long_read_unchecked(&rsp->expedited_done_lost),
93801+ atomic_long_read_unchecked(&rsp->expedited_done_exit));
93802 return 0;
93803 }
93804
93805diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
93806index e0d31a3..f4dafe3 100644
93807--- a/kernel/rcu/update.c
93808+++ b/kernel/rcu/update.c
93809@@ -342,10 +342,10 @@ int rcu_jiffies_till_stall_check(void)
93810 * for CONFIG_RCU_CPU_STALL_TIMEOUT.
93811 */
93812 if (till_stall_check < 3) {
93813- ACCESS_ONCE(rcu_cpu_stall_timeout) = 3;
93814+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 3;
93815 till_stall_check = 3;
93816 } else if (till_stall_check > 300) {
93817- ACCESS_ONCE(rcu_cpu_stall_timeout) = 300;
93818+ ACCESS_ONCE_RW(rcu_cpu_stall_timeout) = 300;
93819 till_stall_check = 300;
93820 }
93821 return till_stall_check * HZ + RCU_STALL_DELAY_DELTA;
93822@@ -501,7 +501,7 @@ static void check_holdout_task(struct task_struct *t,
93823 !ACCESS_ONCE(t->on_rq) ||
93824 (IS_ENABLED(CONFIG_NO_HZ_FULL) &&
93825 !is_idle_task(t) && t->rcu_tasks_idle_cpu >= 0)) {
93826- ACCESS_ONCE(t->rcu_tasks_holdout) = false;
93827+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = false;
93828 list_del_init(&t->rcu_tasks_holdout_list);
93829 put_task_struct(t);
93830 return;
93831@@ -589,7 +589,7 @@ static int __noreturn rcu_tasks_kthread(void *arg)
93832 !is_idle_task(t)) {
93833 get_task_struct(t);
93834 t->rcu_tasks_nvcsw = ACCESS_ONCE(t->nvcsw);
93835- ACCESS_ONCE(t->rcu_tasks_holdout) = true;
93836+ ACCESS_ONCE_RW(t->rcu_tasks_holdout) = true;
93837 list_add(&t->rcu_tasks_holdout_list,
93838 &rcu_tasks_holdouts);
93839 }
93840@@ -686,7 +686,7 @@ static void rcu_spawn_tasks_kthread(void)
93841 t = kthread_run(rcu_tasks_kthread, NULL, "rcu_tasks_kthread");
93842 BUG_ON(IS_ERR(t));
93843 smp_mb(); /* Ensure others see full kthread. */
93844- ACCESS_ONCE(rcu_tasks_kthread_ptr) = t;
93845+ ACCESS_ONCE_RW(rcu_tasks_kthread_ptr) = t;
93846 mutex_unlock(&rcu_tasks_kthread_mutex);
93847 }
93848
93849diff --git a/kernel/resource.c b/kernel/resource.c
93850index 19f2357..ebe7f35 100644
93851--- a/kernel/resource.c
93852+++ b/kernel/resource.c
93853@@ -162,8 +162,18 @@ static const struct file_operations proc_iomem_operations = {
93854
93855 static int __init ioresources_init(void)
93856 {
93857+#ifdef CONFIG_GRKERNSEC_PROC_ADD
93858+#ifdef CONFIG_GRKERNSEC_PROC_USER
93859+ proc_create("ioports", S_IRUSR, NULL, &proc_ioports_operations);
93860+ proc_create("iomem", S_IRUSR, NULL, &proc_iomem_operations);
93861+#elif defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
93862+ proc_create("ioports", S_IRUSR | S_IRGRP, NULL, &proc_ioports_operations);
93863+ proc_create("iomem", S_IRUSR | S_IRGRP, NULL, &proc_iomem_operations);
93864+#endif
93865+#else
93866 proc_create("ioports", 0, NULL, &proc_ioports_operations);
93867 proc_create("iomem", 0, NULL, &proc_iomem_operations);
93868+#endif
93869 return 0;
93870 }
93871 __initcall(ioresources_init);
93872diff --git a/kernel/sched/auto_group.c b/kernel/sched/auto_group.c
93873index eae160d..c9aa22e 100644
93874--- a/kernel/sched/auto_group.c
93875+++ b/kernel/sched/auto_group.c
93876@@ -11,7 +11,7 @@
93877
93878 unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
93879 static struct autogroup autogroup_default;
93880-static atomic_t autogroup_seq_nr;
93881+static atomic_unchecked_t autogroup_seq_nr;
93882
93883 void __init autogroup_init(struct task_struct *init_task)
93884 {
93885@@ -79,7 +79,7 @@ static inline struct autogroup *autogroup_create(void)
93886
93887 kref_init(&ag->kref);
93888 init_rwsem(&ag->lock);
93889- ag->id = atomic_inc_return(&autogroup_seq_nr);
93890+ ag->id = atomic_inc_return_unchecked(&autogroup_seq_nr);
93891 ag->tg = tg;
93892 #ifdef CONFIG_RT_GROUP_SCHED
93893 /*
93894diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
93895index 8d0f35d..c16360d 100644
93896--- a/kernel/sched/completion.c
93897+++ b/kernel/sched/completion.c
93898@@ -205,7 +205,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible);
93899 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
93900 * or number of jiffies left till timeout) if completed.
93901 */
93902-long __sched
93903+long __sched __intentional_overflow(-1)
93904 wait_for_completion_interruptible_timeout(struct completion *x,
93905 unsigned long timeout)
93906 {
93907@@ -222,7 +222,7 @@ EXPORT_SYMBOL(wait_for_completion_interruptible_timeout);
93908 *
93909 * Return: -ERESTARTSYS if interrupted, 0 if completed.
93910 */
93911-int __sched wait_for_completion_killable(struct completion *x)
93912+int __sched __intentional_overflow(-1) wait_for_completion_killable(struct completion *x)
93913 {
93914 long t = wait_for_common(x, MAX_SCHEDULE_TIMEOUT, TASK_KILLABLE);
93915 if (t == -ERESTARTSYS)
93916@@ -243,7 +243,7 @@ EXPORT_SYMBOL(wait_for_completion_killable);
93917 * Return: -ERESTARTSYS if interrupted, 0 if timed out, positive (at least 1,
93918 * or number of jiffies left till timeout) if completed.
93919 */
93920-long __sched
93921+long __sched __intentional_overflow(-1)
93922 wait_for_completion_killable_timeout(struct completion *x,
93923 unsigned long timeout)
93924 {
93925diff --git a/kernel/sched/core.c b/kernel/sched/core.c
93926index 3d5f6f6..a94298f 100644
93927--- a/kernel/sched/core.c
93928+++ b/kernel/sched/core.c
93929@@ -1862,7 +1862,7 @@ void set_numabalancing_state(bool enabled)
93930 int sysctl_numa_balancing(struct ctl_table *table, int write,
93931 void __user *buffer, size_t *lenp, loff_t *ppos)
93932 {
93933- struct ctl_table t;
93934+ ctl_table_no_const t;
93935 int err;
93936 int state = numabalancing_enabled;
93937
93938@@ -2312,8 +2312,10 @@ context_switch(struct rq *rq, struct task_struct *prev,
93939 next->active_mm = oldmm;
93940 atomic_inc(&oldmm->mm_count);
93941 enter_lazy_tlb(oldmm, next);
93942- } else
93943+ } else {
93944 switch_mm(oldmm, mm, next);
93945+ populate_stack();
93946+ }
93947
93948 if (!prev->mm) {
93949 prev->active_mm = NULL;
93950@@ -3124,6 +3126,8 @@ int can_nice(const struct task_struct *p, const int nice)
93951 /* convert nice value [19,-20] to rlimit style value [1,40] */
93952 int nice_rlim = nice_to_rlimit(nice);
93953
93954+ gr_learn_resource(p, RLIMIT_NICE, nice_rlim, 1);
93955+
93956 return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
93957 capable(CAP_SYS_NICE));
93958 }
93959@@ -3150,7 +3154,8 @@ SYSCALL_DEFINE1(nice, int, increment)
93960 nice = task_nice(current) + increment;
93961
93962 nice = clamp_val(nice, MIN_NICE, MAX_NICE);
93963- if (increment < 0 && !can_nice(current, nice))
93964+ if (increment < 0 && (!can_nice(current, nice) ||
93965+ gr_handle_chroot_nice()))
93966 return -EPERM;
93967
93968 retval = security_task_setnice(current, nice);
93969@@ -3459,6 +3464,7 @@ recheck:
93970 if (policy != p->policy && !rlim_rtprio)
93971 return -EPERM;
93972
93973+ gr_learn_resource(p, RLIMIT_RTPRIO, attr->sched_priority, 1);
93974 /* can't increase priority */
93975 if (attr->sched_priority > p->rt_priority &&
93976 attr->sched_priority > rlim_rtprio)
93977@@ -4946,6 +4952,7 @@ void idle_task_exit(void)
93978
93979 if (mm != &init_mm) {
93980 switch_mm(mm, &init_mm, current);
93981+ populate_stack();
93982 finish_arch_post_lock_switch();
93983 }
93984 mmdrop(mm);
93985@@ -5041,7 +5048,7 @@ static void migrate_tasks(unsigned int dead_cpu)
93986
93987 #if defined(CONFIG_SCHED_DEBUG) && defined(CONFIG_SYSCTL)
93988
93989-static struct ctl_table sd_ctl_dir[] = {
93990+static ctl_table_no_const sd_ctl_dir[] __read_only = {
93991 {
93992 .procname = "sched_domain",
93993 .mode = 0555,
93994@@ -5058,17 +5065,17 @@ static struct ctl_table sd_ctl_root[] = {
93995 {}
93996 };
93997
93998-static struct ctl_table *sd_alloc_ctl_entry(int n)
93999+static ctl_table_no_const *sd_alloc_ctl_entry(int n)
94000 {
94001- struct ctl_table *entry =
94002+ ctl_table_no_const *entry =
94003 kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL);
94004
94005 return entry;
94006 }
94007
94008-static void sd_free_ctl_entry(struct ctl_table **tablep)
94009+static void sd_free_ctl_entry(ctl_table_no_const *tablep)
94010 {
94011- struct ctl_table *entry;
94012+ ctl_table_no_const *entry;
94013
94014 /*
94015 * In the intermediate directories, both the child directory and
94016@@ -5076,22 +5083,25 @@ static void sd_free_ctl_entry(struct ctl_table **tablep)
94017 * will always be set. In the lowest directory the names are
94018 * static strings and all have proc handlers.
94019 */
94020- for (entry = *tablep; entry->mode; entry++) {
94021- if (entry->child)
94022- sd_free_ctl_entry(&entry->child);
94023+ for (entry = tablep; entry->mode; entry++) {
94024+ if (entry->child) {
94025+ sd_free_ctl_entry(entry->child);
94026+ pax_open_kernel();
94027+ entry->child = NULL;
94028+ pax_close_kernel();
94029+ }
94030 if (entry->proc_handler == NULL)
94031 kfree(entry->procname);
94032 }
94033
94034- kfree(*tablep);
94035- *tablep = NULL;
94036+ kfree(tablep);
94037 }
94038
94039 static int min_load_idx = 0;
94040 static int max_load_idx = CPU_LOAD_IDX_MAX-1;
94041
94042 static void
94043-set_table_entry(struct ctl_table *entry,
94044+set_table_entry(ctl_table_no_const *entry,
94045 const char *procname, void *data, int maxlen,
94046 umode_t mode, proc_handler *proc_handler,
94047 bool load_idx)
94048@@ -5111,7 +5121,7 @@ set_table_entry(struct ctl_table *entry,
94049 static struct ctl_table *
94050 sd_alloc_ctl_domain_table(struct sched_domain *sd)
94051 {
94052- struct ctl_table *table = sd_alloc_ctl_entry(14);
94053+ ctl_table_no_const *table = sd_alloc_ctl_entry(14);
94054
94055 if (table == NULL)
94056 return NULL;
94057@@ -5149,9 +5159,9 @@ sd_alloc_ctl_domain_table(struct sched_domain *sd)
94058 return table;
94059 }
94060
94061-static struct ctl_table *sd_alloc_ctl_cpu_table(int cpu)
94062+static ctl_table_no_const *sd_alloc_ctl_cpu_table(int cpu)
94063 {
94064- struct ctl_table *entry, *table;
94065+ ctl_table_no_const *entry, *table;
94066 struct sched_domain *sd;
94067 int domain_num = 0, i;
94068 char buf[32];
94069@@ -5178,11 +5188,13 @@ static struct ctl_table_header *sd_sysctl_header;
94070 static void register_sched_domain_sysctl(void)
94071 {
94072 int i, cpu_num = num_possible_cpus();
94073- struct ctl_table *entry = sd_alloc_ctl_entry(cpu_num + 1);
94074+ ctl_table_no_const *entry = sd_alloc_ctl_entry(cpu_num + 1);
94075 char buf[32];
94076
94077 WARN_ON(sd_ctl_dir[0].child);
94078+ pax_open_kernel();
94079 sd_ctl_dir[0].child = entry;
94080+ pax_close_kernel();
94081
94082 if (entry == NULL)
94083 return;
94084@@ -5205,8 +5217,12 @@ static void unregister_sched_domain_sysctl(void)
94085 if (sd_sysctl_header)
94086 unregister_sysctl_table(sd_sysctl_header);
94087 sd_sysctl_header = NULL;
94088- if (sd_ctl_dir[0].child)
94089- sd_free_ctl_entry(&sd_ctl_dir[0].child);
94090+ if (sd_ctl_dir[0].child) {
94091+ sd_free_ctl_entry(sd_ctl_dir[0].child);
94092+ pax_open_kernel();
94093+ sd_ctl_dir[0].child = NULL;
94094+ pax_close_kernel();
94095+ }
94096 }
94097 #else
94098 static void register_sched_domain_sysctl(void)
94099diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
94100index 241213b..6a64c91 100644
94101--- a/kernel/sched/fair.c
94102+++ b/kernel/sched/fair.c
94103@@ -2092,7 +2092,7 @@ void task_numa_fault(int last_cpupid, int mem_node, int pages, int flags)
94104
94105 static void reset_ptenuma_scan(struct task_struct *p)
94106 {
94107- ACCESS_ONCE(p->mm->numa_scan_seq)++;
94108+ ACCESS_ONCE_RW(p->mm->numa_scan_seq)++;
94109 p->mm->numa_scan_offset = 0;
94110 }
94111
94112@@ -7656,7 +7656,7 @@ static void nohz_idle_balance(struct rq *this_rq, enum cpu_idle_type idle) { }
94113 * run_rebalance_domains is triggered when needed from the scheduler tick.
94114 * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
94115 */
94116-static void run_rebalance_domains(struct softirq_action *h)
94117+static __latent_entropy void run_rebalance_domains(void)
94118 {
94119 struct rq *this_rq = this_rq();
94120 enum cpu_idle_type idle = this_rq->idle_balance ?
94121diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
94122index dc0f435..ae2e085 100644
94123--- a/kernel/sched/sched.h
94124+++ b/kernel/sched/sched.h
94125@@ -1200,7 +1200,7 @@ struct sched_class {
94126 #ifdef CONFIG_FAIR_GROUP_SCHED
94127 void (*task_move_group) (struct task_struct *p, int on_rq);
94128 #endif
94129-};
94130+} __do_const;
94131
94132 static inline void put_prev_task(struct rq *rq, struct task_struct *prev)
94133 {
94134diff --git a/kernel/signal.c b/kernel/signal.c
94135index a390499..ebe9a21 100644
94136--- a/kernel/signal.c
94137+++ b/kernel/signal.c
94138@@ -53,12 +53,12 @@ static struct kmem_cache *sigqueue_cachep;
94139
94140 int print_fatal_signals __read_mostly;
94141
94142-static void __user *sig_handler(struct task_struct *t, int sig)
94143+static __sighandler_t sig_handler(struct task_struct *t, int sig)
94144 {
94145 return t->sighand->action[sig - 1].sa.sa_handler;
94146 }
94147
94148-static int sig_handler_ignored(void __user *handler, int sig)
94149+static int sig_handler_ignored(__sighandler_t handler, int sig)
94150 {
94151 /* Is it explicitly or implicitly ignored? */
94152 return handler == SIG_IGN ||
94153@@ -67,7 +67,7 @@ static int sig_handler_ignored(void __user *handler, int sig)
94154
94155 static int sig_task_ignored(struct task_struct *t, int sig, bool force)
94156 {
94157- void __user *handler;
94158+ __sighandler_t handler;
94159
94160 handler = sig_handler(t, sig);
94161
94162@@ -372,6 +372,9 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
94163 atomic_inc(&user->sigpending);
94164 rcu_read_unlock();
94165
94166+ if (!override_rlimit)
94167+ gr_learn_resource(t, RLIMIT_SIGPENDING, atomic_read(&user->sigpending), 1);
94168+
94169 if (override_rlimit ||
94170 atomic_read(&user->sigpending) <=
94171 task_rlimit(t, RLIMIT_SIGPENDING)) {
94172@@ -499,7 +502,7 @@ flush_signal_handlers(struct task_struct *t, int force_default)
94173
94174 int unhandled_signal(struct task_struct *tsk, int sig)
94175 {
94176- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
94177+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
94178 if (is_global_init(tsk))
94179 return 1;
94180 if (handler != SIG_IGN && handler != SIG_DFL)
94181@@ -793,6 +796,13 @@ static int check_kill_permission(int sig, struct siginfo *info,
94182 }
94183 }
94184
94185+ /* allow glibc communication via tgkill to other threads in our
94186+ thread group */
94187+ if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
94188+ sig != (SIGRTMIN+1) || task_tgid_vnr(t) != info->si_pid)
94189+ && gr_handle_signal(t, sig))
94190+ return -EPERM;
94191+
94192 return security_task_kill(t, info, sig, 0);
94193 }
94194
94195@@ -1176,7 +1186,7 @@ __group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
94196 return send_signal(sig, info, p, 1);
94197 }
94198
94199-static int
94200+int
94201 specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t)
94202 {
94203 return send_signal(sig, info, t, 0);
94204@@ -1213,6 +1223,7 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
94205 unsigned long int flags;
94206 int ret, blocked, ignored;
94207 struct k_sigaction *action;
94208+ int is_unhandled = 0;
94209
94210 spin_lock_irqsave(&t->sighand->siglock, flags);
94211 action = &t->sighand->action[sig-1];
94212@@ -1227,9 +1238,18 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
94213 }
94214 if (action->sa.sa_handler == SIG_DFL)
94215 t->signal->flags &= ~SIGNAL_UNKILLABLE;
94216+ if (action->sa.sa_handler == SIG_IGN || action->sa.sa_handler == SIG_DFL)
94217+ is_unhandled = 1;
94218 ret = specific_send_sig_info(sig, info, t);
94219 spin_unlock_irqrestore(&t->sighand->siglock, flags);
94220
94221+ /* only deal with unhandled signals, java etc trigger SIGSEGV during
94222+ normal operation */
94223+ if (is_unhandled) {
94224+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, t);
94225+ gr_handle_crash(t, sig);
94226+ }
94227+
94228 return ret;
94229 }
94230
94231@@ -1310,8 +1330,11 @@ int group_send_sig_info(int sig, struct siginfo *info, struct task_struct *p)
94232 ret = check_kill_permission(sig, info, p);
94233 rcu_read_unlock();
94234
94235- if (!ret && sig)
94236+ if (!ret && sig) {
94237 ret = do_send_sig_info(sig, info, p, true);
94238+ if (!ret)
94239+ gr_log_signal(sig, !is_si_special(info) ? info->si_addr : NULL, p);
94240+ }
94241
94242 return ret;
94243 }
94244@@ -2915,7 +2938,15 @@ do_send_specific(pid_t tgid, pid_t pid, int sig, struct siginfo *info)
94245 int error = -ESRCH;
94246
94247 rcu_read_lock();
94248- p = find_task_by_vpid(pid);
94249+#ifdef CONFIG_GRKERNSEC_CHROOT_FINDTASK
94250+ /* allow glibc communication via tgkill to other threads in our
94251+ thread group */
94252+ if (grsec_enable_chroot_findtask && info->si_code == SI_TKILL &&
94253+ sig == (SIGRTMIN+1) && tgid == info->si_pid)
94254+ p = find_task_by_vpid_unrestricted(pid);
94255+ else
94256+#endif
94257+ p = find_task_by_vpid(pid);
94258 if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
94259 error = check_kill_permission(sig, info, p);
94260 /*
94261@@ -3248,8 +3279,8 @@ COMPAT_SYSCALL_DEFINE2(sigaltstack,
94262 }
94263 seg = get_fs();
94264 set_fs(KERNEL_DS);
94265- ret = do_sigaltstack((stack_t __force __user *) (uss_ptr ? &uss : NULL),
94266- (stack_t __force __user *) &uoss,
94267+ ret = do_sigaltstack((stack_t __force_user *) (uss_ptr ? &uss : NULL),
94268+ (stack_t __force_user *) &uoss,
94269 compat_user_stack_pointer());
94270 set_fs(seg);
94271 if (ret >= 0 && uoss_ptr) {
94272diff --git a/kernel/smpboot.c b/kernel/smpboot.c
94273index 40190f2..8861d40 100644
94274--- a/kernel/smpboot.c
94275+++ b/kernel/smpboot.c
94276@@ -290,7 +290,7 @@ int smpboot_register_percpu_thread(struct smp_hotplug_thread *plug_thread)
94277 }
94278 smpboot_unpark_thread(plug_thread, cpu);
94279 }
94280- list_add(&plug_thread->list, &hotplug_threads);
94281+ pax_list_add(&plug_thread->list, &hotplug_threads);
94282 out:
94283 mutex_unlock(&smpboot_threads_lock);
94284 put_online_cpus();
94285@@ -308,7 +308,7 @@ void smpboot_unregister_percpu_thread(struct smp_hotplug_thread *plug_thread)
94286 {
94287 get_online_cpus();
94288 mutex_lock(&smpboot_threads_lock);
94289- list_del(&plug_thread->list);
94290+ pax_list_del(&plug_thread->list);
94291 smpboot_destroy_threads(plug_thread);
94292 mutex_unlock(&smpboot_threads_lock);
94293 put_online_cpus();
94294diff --git a/kernel/softirq.c b/kernel/softirq.c
94295index 479e443..66d845e1 100644
94296--- a/kernel/softirq.c
94297+++ b/kernel/softirq.c
94298@@ -53,7 +53,7 @@ irq_cpustat_t irq_stat[NR_CPUS] ____cacheline_aligned;
94299 EXPORT_SYMBOL(irq_stat);
94300 #endif
94301
94302-static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
94303+static struct softirq_action softirq_vec[NR_SOFTIRQS] __read_only __aligned(PAGE_SIZE);
94304
94305 DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
94306
94307@@ -270,7 +270,7 @@ restart:
94308 kstat_incr_softirqs_this_cpu(vec_nr);
94309
94310 trace_softirq_entry(vec_nr);
94311- h->action(h);
94312+ h->action();
94313 trace_softirq_exit(vec_nr);
94314 if (unlikely(prev_count != preempt_count())) {
94315 pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
94316@@ -430,7 +430,7 @@ void __raise_softirq_irqoff(unsigned int nr)
94317 or_softirq_pending(1UL << nr);
94318 }
94319
94320-void open_softirq(int nr, void (*action)(struct softirq_action *))
94321+void __init open_softirq(int nr, void (*action)(void))
94322 {
94323 softirq_vec[nr].action = action;
94324 }
94325@@ -482,7 +482,7 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
94326 }
94327 EXPORT_SYMBOL(__tasklet_hi_schedule_first);
94328
94329-static void tasklet_action(struct softirq_action *a)
94330+static void tasklet_action(void)
94331 {
94332 struct tasklet_struct *list;
94333
94334@@ -518,7 +518,7 @@ static void tasklet_action(struct softirq_action *a)
94335 }
94336 }
94337
94338-static void tasklet_hi_action(struct softirq_action *a)
94339+static __latent_entropy void tasklet_hi_action(void)
94340 {
94341 struct tasklet_struct *list;
94342
94343@@ -744,7 +744,7 @@ static struct notifier_block cpu_nfb = {
94344 .notifier_call = cpu_callback
94345 };
94346
94347-static struct smp_hotplug_thread softirq_threads = {
94348+static struct smp_hotplug_thread softirq_threads __read_only = {
94349 .store = &ksoftirqd,
94350 .thread_should_run = ksoftirqd_should_run,
94351 .thread_fn = run_ksoftirqd,
94352diff --git a/kernel/sys.c b/kernel/sys.c
94353index a03d9cd..55dbe9c 100644
94354--- a/kernel/sys.c
94355+++ b/kernel/sys.c
94356@@ -160,6 +160,12 @@ static int set_one_prio(struct task_struct *p, int niceval, int error)
94357 error = -EACCES;
94358 goto out;
94359 }
94360+
94361+ if (gr_handle_chroot_setpriority(p, niceval)) {
94362+ error = -EACCES;
94363+ goto out;
94364+ }
94365+
94366 no_nice = security_task_setnice(p, niceval);
94367 if (no_nice) {
94368 error = no_nice;
94369@@ -365,6 +371,20 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, gid_t, egid)
94370 goto error;
94371 }
94372
94373+ if (gr_check_group_change(new->gid, new->egid, INVALID_GID))
94374+ goto error;
94375+
94376+ if (!gid_eq(new->gid, old->gid)) {
94377+ /* make sure we generate a learn log for what will
94378+ end up being a role transition after a full-learning
94379+ policy is generated
94380+ CAP_SETGID is required to perform a transition
94381+ we may not log a CAP_SETGID check above, e.g.
94382+ in the case where new rgid = old egid
94383+ */
94384+ gr_learn_cap(current, new, CAP_SETGID);
94385+ }
94386+
94387 if (rgid != (gid_t) -1 ||
94388 (egid != (gid_t) -1 && !gid_eq(kegid, old->gid)))
94389 new->sgid = new->egid;
94390@@ -400,6 +420,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
94391 old = current_cred();
94392
94393 retval = -EPERM;
94394+
94395+ if (gr_check_group_change(kgid, kgid, kgid))
94396+ goto error;
94397+
94398 if (ns_capable(old->user_ns, CAP_SETGID))
94399 new->gid = new->egid = new->sgid = new->fsgid = kgid;
94400 else if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->sgid))
94401@@ -417,7 +441,7 @@ error:
94402 /*
94403 * change the user struct in a credentials set to match the new UID
94404 */
94405-static int set_user(struct cred *new)
94406+int set_user(struct cred *new)
94407 {
94408 struct user_struct *new_user;
94409
94410@@ -497,7 +521,18 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, uid_t, euid)
94411 goto error;
94412 }
94413
94414+ if (gr_check_user_change(new->uid, new->euid, INVALID_UID))
94415+ goto error;
94416+
94417 if (!uid_eq(new->uid, old->uid)) {
94418+ /* make sure we generate a learn log for what will
94419+ end up being a role transition after a full-learning
94420+ policy is generated
94421+ CAP_SETUID is required to perform a transition
94422+ we may not log a CAP_SETUID check above, e.g.
94423+ in the case where new ruid = old euid
94424+ */
94425+ gr_learn_cap(current, new, CAP_SETUID);
94426 retval = set_user(new);
94427 if (retval < 0)
94428 goto error;
94429@@ -547,6 +582,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
94430 old = current_cred();
94431
94432 retval = -EPERM;
94433+
94434+ if (gr_check_crash_uid(kuid))
94435+ goto error;
94436+ if (gr_check_user_change(kuid, kuid, kuid))
94437+ goto error;
94438+
94439 if (ns_capable(old->user_ns, CAP_SETUID)) {
94440 new->suid = new->uid = kuid;
94441 if (!uid_eq(kuid, old->uid)) {
94442@@ -616,6 +657,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, uid_t, euid, uid_t, suid)
94443 goto error;
94444 }
94445
94446+ if (gr_check_user_change(kruid, keuid, INVALID_UID))
94447+ goto error;
94448+
94449 if (ruid != (uid_t) -1) {
94450 new->uid = kruid;
94451 if (!uid_eq(kruid, old->uid)) {
94452@@ -700,6 +744,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, gid_t, egid, gid_t, sgid)
94453 goto error;
94454 }
94455
94456+ if (gr_check_group_change(krgid, kegid, INVALID_GID))
94457+ goto error;
94458+
94459 if (rgid != (gid_t) -1)
94460 new->gid = krgid;
94461 if (egid != (gid_t) -1)
94462@@ -764,12 +811,16 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
94463 uid_eq(kuid, old->suid) || uid_eq(kuid, old->fsuid) ||
94464 ns_capable(old->user_ns, CAP_SETUID)) {
94465 if (!uid_eq(kuid, old->fsuid)) {
94466+ if (gr_check_user_change(INVALID_UID, INVALID_UID, kuid))
94467+ goto error;
94468+
94469 new->fsuid = kuid;
94470 if (security_task_fix_setuid(new, old, LSM_SETID_FS) == 0)
94471 goto change_okay;
94472 }
94473 }
94474
94475+error:
94476 abort_creds(new);
94477 return old_fsuid;
94478
94479@@ -802,12 +853,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
94480 if (gid_eq(kgid, old->gid) || gid_eq(kgid, old->egid) ||
94481 gid_eq(kgid, old->sgid) || gid_eq(kgid, old->fsgid) ||
94482 ns_capable(old->user_ns, CAP_SETGID)) {
94483+ if (gr_check_group_change(INVALID_GID, INVALID_GID, kgid))
94484+ goto error;
94485+
94486 if (!gid_eq(kgid, old->fsgid)) {
94487 new->fsgid = kgid;
94488 goto change_okay;
94489 }
94490 }
94491
94492+error:
94493 abort_creds(new);
94494 return old_fsgid;
94495
94496@@ -1185,19 +1240,19 @@ SYSCALL_DEFINE1(olduname, struct oldold_utsname __user *, name)
94497 return -EFAULT;
94498
94499 down_read(&uts_sem);
94500- error = __copy_to_user(&name->sysname, &utsname()->sysname,
94501+ error = __copy_to_user(name->sysname, &utsname()->sysname,
94502 __OLD_UTS_LEN);
94503 error |= __put_user(0, name->sysname + __OLD_UTS_LEN);
94504- error |= __copy_to_user(&name->nodename, &utsname()->nodename,
94505+ error |= __copy_to_user(name->nodename, &utsname()->nodename,
94506 __OLD_UTS_LEN);
94507 error |= __put_user(0, name->nodename + __OLD_UTS_LEN);
94508- error |= __copy_to_user(&name->release, &utsname()->release,
94509+ error |= __copy_to_user(name->release, &utsname()->release,
94510 __OLD_UTS_LEN);
94511 error |= __put_user(0, name->release + __OLD_UTS_LEN);
94512- error |= __copy_to_user(&name->version, &utsname()->version,
94513+ error |= __copy_to_user(name->version, &utsname()->version,
94514 __OLD_UTS_LEN);
94515 error |= __put_user(0, name->version + __OLD_UTS_LEN);
94516- error |= __copy_to_user(&name->machine, &utsname()->machine,
94517+ error |= __copy_to_user(name->machine, &utsname()->machine,
94518 __OLD_UTS_LEN);
94519 error |= __put_user(0, name->machine + __OLD_UTS_LEN);
94520 up_read(&uts_sem);
94521@@ -1398,6 +1453,13 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource,
94522 */
94523 new_rlim->rlim_cur = 1;
94524 }
94525+ /* Handle the case where a fork and setuid occur and then RLIMIT_NPROC
94526+ is changed to a lower value. Since tasks can be created by the same
94527+ user in between this limit change and an execve by this task, force
94528+ a recheck only for this task by setting PF_NPROC_EXCEEDED
94529+ */
94530+ if (resource == RLIMIT_NPROC && tsk->real_cred->user != INIT_USER)
94531+ tsk->flags |= PF_NPROC_EXCEEDED;
94532 }
94533 if (!retval) {
94534 if (old_rlim)
94535diff --git a/kernel/sysctl.c b/kernel/sysctl.c
94536index ce410bb..cd276f0 100644
94537--- a/kernel/sysctl.c
94538+++ b/kernel/sysctl.c
94539@@ -94,7 +94,6 @@
94540
94541
94542 #if defined(CONFIG_SYSCTL)
94543-
94544 /* External variables not in a header file. */
94545 extern int max_threads;
94546 extern int suid_dumpable;
94547@@ -115,19 +114,20 @@ extern int sysctl_nr_trim_pages;
94548
94549 /* Constants used for minimum and maximum */
94550 #ifdef CONFIG_LOCKUP_DETECTOR
94551-static int sixty = 60;
94552+static int sixty __read_only = 60;
94553 #endif
94554
94555-static int __maybe_unused neg_one = -1;
94556+static int __maybe_unused neg_one __read_only = -1;
94557
94558-static int zero;
94559-static int __maybe_unused one = 1;
94560-static int __maybe_unused two = 2;
94561-static int __maybe_unused four = 4;
94562-static unsigned long one_ul = 1;
94563-static int one_hundred = 100;
94564+static int zero __read_only = 0;
94565+static int __maybe_unused one __read_only = 1;
94566+static int __maybe_unused two __read_only = 2;
94567+static int __maybe_unused three __read_only = 3;
94568+static int __maybe_unused four __read_only = 4;
94569+static unsigned long one_ul __read_only = 1;
94570+static int one_hundred __read_only = 100;
94571 #ifdef CONFIG_PRINTK
94572-static int ten_thousand = 10000;
94573+static int ten_thousand __read_only = 10000;
94574 #endif
94575
94576 /* this is needed for the proc_doulongvec_minmax of vm_dirty_bytes */
94577@@ -181,10 +181,8 @@ static int proc_taint(struct ctl_table *table, int write,
94578 void __user *buffer, size_t *lenp, loff_t *ppos);
94579 #endif
94580
94581-#ifdef CONFIG_PRINTK
94582 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
94583 void __user *buffer, size_t *lenp, loff_t *ppos);
94584-#endif
94585
94586 static int proc_dointvec_minmax_coredump(struct ctl_table *table, int write,
94587 void __user *buffer, size_t *lenp, loff_t *ppos);
94588@@ -215,6 +213,8 @@ static int sysrq_sysctl_handler(struct ctl_table *table, int write,
94589
94590 #endif
94591
94592+extern struct ctl_table grsecurity_table[];
94593+
94594 static struct ctl_table kern_table[];
94595 static struct ctl_table vm_table[];
94596 static struct ctl_table fs_table[];
94597@@ -229,6 +229,20 @@ extern struct ctl_table epoll_table[];
94598 int sysctl_legacy_va_layout;
94599 #endif
94600
94601+#ifdef CONFIG_PAX_SOFTMODE
94602+static struct ctl_table pax_table[] = {
94603+ {
94604+ .procname = "softmode",
94605+ .data = &pax_softmode,
94606+ .maxlen = sizeof(unsigned int),
94607+ .mode = 0600,
94608+ .proc_handler = &proc_dointvec,
94609+ },
94610+
94611+ { }
94612+};
94613+#endif
94614+
94615 /* The default sysctl tables: */
94616
94617 static struct ctl_table sysctl_base_table[] = {
94618@@ -277,6 +291,22 @@ static int max_extfrag_threshold = 1000;
94619 #endif
94620
94621 static struct ctl_table kern_table[] = {
94622+#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_ROFS)
94623+ {
94624+ .procname = "grsecurity",
94625+ .mode = 0500,
94626+ .child = grsecurity_table,
94627+ },
94628+#endif
94629+
94630+#ifdef CONFIG_PAX_SOFTMODE
94631+ {
94632+ .procname = "pax",
94633+ .mode = 0500,
94634+ .child = pax_table,
94635+ },
94636+#endif
94637+
94638 {
94639 .procname = "sched_child_runs_first",
94640 .data = &sysctl_sched_child_runs_first,
94641@@ -649,7 +679,7 @@ static struct ctl_table kern_table[] = {
94642 .data = &modprobe_path,
94643 .maxlen = KMOD_PATH_LEN,
94644 .mode = 0644,
94645- .proc_handler = proc_dostring,
94646+ .proc_handler = proc_dostring_modpriv,
94647 },
94648 {
94649 .procname = "modules_disabled",
94650@@ -816,16 +846,20 @@ static struct ctl_table kern_table[] = {
94651 .extra1 = &zero,
94652 .extra2 = &one,
94653 },
94654+#endif
94655 {
94656 .procname = "kptr_restrict",
94657 .data = &kptr_restrict,
94658 .maxlen = sizeof(int),
94659 .mode = 0644,
94660 .proc_handler = proc_dointvec_minmax_sysadmin,
94661+#ifdef CONFIG_GRKERNSEC_HIDESYM
94662+ .extra1 = &two,
94663+#else
94664 .extra1 = &zero,
94665+#endif
94666 .extra2 = &two,
94667 },
94668-#endif
94669 {
94670 .procname = "ngroups_max",
94671 .data = &ngroups_max,
94672@@ -1072,10 +1106,17 @@ static struct ctl_table kern_table[] = {
94673 */
94674 {
94675 .procname = "perf_event_paranoid",
94676- .data = &sysctl_perf_event_paranoid,
94677- .maxlen = sizeof(sysctl_perf_event_paranoid),
94678+ .data = &sysctl_perf_event_legitimately_concerned,
94679+ .maxlen = sizeof(sysctl_perf_event_legitimately_concerned),
94680 .mode = 0644,
94681- .proc_handler = proc_dointvec,
94682+ /* go ahead, be a hero */
94683+ .proc_handler = proc_dointvec_minmax_sysadmin,
94684+ .extra1 = &neg_one,
94685+#ifdef CONFIG_GRKERNSEC_PERF_HARDEN
94686+ .extra2 = &three,
94687+#else
94688+ .extra2 = &two,
94689+#endif
94690 },
94691 {
94692 .procname = "perf_event_mlock_kb",
94693@@ -1348,6 +1389,13 @@ static struct ctl_table vm_table[] = {
94694 .proc_handler = proc_dointvec_minmax,
94695 .extra1 = &zero,
94696 },
94697+ {
94698+ .procname = "heap_stack_gap",
94699+ .data = &sysctl_heap_stack_gap,
94700+ .maxlen = sizeof(sysctl_heap_stack_gap),
94701+ .mode = 0644,
94702+ .proc_handler = proc_doulongvec_minmax,
94703+ },
94704 #else
94705 {
94706 .procname = "nr_trim_pages",
94707@@ -1830,6 +1878,16 @@ int proc_dostring(struct ctl_table *table, int write,
94708 (char __user *)buffer, lenp, ppos);
94709 }
94710
94711+int proc_dostring_modpriv(struct ctl_table *table, int write,
94712+ void __user *buffer, size_t *lenp, loff_t *ppos)
94713+{
94714+ if (write && !capable(CAP_SYS_MODULE))
94715+ return -EPERM;
94716+
94717+ return _proc_do_string(table->data, table->maxlen, write,
94718+ buffer, lenp, ppos);
94719+}
94720+
94721 static size_t proc_skip_spaces(char **buf)
94722 {
94723 size_t ret;
94724@@ -1935,6 +1993,8 @@ static int proc_put_long(void __user **buf, size_t *size, unsigned long val,
94725 len = strlen(tmp);
94726 if (len > *size)
94727 len = *size;
94728+ if (len > sizeof(tmp))
94729+ len = sizeof(tmp);
94730 if (copy_to_user(*buf, tmp, len))
94731 return -EFAULT;
94732 *size -= len;
94733@@ -2112,7 +2172,7 @@ int proc_dointvec(struct ctl_table *table, int write,
94734 static int proc_taint(struct ctl_table *table, int write,
94735 void __user *buffer, size_t *lenp, loff_t *ppos)
94736 {
94737- struct ctl_table t;
94738+ ctl_table_no_const t;
94739 unsigned long tmptaint = get_taint();
94740 int err;
94741
94742@@ -2140,7 +2200,6 @@ static int proc_taint(struct ctl_table *table, int write,
94743 return err;
94744 }
94745
94746-#ifdef CONFIG_PRINTK
94747 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
94748 void __user *buffer, size_t *lenp, loff_t *ppos)
94749 {
94750@@ -2149,7 +2208,6 @@ static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
94751
94752 return proc_dointvec_minmax(table, write, buffer, lenp, ppos);
94753 }
94754-#endif
94755
94756 struct do_proc_dointvec_minmax_conv_param {
94757 int *min;
94758@@ -2709,6 +2767,12 @@ int proc_dostring(struct ctl_table *table, int write,
94759 return -ENOSYS;
94760 }
94761
94762+int proc_dostring_modpriv(struct ctl_table *table, int write,
94763+ void __user *buffer, size_t *lenp, loff_t *ppos)
94764+{
94765+ return -ENOSYS;
94766+}
94767+
94768 int proc_dointvec(struct ctl_table *table, int write,
94769 void __user *buffer, size_t *lenp, loff_t *ppos)
94770 {
94771@@ -2765,5 +2829,6 @@ EXPORT_SYMBOL(proc_dointvec_minmax);
94772 EXPORT_SYMBOL(proc_dointvec_userhz_jiffies);
94773 EXPORT_SYMBOL(proc_dointvec_ms_jiffies);
94774 EXPORT_SYMBOL(proc_dostring);
94775+EXPORT_SYMBOL(proc_dostring_modpriv);
94776 EXPORT_SYMBOL(proc_doulongvec_minmax);
94777 EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
94778diff --git a/kernel/taskstats.c b/kernel/taskstats.c
94779index 21f82c2..c1984e5 100644
94780--- a/kernel/taskstats.c
94781+++ b/kernel/taskstats.c
94782@@ -28,9 +28,12 @@
94783 #include <linux/fs.h>
94784 #include <linux/file.h>
94785 #include <linux/pid_namespace.h>
94786+#include <linux/grsecurity.h>
94787 #include <net/genetlink.h>
94788 #include <linux/atomic.h>
94789
94790+extern int gr_is_taskstats_denied(int pid);
94791+
94792 /*
94793 * Maximum length of a cpumask that can be specified in
94794 * the TASKSTATS_CMD_ATTR_REGISTER/DEREGISTER_CPUMASK attribute
94795@@ -567,6 +570,9 @@ err:
94796
94797 static int taskstats_user_cmd(struct sk_buff *skb, struct genl_info *info)
94798 {
94799+ if (gr_is_taskstats_denied(current->pid))
94800+ return -EACCES;
94801+
94802 if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
94803 return cmd_attr_register_cpumask(info);
94804 else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
94805diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
94806index 1b001ed..55ef9e4 100644
94807--- a/kernel/time/alarmtimer.c
94808+++ b/kernel/time/alarmtimer.c
94809@@ -823,7 +823,7 @@ static int __init alarmtimer_init(void)
94810 struct platform_device *pdev;
94811 int error = 0;
94812 int i;
94813- struct k_clock alarm_clock = {
94814+ static struct k_clock alarm_clock = {
94815 .clock_getres = alarm_clock_getres,
94816 .clock_get = alarm_clock_get,
94817 .timer_create = alarm_timer_create,
94818diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
94819index bee0c1f..a23fe2d 100644
94820--- a/kernel/time/hrtimer.c
94821+++ b/kernel/time/hrtimer.c
94822@@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
94823 local_irq_restore(flags);
94824 }
94825
94826-static void run_hrtimer_softirq(struct softirq_action *h)
94827+static __latent_entropy void run_hrtimer_softirq(void)
94828 {
94829 hrtimer_peek_ahead_timers();
94830 }
94831diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
94832index 0075da7..63cc872 100644
94833--- a/kernel/time/posix-cpu-timers.c
94834+++ b/kernel/time/posix-cpu-timers.c
94835@@ -1449,14 +1449,14 @@ struct k_clock clock_posix_cpu = {
94836
94837 static __init int init_posix_cpu_timers(void)
94838 {
94839- struct k_clock process = {
94840+ static struct k_clock process = {
94841 .clock_getres = process_cpu_clock_getres,
94842 .clock_get = process_cpu_clock_get,
94843 .timer_create = process_cpu_timer_create,
94844 .nsleep = process_cpu_nsleep,
94845 .nsleep_restart = process_cpu_nsleep_restart,
94846 };
94847- struct k_clock thread = {
94848+ static struct k_clock thread = {
94849 .clock_getres = thread_cpu_clock_getres,
94850 .clock_get = thread_cpu_clock_get,
94851 .timer_create = thread_cpu_timer_create,
94852diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
94853index 31ea01f..7fc61ef 100644
94854--- a/kernel/time/posix-timers.c
94855+++ b/kernel/time/posix-timers.c
94856@@ -43,6 +43,7 @@
94857 #include <linux/hash.h>
94858 #include <linux/posix-clock.h>
94859 #include <linux/posix-timers.h>
94860+#include <linux/grsecurity.h>
94861 #include <linux/syscalls.h>
94862 #include <linux/wait.h>
94863 #include <linux/workqueue.h>
94864@@ -124,7 +125,7 @@ static DEFINE_SPINLOCK(hash_lock);
94865 * which we beg off on and pass to do_sys_settimeofday().
94866 */
94867
94868-static struct k_clock posix_clocks[MAX_CLOCKS];
94869+static struct k_clock *posix_clocks[MAX_CLOCKS];
94870
94871 /*
94872 * These ones are defined below.
94873@@ -277,7 +278,7 @@ static int posix_get_tai(clockid_t which_clock, struct timespec *tp)
94874 */
94875 static __init int init_posix_timers(void)
94876 {
94877- struct k_clock clock_realtime = {
94878+ static struct k_clock clock_realtime = {
94879 .clock_getres = hrtimer_get_res,
94880 .clock_get = posix_clock_realtime_get,
94881 .clock_set = posix_clock_realtime_set,
94882@@ -289,7 +290,7 @@ static __init int init_posix_timers(void)
94883 .timer_get = common_timer_get,
94884 .timer_del = common_timer_del,
94885 };
94886- struct k_clock clock_monotonic = {
94887+ static struct k_clock clock_monotonic = {
94888 .clock_getres = hrtimer_get_res,
94889 .clock_get = posix_ktime_get_ts,
94890 .nsleep = common_nsleep,
94891@@ -299,19 +300,19 @@ static __init int init_posix_timers(void)
94892 .timer_get = common_timer_get,
94893 .timer_del = common_timer_del,
94894 };
94895- struct k_clock clock_monotonic_raw = {
94896+ static struct k_clock clock_monotonic_raw = {
94897 .clock_getres = hrtimer_get_res,
94898 .clock_get = posix_get_monotonic_raw,
94899 };
94900- struct k_clock clock_realtime_coarse = {
94901+ static struct k_clock clock_realtime_coarse = {
94902 .clock_getres = posix_get_coarse_res,
94903 .clock_get = posix_get_realtime_coarse,
94904 };
94905- struct k_clock clock_monotonic_coarse = {
94906+ static struct k_clock clock_monotonic_coarse = {
94907 .clock_getres = posix_get_coarse_res,
94908 .clock_get = posix_get_monotonic_coarse,
94909 };
94910- struct k_clock clock_tai = {
94911+ static struct k_clock clock_tai = {
94912 .clock_getres = hrtimer_get_res,
94913 .clock_get = posix_get_tai,
94914 .nsleep = common_nsleep,
94915@@ -321,7 +322,7 @@ static __init int init_posix_timers(void)
94916 .timer_get = common_timer_get,
94917 .timer_del = common_timer_del,
94918 };
94919- struct k_clock clock_boottime = {
94920+ static struct k_clock clock_boottime = {
94921 .clock_getres = hrtimer_get_res,
94922 .clock_get = posix_get_boottime,
94923 .nsleep = common_nsleep,
94924@@ -533,7 +534,7 @@ void posix_timers_register_clock(const clockid_t clock_id,
94925 return;
94926 }
94927
94928- posix_clocks[clock_id] = *new_clock;
94929+ posix_clocks[clock_id] = new_clock;
94930 }
94931 EXPORT_SYMBOL_GPL(posix_timers_register_clock);
94932
94933@@ -579,9 +580,9 @@ static struct k_clock *clockid_to_kclock(const clockid_t id)
94934 return (id & CLOCKFD_MASK) == CLOCKFD ?
94935 &clock_posix_dynamic : &clock_posix_cpu;
94936
94937- if (id >= MAX_CLOCKS || !posix_clocks[id].clock_getres)
94938+ if (id >= MAX_CLOCKS || !posix_clocks[id] || !posix_clocks[id]->clock_getres)
94939 return NULL;
94940- return &posix_clocks[id];
94941+ return posix_clocks[id];
94942 }
94943
94944 static int common_timer_create(struct k_itimer *new_timer)
94945@@ -599,7 +600,7 @@ SYSCALL_DEFINE3(timer_create, const clockid_t, which_clock,
94946 struct k_clock *kc = clockid_to_kclock(which_clock);
94947 struct k_itimer *new_timer;
94948 int error, new_timer_id;
94949- sigevent_t event;
94950+ sigevent_t event = { };
94951 int it_id_set = IT_ID_NOT_SET;
94952
94953 if (!kc)
94954@@ -1014,6 +1015,13 @@ SYSCALL_DEFINE2(clock_settime, const clockid_t, which_clock,
94955 if (copy_from_user(&new_tp, tp, sizeof (*tp)))
94956 return -EFAULT;
94957
94958+ /* only the CLOCK_REALTIME clock can be set, all other clocks
94959+ have their clock_set fptr set to a nosettime dummy function
94960+ CLOCK_REALTIME has a NULL clock_set fptr which causes it to
94961+ call common_clock_set, which calls do_sys_settimeofday, which
94962+ we hook
94963+ */
94964+
94965 return kc->clock_set(which_clock, &new_tp);
94966 }
94967
94968diff --git a/kernel/time/time.c b/kernel/time/time.c
94969index 2c85b77..6530536 100644
94970--- a/kernel/time/time.c
94971+++ b/kernel/time/time.c
94972@@ -173,6 +173,11 @@ int do_sys_settimeofday(const struct timespec *tv, const struct timezone *tz)
94973 return error;
94974
94975 if (tz) {
94976+ /* we log in do_settimeofday called below, so don't log twice
94977+ */
94978+ if (!tv)
94979+ gr_log_timechange();
94980+
94981 sys_tz = *tz;
94982 update_vsyscall_tz();
94983 if (firsttime) {
94984diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
94985index 91db941..a371671 100644
94986--- a/kernel/time/timekeeping.c
94987+++ b/kernel/time/timekeeping.c
94988@@ -15,6 +15,7 @@
94989 #include <linux/init.h>
94990 #include <linux/mm.h>
94991 #include <linux/sched.h>
94992+#include <linux/grsecurity.h>
94993 #include <linux/syscore_ops.h>
94994 #include <linux/clocksource.h>
94995 #include <linux/jiffies.h>
94996@@ -802,6 +803,8 @@ int do_settimeofday64(const struct timespec64 *ts)
94997 if (!timespec64_valid_strict(ts))
94998 return -EINVAL;
94999
95000+ gr_log_timechange();
95001+
95002 raw_spin_lock_irqsave(&timekeeper_lock, flags);
95003 write_seqcount_begin(&tk_core.seq);
95004
95005diff --git a/kernel/time/timer.c b/kernel/time/timer.c
95006index 2d3f5c5..7ed7dc5 100644
95007--- a/kernel/time/timer.c
95008+++ b/kernel/time/timer.c
95009@@ -1393,7 +1393,7 @@ void update_process_times(int user_tick)
95010 /*
95011 * This function runs timers and the timer-tq in bottom half context.
95012 */
95013-static void run_timer_softirq(struct softirq_action *h)
95014+static __latent_entropy void run_timer_softirq(void)
95015 {
95016 struct tvec_base *base = __this_cpu_read(tvec_bases);
95017
95018@@ -1456,7 +1456,7 @@ static void process_timeout(unsigned long __data)
95019 *
95020 * In all cases the return value is guaranteed to be non-negative.
95021 */
95022-signed long __sched schedule_timeout(signed long timeout)
95023+signed long __sched __intentional_overflow(-1) schedule_timeout(signed long timeout)
95024 {
95025 struct timer_list timer;
95026 unsigned long expire;
95027diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
95028index 61ed862..3b52c65 100644
95029--- a/kernel/time/timer_list.c
95030+++ b/kernel/time/timer_list.c
95031@@ -45,12 +45,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
95032
95033 static void print_name_offset(struct seq_file *m, void *sym)
95034 {
95035+#ifdef CONFIG_GRKERNSEC_HIDESYM
95036+ SEQ_printf(m, "<%p>", NULL);
95037+#else
95038 char symname[KSYM_NAME_LEN];
95039
95040 if (lookup_symbol_name((unsigned long)sym, symname) < 0)
95041 SEQ_printf(m, "<%pK>", sym);
95042 else
95043 SEQ_printf(m, "%s", symname);
95044+#endif
95045 }
95046
95047 static void
95048@@ -119,7 +123,11 @@ next_one:
95049 static void
95050 print_base(struct seq_file *m, struct hrtimer_clock_base *base, u64 now)
95051 {
95052+#ifdef CONFIG_GRKERNSEC_HIDESYM
95053+ SEQ_printf(m, " .base: %p\n", NULL);
95054+#else
95055 SEQ_printf(m, " .base: %pK\n", base);
95056+#endif
95057 SEQ_printf(m, " .index: %d\n",
95058 base->index);
95059 SEQ_printf(m, " .resolution: %Lu nsecs\n",
95060@@ -362,7 +370,11 @@ static int __init init_timer_list_procfs(void)
95061 {
95062 struct proc_dir_entry *pe;
95063
95064+#ifdef CONFIG_GRKERNSEC_PROC_ADD
95065+ pe = proc_create("timer_list", 0400, NULL, &timer_list_fops);
95066+#else
95067 pe = proc_create("timer_list", 0444, NULL, &timer_list_fops);
95068+#endif
95069 if (!pe)
95070 return -ENOMEM;
95071 return 0;
95072diff --git a/kernel/time/timer_stats.c b/kernel/time/timer_stats.c
95073index 1fb08f2..ca4bb1e 100644
95074--- a/kernel/time/timer_stats.c
95075+++ b/kernel/time/timer_stats.c
95076@@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
95077 static unsigned long nr_entries;
95078 static struct entry entries[MAX_ENTRIES];
95079
95080-static atomic_t overflow_count;
95081+static atomic_unchecked_t overflow_count;
95082
95083 /*
95084 * The entries are in a hash-table, for fast lookup:
95085@@ -140,7 +140,7 @@ static void reset_entries(void)
95086 nr_entries = 0;
95087 memset(entries, 0, sizeof(entries));
95088 memset(tstat_hash_table, 0, sizeof(tstat_hash_table));
95089- atomic_set(&overflow_count, 0);
95090+ atomic_set_unchecked(&overflow_count, 0);
95091 }
95092
95093 static struct entry *alloc_entry(void)
95094@@ -261,7 +261,7 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
95095 if (likely(entry))
95096 entry->count++;
95097 else
95098- atomic_inc(&overflow_count);
95099+ atomic_inc_unchecked(&overflow_count);
95100
95101 out_unlock:
95102 raw_spin_unlock_irqrestore(lock, flags);
95103@@ -269,12 +269,16 @@ void timer_stats_update_stats(void *timer, pid_t pid, void *startf,
95104
95105 static void print_name_offset(struct seq_file *m, unsigned long addr)
95106 {
95107+#ifdef CONFIG_GRKERNSEC_HIDESYM
95108+ seq_printf(m, "<%p>", NULL);
95109+#else
95110 char symname[KSYM_NAME_LEN];
95111
95112 if (lookup_symbol_name(addr, symname) < 0)
95113- seq_printf(m, "<%p>", (void *)addr);
95114+ seq_printf(m, "<%pK>", (void *)addr);
95115 else
95116 seq_printf(m, "%s", symname);
95117+#endif
95118 }
95119
95120 static int tstats_show(struct seq_file *m, void *v)
95121@@ -300,8 +304,8 @@ static int tstats_show(struct seq_file *m, void *v)
95122
95123 seq_puts(m, "Timer Stats Version: v0.3\n");
95124 seq_printf(m, "Sample period: %ld.%03ld s\n", period.tv_sec, ms);
95125- if (atomic_read(&overflow_count))
95126- seq_printf(m, "Overflow: %d entries\n", atomic_read(&overflow_count));
95127+ if (atomic_read_unchecked(&overflow_count))
95128+ seq_printf(m, "Overflow: %d entries\n", atomic_read_unchecked(&overflow_count));
95129 seq_printf(m, "Collection: %s\n", timer_stats_active ? "active" : "inactive");
95130
95131 for (i = 0; i < nr_entries; i++) {
95132@@ -417,7 +421,11 @@ static int __init init_tstats_procfs(void)
95133 {
95134 struct proc_dir_entry *pe;
95135
95136+#ifdef CONFIG_GRKERNSEC_PROC_ADD
95137+ pe = proc_create("timer_stats", 0600, NULL, &tstats_fops);
95138+#else
95139 pe = proc_create("timer_stats", 0644, NULL, &tstats_fops);
95140+#endif
95141 if (!pe)
95142 return -ENOMEM;
95143 return 0;
95144diff --git a/kernel/torture.c b/kernel/torture.c
95145index dd70993..0bf694b 100644
95146--- a/kernel/torture.c
95147+++ b/kernel/torture.c
95148@@ -482,7 +482,7 @@ static int torture_shutdown_notify(struct notifier_block *unused1,
95149 mutex_lock(&fullstop_mutex);
95150 if (ACCESS_ONCE(fullstop) == FULLSTOP_DONTSTOP) {
95151 VERBOSE_TOROUT_STRING("Unscheduled system shutdown detected");
95152- ACCESS_ONCE(fullstop) = FULLSTOP_SHUTDOWN;
95153+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_SHUTDOWN;
95154 } else {
95155 pr_warn("Concurrent rmmod and shutdown illegal!\n");
95156 }
95157@@ -549,14 +549,14 @@ static int torture_stutter(void *arg)
95158 if (!torture_must_stop()) {
95159 if (stutter > 1) {
95160 schedule_timeout_interruptible(stutter - 1);
95161- ACCESS_ONCE(stutter_pause_test) = 2;
95162+ ACCESS_ONCE_RW(stutter_pause_test) = 2;
95163 }
95164 schedule_timeout_interruptible(1);
95165- ACCESS_ONCE(stutter_pause_test) = 1;
95166+ ACCESS_ONCE_RW(stutter_pause_test) = 1;
95167 }
95168 if (!torture_must_stop())
95169 schedule_timeout_interruptible(stutter);
95170- ACCESS_ONCE(stutter_pause_test) = 0;
95171+ ACCESS_ONCE_RW(stutter_pause_test) = 0;
95172 torture_shutdown_absorb("torture_stutter");
95173 } while (!torture_must_stop());
95174 torture_kthread_stopping("torture_stutter");
95175@@ -648,7 +648,7 @@ bool torture_cleanup_begin(void)
95176 schedule_timeout_uninterruptible(10);
95177 return true;
95178 }
95179- ACCESS_ONCE(fullstop) = FULLSTOP_RMMOD;
95180+ ACCESS_ONCE_RW(fullstop) = FULLSTOP_RMMOD;
95181 mutex_unlock(&fullstop_mutex);
95182 torture_shutdown_cleanup();
95183 torture_shuffle_cleanup();
95184diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
95185index 483cecf..ac46091 100644
95186--- a/kernel/trace/blktrace.c
95187+++ b/kernel/trace/blktrace.c
95188@@ -328,7 +328,7 @@ static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
95189 struct blk_trace *bt = filp->private_data;
95190 char buf[16];
95191
95192- snprintf(buf, sizeof(buf), "%u\n", atomic_read(&bt->dropped));
95193+ snprintf(buf, sizeof(buf), "%u\n", atomic_read_unchecked(&bt->dropped));
95194
95195 return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
95196 }
95197@@ -386,7 +386,7 @@ static int blk_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
95198 return 1;
95199
95200 bt = buf->chan->private_data;
95201- atomic_inc(&bt->dropped);
95202+ atomic_inc_unchecked(&bt->dropped);
95203 return 0;
95204 }
95205
95206@@ -487,7 +487,7 @@ int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
95207
95208 bt->dir = dir;
95209 bt->dev = dev;
95210- atomic_set(&bt->dropped, 0);
95211+ atomic_set_unchecked(&bt->dropped, 0);
95212 INIT_LIST_HEAD(&bt->running_list);
95213
95214 ret = -EIO;
95215diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
95216index 4f22802..bd268b1 100644
95217--- a/kernel/trace/ftrace.c
95218+++ b/kernel/trace/ftrace.c
95219@@ -2382,12 +2382,17 @@ ftrace_code_disable(struct module *mod, struct dyn_ftrace *rec)
95220 if (unlikely(ftrace_disabled))
95221 return 0;
95222
95223+ ret = ftrace_arch_code_modify_prepare();
95224+ FTRACE_WARN_ON(ret);
95225+ if (ret)
95226+ return 0;
95227+
95228 ret = ftrace_make_nop(mod, rec, MCOUNT_ADDR);
95229+ FTRACE_WARN_ON(ftrace_arch_code_modify_post_process());
95230 if (ret) {
95231 ftrace_bug(ret, rec);
95232- return 0;
95233 }
95234- return 1;
95235+ return ret ? 0 : 1;
95236 }
95237
95238 /*
95239@@ -4776,8 +4781,10 @@ static int ftrace_process_locs(struct module *mod,
95240 if (!count)
95241 return 0;
95242
95243+ pax_open_kernel();
95244 sort(start, count, sizeof(*start),
95245 ftrace_cmp_ips, ftrace_swap_ips);
95246+ pax_close_kernel();
95247
95248 start_pg = ftrace_allocate_pages(count);
95249 if (!start_pg)
95250@@ -5653,7 +5660,7 @@ static int alloc_retstack_tasklist(struct ftrace_ret_stack **ret_stack_list)
95251
95252 if (t->ret_stack == NULL) {
95253 atomic_set(&t->tracing_graph_pause, 0);
95254- atomic_set(&t->trace_overrun, 0);
95255+ atomic_set_unchecked(&t->trace_overrun, 0);
95256 t->curr_ret_stack = -1;
95257 /* Make sure the tasks see the -1 first: */
95258 smp_wmb();
95259@@ -5876,7 +5883,7 @@ static void
95260 graph_init_task(struct task_struct *t, struct ftrace_ret_stack *ret_stack)
95261 {
95262 atomic_set(&t->tracing_graph_pause, 0);
95263- atomic_set(&t->trace_overrun, 0);
95264+ atomic_set_unchecked(&t->trace_overrun, 0);
95265 t->ftrace_timestamp = 0;
95266 /* make curr_ret_stack visible before we add the ret_stack */
95267 smp_wmb();
95268diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
95269index 922048a..bb71a55 100644
95270--- a/kernel/trace/ring_buffer.c
95271+++ b/kernel/trace/ring_buffer.c
95272@@ -348,9 +348,9 @@ struct buffer_data_page {
95273 */
95274 struct buffer_page {
95275 struct list_head list; /* list of buffer pages */
95276- local_t write; /* index for next write */
95277+ local_unchecked_t write; /* index for next write */
95278 unsigned read; /* index for next read */
95279- local_t entries; /* entries on this page */
95280+ local_unchecked_t entries; /* entries on this page */
95281 unsigned long real_end; /* real end of data */
95282 struct buffer_data_page *page; /* Actual data page */
95283 };
95284@@ -471,11 +471,11 @@ struct ring_buffer_per_cpu {
95285 unsigned long last_overrun;
95286 local_t entries_bytes;
95287 local_t entries;
95288- local_t overrun;
95289- local_t commit_overrun;
95290- local_t dropped_events;
95291+ local_unchecked_t overrun;
95292+ local_unchecked_t commit_overrun;
95293+ local_unchecked_t dropped_events;
95294 local_t committing;
95295- local_t commits;
95296+ local_unchecked_t commits;
95297 unsigned long read;
95298 unsigned long read_bytes;
95299 u64 write_stamp;
95300@@ -1045,8 +1045,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
95301 *
95302 * We add a counter to the write field to denote this.
95303 */
95304- old_write = local_add_return(RB_WRITE_INTCNT, &next_page->write);
95305- old_entries = local_add_return(RB_WRITE_INTCNT, &next_page->entries);
95306+ old_write = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->write);
95307+ old_entries = local_add_return_unchecked(RB_WRITE_INTCNT, &next_page->entries);
95308
95309 /*
95310 * Just make sure we have seen our old_write and synchronize
95311@@ -1074,8 +1074,8 @@ static int rb_tail_page_update(struct ring_buffer_per_cpu *cpu_buffer,
95312 * cmpxchg to only update if an interrupt did not already
95313 * do it for us. If the cmpxchg fails, we don't care.
95314 */
95315- (void)local_cmpxchg(&next_page->write, old_write, val);
95316- (void)local_cmpxchg(&next_page->entries, old_entries, eval);
95317+ (void)local_cmpxchg_unchecked(&next_page->write, old_write, val);
95318+ (void)local_cmpxchg_unchecked(&next_page->entries, old_entries, eval);
95319
95320 /*
95321 * No need to worry about races with clearing out the commit.
95322@@ -1443,12 +1443,12 @@ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
95323
95324 static inline unsigned long rb_page_entries(struct buffer_page *bpage)
95325 {
95326- return local_read(&bpage->entries) & RB_WRITE_MASK;
95327+ return local_read_unchecked(&bpage->entries) & RB_WRITE_MASK;
95328 }
95329
95330 static inline unsigned long rb_page_write(struct buffer_page *bpage)
95331 {
95332- return local_read(&bpage->write) & RB_WRITE_MASK;
95333+ return local_read_unchecked(&bpage->write) & RB_WRITE_MASK;
95334 }
95335
95336 static int
95337@@ -1543,7 +1543,7 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned int nr_pages)
95338 * bytes consumed in ring buffer from here.
95339 * Increment overrun to account for the lost events.
95340 */
95341- local_add(page_entries, &cpu_buffer->overrun);
95342+ local_add_unchecked(page_entries, &cpu_buffer->overrun);
95343 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
95344 }
95345
95346@@ -2105,7 +2105,7 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer,
95347 * it is our responsibility to update
95348 * the counters.
95349 */
95350- local_add(entries, &cpu_buffer->overrun);
95351+ local_add_unchecked(entries, &cpu_buffer->overrun);
95352 local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes);
95353
95354 /*
95355@@ -2255,7 +2255,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
95356 if (tail == BUF_PAGE_SIZE)
95357 tail_page->real_end = 0;
95358
95359- local_sub(length, &tail_page->write);
95360+ local_sub_unchecked(length, &tail_page->write);
95361 return;
95362 }
95363
95364@@ -2290,7 +2290,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
95365 rb_event_set_padding(event);
95366
95367 /* Set the write back to the previous setting */
95368- local_sub(length, &tail_page->write);
95369+ local_sub_unchecked(length, &tail_page->write);
95370 return;
95371 }
95372
95373@@ -2302,7 +2302,7 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer,
95374
95375 /* Set write to end of buffer */
95376 length = (tail + length) - BUF_PAGE_SIZE;
95377- local_sub(length, &tail_page->write);
95378+ local_sub_unchecked(length, &tail_page->write);
95379 }
95380
95381 /*
95382@@ -2328,7 +2328,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
95383 * about it.
95384 */
95385 if (unlikely(next_page == commit_page)) {
95386- local_inc(&cpu_buffer->commit_overrun);
95387+ local_inc_unchecked(&cpu_buffer->commit_overrun);
95388 goto out_reset;
95389 }
95390
95391@@ -2358,7 +2358,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
95392 * this is easy, just stop here.
95393 */
95394 if (!(buffer->flags & RB_FL_OVERWRITE)) {
95395- local_inc(&cpu_buffer->dropped_events);
95396+ local_inc_unchecked(&cpu_buffer->dropped_events);
95397 goto out_reset;
95398 }
95399
95400@@ -2384,7 +2384,7 @@ rb_move_tail(struct ring_buffer_per_cpu *cpu_buffer,
95401 cpu_buffer->tail_page) &&
95402 (cpu_buffer->commit_page ==
95403 cpu_buffer->reader_page))) {
95404- local_inc(&cpu_buffer->commit_overrun);
95405+ local_inc_unchecked(&cpu_buffer->commit_overrun);
95406 goto out_reset;
95407 }
95408 }
95409@@ -2432,7 +2432,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
95410 length += RB_LEN_TIME_EXTEND;
95411
95412 tail_page = cpu_buffer->tail_page;
95413- write = local_add_return(length, &tail_page->write);
95414+ write = local_add_return_unchecked(length, &tail_page->write);
95415
95416 /* set write to only the index of the write */
95417 write &= RB_WRITE_MASK;
95418@@ -2456,7 +2456,7 @@ __rb_reserve_next(struct ring_buffer_per_cpu *cpu_buffer,
95419 kmemcheck_annotate_bitfield(event, bitfield);
95420 rb_update_event(cpu_buffer, event, length, add_timestamp, delta);
95421
95422- local_inc(&tail_page->entries);
95423+ local_inc_unchecked(&tail_page->entries);
95424
95425 /*
95426 * If this is the first commit on the page, then update
95427@@ -2489,7 +2489,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
95428
95429 if (bpage->page == (void *)addr && rb_page_write(bpage) == old_index) {
95430 unsigned long write_mask =
95431- local_read(&bpage->write) & ~RB_WRITE_MASK;
95432+ local_read_unchecked(&bpage->write) & ~RB_WRITE_MASK;
95433 unsigned long event_length = rb_event_length(event);
95434 /*
95435 * This is on the tail page. It is possible that
95436@@ -2499,7 +2499,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
95437 */
95438 old_index += write_mask;
95439 new_index += write_mask;
95440- index = local_cmpxchg(&bpage->write, old_index, new_index);
95441+ index = local_cmpxchg_unchecked(&bpage->write, old_index, new_index);
95442 if (index == old_index) {
95443 /* update counters */
95444 local_sub(event_length, &cpu_buffer->entries_bytes);
95445@@ -2514,7 +2514,7 @@ rb_try_to_discard(struct ring_buffer_per_cpu *cpu_buffer,
95446 static void rb_start_commit(struct ring_buffer_per_cpu *cpu_buffer)
95447 {
95448 local_inc(&cpu_buffer->committing);
95449- local_inc(&cpu_buffer->commits);
95450+ local_inc_unchecked(&cpu_buffer->commits);
95451 }
95452
95453 static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
95454@@ -2526,7 +2526,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
95455 return;
95456
95457 again:
95458- commits = local_read(&cpu_buffer->commits);
95459+ commits = local_read_unchecked(&cpu_buffer->commits);
95460 /* synchronize with interrupts */
95461 barrier();
95462 if (local_read(&cpu_buffer->committing) == 1)
95463@@ -2542,7 +2542,7 @@ static inline void rb_end_commit(struct ring_buffer_per_cpu *cpu_buffer)
95464 * updating of the commit page and the clearing of the
95465 * committing counter.
95466 */
95467- if (unlikely(local_read(&cpu_buffer->commits) != commits) &&
95468+ if (unlikely(local_read_unchecked(&cpu_buffer->commits) != commits) &&
95469 !local_read(&cpu_buffer->committing)) {
95470 local_inc(&cpu_buffer->committing);
95471 goto again;
95472@@ -2572,7 +2572,7 @@ rb_reserve_next_event(struct ring_buffer *buffer,
95473 barrier();
95474 if (unlikely(ACCESS_ONCE(cpu_buffer->buffer) != buffer)) {
95475 local_dec(&cpu_buffer->committing);
95476- local_dec(&cpu_buffer->commits);
95477+ local_dec_unchecked(&cpu_buffer->commits);
95478 return NULL;
95479 }
95480 #endif
95481@@ -2901,7 +2901,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
95482
95483 /* Do the likely case first */
95484 if (likely(bpage->page == (void *)addr)) {
95485- local_dec(&bpage->entries);
95486+ local_dec_unchecked(&bpage->entries);
95487 return;
95488 }
95489
95490@@ -2913,7 +2913,7 @@ rb_decrement_entry(struct ring_buffer_per_cpu *cpu_buffer,
95491 start = bpage;
95492 do {
95493 if (bpage->page == (void *)addr) {
95494- local_dec(&bpage->entries);
95495+ local_dec_unchecked(&bpage->entries);
95496 return;
95497 }
95498 rb_inc_page(cpu_buffer, &bpage);
95499@@ -3197,7 +3197,7 @@ static inline unsigned long
95500 rb_num_of_entries(struct ring_buffer_per_cpu *cpu_buffer)
95501 {
95502 return local_read(&cpu_buffer->entries) -
95503- (local_read(&cpu_buffer->overrun) + cpu_buffer->read);
95504+ (local_read_unchecked(&cpu_buffer->overrun) + cpu_buffer->read);
95505 }
95506
95507 /**
95508@@ -3286,7 +3286,7 @@ unsigned long ring_buffer_overrun_cpu(struct ring_buffer *buffer, int cpu)
95509 return 0;
95510
95511 cpu_buffer = buffer->buffers[cpu];
95512- ret = local_read(&cpu_buffer->overrun);
95513+ ret = local_read_unchecked(&cpu_buffer->overrun);
95514
95515 return ret;
95516 }
95517@@ -3309,7 +3309,7 @@ ring_buffer_commit_overrun_cpu(struct ring_buffer *buffer, int cpu)
95518 return 0;
95519
95520 cpu_buffer = buffer->buffers[cpu];
95521- ret = local_read(&cpu_buffer->commit_overrun);
95522+ ret = local_read_unchecked(&cpu_buffer->commit_overrun);
95523
95524 return ret;
95525 }
95526@@ -3331,7 +3331,7 @@ ring_buffer_dropped_events_cpu(struct ring_buffer *buffer, int cpu)
95527 return 0;
95528
95529 cpu_buffer = buffer->buffers[cpu];
95530- ret = local_read(&cpu_buffer->dropped_events);
95531+ ret = local_read_unchecked(&cpu_buffer->dropped_events);
95532
95533 return ret;
95534 }
95535@@ -3394,7 +3394,7 @@ unsigned long ring_buffer_overruns(struct ring_buffer *buffer)
95536 /* if you care about this being correct, lock the buffer */
95537 for_each_buffer_cpu(buffer, cpu) {
95538 cpu_buffer = buffer->buffers[cpu];
95539- overruns += local_read(&cpu_buffer->overrun);
95540+ overruns += local_read_unchecked(&cpu_buffer->overrun);
95541 }
95542
95543 return overruns;
95544@@ -3565,8 +3565,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
95545 /*
95546 * Reset the reader page to size zero.
95547 */
95548- local_set(&cpu_buffer->reader_page->write, 0);
95549- local_set(&cpu_buffer->reader_page->entries, 0);
95550+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
95551+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
95552 local_set(&cpu_buffer->reader_page->page->commit, 0);
95553 cpu_buffer->reader_page->real_end = 0;
95554
95555@@ -3600,7 +3600,7 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
95556 * want to compare with the last_overrun.
95557 */
95558 smp_mb();
95559- overwrite = local_read(&(cpu_buffer->overrun));
95560+ overwrite = local_read_unchecked(&(cpu_buffer->overrun));
95561
95562 /*
95563 * Here's the tricky part.
95564@@ -4172,8 +4172,8 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
95565
95566 cpu_buffer->head_page
95567 = list_entry(cpu_buffer->pages, struct buffer_page, list);
95568- local_set(&cpu_buffer->head_page->write, 0);
95569- local_set(&cpu_buffer->head_page->entries, 0);
95570+ local_set_unchecked(&cpu_buffer->head_page->write, 0);
95571+ local_set_unchecked(&cpu_buffer->head_page->entries, 0);
95572 local_set(&cpu_buffer->head_page->page->commit, 0);
95573
95574 cpu_buffer->head_page->read = 0;
95575@@ -4183,18 +4183,18 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer)
95576
95577 INIT_LIST_HEAD(&cpu_buffer->reader_page->list);
95578 INIT_LIST_HEAD(&cpu_buffer->new_pages);
95579- local_set(&cpu_buffer->reader_page->write, 0);
95580- local_set(&cpu_buffer->reader_page->entries, 0);
95581+ local_set_unchecked(&cpu_buffer->reader_page->write, 0);
95582+ local_set_unchecked(&cpu_buffer->reader_page->entries, 0);
95583 local_set(&cpu_buffer->reader_page->page->commit, 0);
95584 cpu_buffer->reader_page->read = 0;
95585
95586 local_set(&cpu_buffer->entries_bytes, 0);
95587- local_set(&cpu_buffer->overrun, 0);
95588- local_set(&cpu_buffer->commit_overrun, 0);
95589- local_set(&cpu_buffer->dropped_events, 0);
95590+ local_set_unchecked(&cpu_buffer->overrun, 0);
95591+ local_set_unchecked(&cpu_buffer->commit_overrun, 0);
95592+ local_set_unchecked(&cpu_buffer->dropped_events, 0);
95593 local_set(&cpu_buffer->entries, 0);
95594 local_set(&cpu_buffer->committing, 0);
95595- local_set(&cpu_buffer->commits, 0);
95596+ local_set_unchecked(&cpu_buffer->commits, 0);
95597 cpu_buffer->read = 0;
95598 cpu_buffer->read_bytes = 0;
95599
95600@@ -4595,8 +4595,8 @@ int ring_buffer_read_page(struct ring_buffer *buffer,
95601 rb_init_page(bpage);
95602 bpage = reader->page;
95603 reader->page = *data_page;
95604- local_set(&reader->write, 0);
95605- local_set(&reader->entries, 0);
95606+ local_set_unchecked(&reader->write, 0);
95607+ local_set_unchecked(&reader->entries, 0);
95608 reader->read = 0;
95609 *data_page = bpage;
95610
95611diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
95612index 62c6506..5c25989 100644
95613--- a/kernel/trace/trace.c
95614+++ b/kernel/trace/trace.c
95615@@ -3500,7 +3500,7 @@ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set)
95616 return 0;
95617 }
95618
95619-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled)
95620+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled)
95621 {
95622 /* do nothing if flag is already set */
95623 if (!!(trace_flags & mask) == !!enabled)
95624diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
95625index dd8205a..1aae87a 100644
95626--- a/kernel/trace/trace.h
95627+++ b/kernel/trace/trace.h
95628@@ -1271,7 +1271,7 @@ extern const char *__stop___tracepoint_str[];
95629 void trace_printk_init_buffers(void);
95630 void trace_printk_start_comm(void);
95631 int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
95632-int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
95633+int set_tracer_flag(struct trace_array *tr, unsigned long mask, int enabled);
95634
95635 /*
95636 * Normal trace_printk() and friends allocates special buffers
95637diff --git a/kernel/trace/trace_clock.c b/kernel/trace/trace_clock.c
95638index 57b67b1..66082a9 100644
95639--- a/kernel/trace/trace_clock.c
95640+++ b/kernel/trace/trace_clock.c
95641@@ -124,7 +124,7 @@ u64 notrace trace_clock_global(void)
95642 return now;
95643 }
95644
95645-static atomic64_t trace_counter;
95646+static atomic64_unchecked_t trace_counter;
95647
95648 /*
95649 * trace_clock_counter(): simply an atomic counter.
95650@@ -133,5 +133,5 @@ static atomic64_t trace_counter;
95651 */
95652 u64 notrace trace_clock_counter(void)
95653 {
95654- return atomic64_add_return(1, &trace_counter);
95655+ return atomic64_inc_return_unchecked(&trace_counter);
95656 }
95657diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
95658index a9c10a3..1864f6b 100644
95659--- a/kernel/trace/trace_events.c
95660+++ b/kernel/trace/trace_events.c
95661@@ -1762,7 +1762,6 @@ __trace_early_add_new_event(struct ftrace_event_call *call,
95662 return 0;
95663 }
95664
95665-struct ftrace_module_file_ops;
95666 static void __add_event_to_tracers(struct ftrace_event_call *call);
95667
95668 /* Add an additional event_call dynamically */
95669diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
95670index b6fce36..d9f11a3 100644
95671--- a/kernel/trace/trace_functions_graph.c
95672+++ b/kernel/trace/trace_functions_graph.c
95673@@ -133,7 +133,7 @@ ftrace_push_return_trace(unsigned long ret, unsigned long func, int *depth,
95674
95675 /* The return trace stack is full */
95676 if (current->curr_ret_stack == FTRACE_RETFUNC_DEPTH - 1) {
95677- atomic_inc(&current->trace_overrun);
95678+ atomic_inc_unchecked(&current->trace_overrun);
95679 return -EBUSY;
95680 }
95681
95682@@ -230,7 +230,7 @@ ftrace_pop_return_trace(struct ftrace_graph_ret *trace, unsigned long *ret,
95683 *ret = current->ret_stack[index].ret;
95684 trace->func = current->ret_stack[index].func;
95685 trace->calltime = current->ret_stack[index].calltime;
95686- trace->overrun = atomic_read(&current->trace_overrun);
95687+ trace->overrun = atomic_read_unchecked(&current->trace_overrun);
95688 trace->depth = index;
95689 }
95690
95691diff --git a/kernel/trace/trace_mmiotrace.c b/kernel/trace/trace_mmiotrace.c
95692index 7a9ba62..2e0e4a1 100644
95693--- a/kernel/trace/trace_mmiotrace.c
95694+++ b/kernel/trace/trace_mmiotrace.c
95695@@ -24,7 +24,7 @@ struct header_iter {
95696 static struct trace_array *mmio_trace_array;
95697 static bool overrun_detected;
95698 static unsigned long prev_overruns;
95699-static atomic_t dropped_count;
95700+static atomic_unchecked_t dropped_count;
95701
95702 static void mmio_reset_data(struct trace_array *tr)
95703 {
95704@@ -124,7 +124,7 @@ static void mmio_close(struct trace_iterator *iter)
95705
95706 static unsigned long count_overruns(struct trace_iterator *iter)
95707 {
95708- unsigned long cnt = atomic_xchg(&dropped_count, 0);
95709+ unsigned long cnt = atomic_xchg_unchecked(&dropped_count, 0);
95710 unsigned long over = ring_buffer_overruns(iter->trace_buffer->buffer);
95711
95712 if (over > prev_overruns)
95713@@ -307,7 +307,7 @@ static void __trace_mmiotrace_rw(struct trace_array *tr,
95714 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_RW,
95715 sizeof(*entry), 0, pc);
95716 if (!event) {
95717- atomic_inc(&dropped_count);
95718+ atomic_inc_unchecked(&dropped_count);
95719 return;
95720 }
95721 entry = ring_buffer_event_data(event);
95722@@ -337,7 +337,7 @@ static void __trace_mmiotrace_map(struct trace_array *tr,
95723 event = trace_buffer_lock_reserve(buffer, TRACE_MMIO_MAP,
95724 sizeof(*entry), 0, pc);
95725 if (!event) {
95726- atomic_inc(&dropped_count);
95727+ atomic_inc_unchecked(&dropped_count);
95728 return;
95729 }
95730 entry = ring_buffer_event_data(event);
95731diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
95732index 692bf71..6d9a9cd 100644
95733--- a/kernel/trace/trace_output.c
95734+++ b/kernel/trace/trace_output.c
95735@@ -751,14 +751,16 @@ int register_ftrace_event(struct trace_event *event)
95736 goto out;
95737 }
95738
95739+ pax_open_kernel();
95740 if (event->funcs->trace == NULL)
95741- event->funcs->trace = trace_nop_print;
95742+ *(void **)&event->funcs->trace = trace_nop_print;
95743 if (event->funcs->raw == NULL)
95744- event->funcs->raw = trace_nop_print;
95745+ *(void **)&event->funcs->raw = trace_nop_print;
95746 if (event->funcs->hex == NULL)
95747- event->funcs->hex = trace_nop_print;
95748+ *(void **)&event->funcs->hex = trace_nop_print;
95749 if (event->funcs->binary == NULL)
95750- event->funcs->binary = trace_nop_print;
95751+ *(void **)&event->funcs->binary = trace_nop_print;
95752+ pax_close_kernel();
95753
95754 key = event->type & (EVENT_HASHSIZE - 1);
95755
95756diff --git a/kernel/trace/trace_seq.c b/kernel/trace/trace_seq.c
95757index e694c9f..6775a38 100644
95758--- a/kernel/trace/trace_seq.c
95759+++ b/kernel/trace/trace_seq.c
95760@@ -337,7 +337,7 @@ int trace_seq_path(struct trace_seq *s, const struct path *path)
95761 return 0;
95762 }
95763
95764- seq_buf_path(&s->seq, path, "\n");
95765+ seq_buf_path(&s->seq, path, "\n\\");
95766
95767 if (unlikely(seq_buf_has_overflowed(&s->seq))) {
95768 s->seq.len = save_len;
95769diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
95770index c3e4fcf..ef6cc43 100644
95771--- a/kernel/trace/trace_stack.c
95772+++ b/kernel/trace/trace_stack.c
95773@@ -88,7 +88,7 @@ check_stack(unsigned long ip, unsigned long *stack)
95774 return;
95775
95776 /* we do not handle interrupt stacks yet */
95777- if (!object_is_on_stack(stack))
95778+ if (!object_starts_on_stack(stack))
95779 return;
95780
95781 local_irq_save(flags);
95782diff --git a/kernel/trace/trace_syscalls.c b/kernel/trace/trace_syscalls.c
95783index f97f6e3..d367b48 100644
95784--- a/kernel/trace/trace_syscalls.c
95785+++ b/kernel/trace/trace_syscalls.c
95786@@ -590,6 +590,8 @@ static int perf_sysenter_enable(struct ftrace_event_call *call)
95787 int num;
95788
95789 num = ((struct syscall_metadata *)call->data)->syscall_nr;
95790+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
95791+ return -EINVAL;
95792
95793 mutex_lock(&syscall_trace_lock);
95794 if (!sys_perf_refcount_enter)
95795@@ -610,6 +612,8 @@ static void perf_sysenter_disable(struct ftrace_event_call *call)
95796 int num;
95797
95798 num = ((struct syscall_metadata *)call->data)->syscall_nr;
95799+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
95800+ return;
95801
95802 mutex_lock(&syscall_trace_lock);
95803 sys_perf_refcount_enter--;
95804@@ -662,6 +666,8 @@ static int perf_sysexit_enable(struct ftrace_event_call *call)
95805 int num;
95806
95807 num = ((struct syscall_metadata *)call->data)->syscall_nr;
95808+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
95809+ return -EINVAL;
95810
95811 mutex_lock(&syscall_trace_lock);
95812 if (!sys_perf_refcount_exit)
95813@@ -682,6 +688,8 @@ static void perf_sysexit_disable(struct ftrace_event_call *call)
95814 int num;
95815
95816 num = ((struct syscall_metadata *)call->data)->syscall_nr;
95817+ if (WARN_ON_ONCE(num < 0 || num >= NR_syscalls))
95818+ return;
95819
95820 mutex_lock(&syscall_trace_lock);
95821 sys_perf_refcount_exit--;
95822diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
95823index 4109f83..fe1f830 100644
95824--- a/kernel/user_namespace.c
95825+++ b/kernel/user_namespace.c
95826@@ -83,6 +83,21 @@ int create_user_ns(struct cred *new)
95827 !kgid_has_mapping(parent_ns, group))
95828 return -EPERM;
95829
95830+#ifdef CONFIG_GRKERNSEC
95831+ /*
95832+ * This doesn't really inspire confidence:
95833+ * http://marc.info/?l=linux-kernel&m=135543612731939&w=2
95834+ * http://marc.info/?l=linux-kernel&m=135545831607095&w=2
95835+ * Increases kernel attack surface in areas developers
95836+ * previously cared little about ("low importance due
95837+ * to requiring "root" capability")
95838+ * To be removed when this code receives *proper* review
95839+ */
95840+ if (!capable(CAP_SYS_ADMIN) || !capable(CAP_SETUID) ||
95841+ !capable(CAP_SETGID))
95842+ return -EPERM;
95843+#endif
95844+
95845 ns = kmem_cache_zalloc(user_ns_cachep, GFP_KERNEL);
95846 if (!ns)
95847 return -ENOMEM;
95848@@ -980,7 +995,7 @@ static int userns_install(struct nsproxy *nsproxy, struct ns_common *ns)
95849 if (atomic_read(&current->mm->mm_users) > 1)
95850 return -EINVAL;
95851
95852- if (current->fs->users != 1)
95853+ if (atomic_read(&current->fs->users) != 1)
95854 return -EINVAL;
95855
95856 if (!ns_capable(user_ns, CAP_SYS_ADMIN))
95857diff --git a/kernel/utsname_sysctl.c b/kernel/utsname_sysctl.c
95858index c8eac43..4b5f08f 100644
95859--- a/kernel/utsname_sysctl.c
95860+++ b/kernel/utsname_sysctl.c
95861@@ -47,7 +47,7 @@ static void put_uts(struct ctl_table *table, int write, void *which)
95862 static int proc_do_uts_string(struct ctl_table *table, int write,
95863 void __user *buffer, size_t *lenp, loff_t *ppos)
95864 {
95865- struct ctl_table uts_table;
95866+ ctl_table_no_const uts_table;
95867 int r;
95868 memcpy(&uts_table, table, sizeof(uts_table));
95869 uts_table.data = get_uts(table, write);
95870diff --git a/kernel/watchdog.c b/kernel/watchdog.c
95871index 3174bf8..3553520 100644
95872--- a/kernel/watchdog.c
95873+++ b/kernel/watchdog.c
95874@@ -572,7 +572,7 @@ static int watchdog_nmi_enable(unsigned int cpu) { return 0; }
95875 static void watchdog_nmi_disable(unsigned int cpu) { return; }
95876 #endif /* CONFIG_HARDLOCKUP_DETECTOR */
95877
95878-static struct smp_hotplug_thread watchdog_threads = {
95879+static struct smp_hotplug_thread watchdog_threads __read_only = {
95880 .store = &softlockup_watchdog,
95881 .thread_should_run = watchdog_should_run,
95882 .thread_fn = watchdog,
95883diff --git a/kernel/workqueue.c b/kernel/workqueue.c
95884index 41ff75b..5ad683a 100644
95885--- a/kernel/workqueue.c
95886+++ b/kernel/workqueue.c
95887@@ -4564,7 +4564,7 @@ static void rebind_workers(struct worker_pool *pool)
95888 WARN_ON_ONCE(!(worker_flags & WORKER_UNBOUND));
95889 worker_flags |= WORKER_REBOUND;
95890 worker_flags &= ~WORKER_UNBOUND;
95891- ACCESS_ONCE(worker->flags) = worker_flags;
95892+ ACCESS_ONCE_RW(worker->flags) = worker_flags;
95893 }
95894
95895 spin_unlock_irq(&pool->lock);
95896diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
95897index c5cefb3..a4241e3 100644
95898--- a/lib/Kconfig.debug
95899+++ b/lib/Kconfig.debug
95900@@ -923,7 +923,7 @@ config DEBUG_MUTEXES
95901
95902 config DEBUG_WW_MUTEX_SLOWPATH
95903 bool "Wait/wound mutex debugging: Slowpath testing"
95904- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
95905+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
95906 select DEBUG_LOCK_ALLOC
95907 select DEBUG_SPINLOCK
95908 select DEBUG_MUTEXES
95909@@ -940,7 +940,7 @@ config DEBUG_WW_MUTEX_SLOWPATH
95910
95911 config DEBUG_LOCK_ALLOC
95912 bool "Lock debugging: detect incorrect freeing of live locks"
95913- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
95914+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
95915 select DEBUG_SPINLOCK
95916 select DEBUG_MUTEXES
95917 select LOCKDEP
95918@@ -954,7 +954,7 @@ config DEBUG_LOCK_ALLOC
95919
95920 config PROVE_LOCKING
95921 bool "Lock debugging: prove locking correctness"
95922- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
95923+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
95924 select LOCKDEP
95925 select DEBUG_SPINLOCK
95926 select DEBUG_MUTEXES
95927@@ -1005,7 +1005,7 @@ config LOCKDEP
95928
95929 config LOCK_STAT
95930 bool "Lock usage statistics"
95931- depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
95932+ depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT && !PAX_CONSTIFY_PLUGIN
95933 select LOCKDEP
95934 select DEBUG_SPINLOCK
95935 select DEBUG_MUTEXES
95936@@ -1467,6 +1467,7 @@ config LATENCYTOP
95937 depends on DEBUG_KERNEL
95938 depends on STACKTRACE_SUPPORT
95939 depends on PROC_FS
95940+ depends on !GRKERNSEC_HIDESYM
95941 select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE && !ARM_UNWIND && !ARC
95942 select KALLSYMS
95943 select KALLSYMS_ALL
95944@@ -1483,7 +1484,7 @@ config ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
95945 config DEBUG_STRICT_USER_COPY_CHECKS
95946 bool "Strict user copy size checks"
95947 depends on ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
95948- depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING
95949+ depends on DEBUG_KERNEL && !TRACE_BRANCH_PROFILING && !PAX_SIZE_OVERFLOW
95950 help
95951 Enabling this option turns a certain set of sanity checks for user
95952 copy operations into compile time failures.
95953@@ -1614,7 +1615,7 @@ endmenu # runtime tests
95954
95955 config PROVIDE_OHCI1394_DMA_INIT
95956 bool "Remote debugging over FireWire early on boot"
95957- depends on PCI && X86
95958+ depends on PCI && X86 && !GRKERNSEC
95959 help
95960 If you want to debug problems which hang or crash the kernel early
95961 on boot and the crashing machine has a FireWire port, you can use
95962diff --git a/lib/Makefile b/lib/Makefile
95963index 58f74d2..08e011f 100644
95964--- a/lib/Makefile
95965+++ b/lib/Makefile
95966@@ -59,7 +59,7 @@ obj-$(CONFIG_BTREE) += btree.o
95967 obj-$(CONFIG_INTERVAL_TREE) += interval_tree.o
95968 obj-$(CONFIG_ASSOCIATIVE_ARRAY) += assoc_array.o
95969 obj-$(CONFIG_DEBUG_PREEMPT) += smp_processor_id.o
95970-obj-$(CONFIG_DEBUG_LIST) += list_debug.o
95971+obj-y += list_debug.o
95972 obj-$(CONFIG_DEBUG_OBJECTS) += debugobjects.o
95973
95974 ifneq ($(CONFIG_HAVE_DEC_LOCK),y)
95975diff --git a/lib/average.c b/lib/average.c
95976index 114d1be..ab0350c 100644
95977--- a/lib/average.c
95978+++ b/lib/average.c
95979@@ -55,7 +55,7 @@ struct ewma *ewma_add(struct ewma *avg, unsigned long val)
95980 {
95981 unsigned long internal = ACCESS_ONCE(avg->internal);
95982
95983- ACCESS_ONCE(avg->internal) = internal ?
95984+ ACCESS_ONCE_RW(avg->internal) = internal ?
95985 (((internal << avg->weight) - internal) +
95986 (val << avg->factor)) >> avg->weight :
95987 (val << avg->factor);
95988diff --git a/lib/bitmap.c b/lib/bitmap.c
95989index d456f4c1..29a0308 100644
95990--- a/lib/bitmap.c
95991+++ b/lib/bitmap.c
95992@@ -264,7 +264,7 @@ int __bitmap_subset(const unsigned long *bitmap1,
95993 }
95994 EXPORT_SYMBOL(__bitmap_subset);
95995
95996-int __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
95997+int __intentional_overflow(-1) __bitmap_weight(const unsigned long *bitmap, unsigned int bits)
95998 {
95999 unsigned int k, lim = bits/BITS_PER_LONG;
96000 int w = 0;
96001@@ -391,7 +391,7 @@ int __bitmap_parse(const char *buf, unsigned int buflen,
96002 {
96003 int c, old_c, totaldigits, ndigits, nchunks, nbits;
96004 u32 chunk;
96005- const char __user __force *ubuf = (const char __user __force *)buf;
96006+ const char __user *ubuf = (const char __force_user *)buf;
96007
96008 bitmap_zero(maskp, nmaskbits);
96009
96010@@ -476,7 +476,7 @@ int bitmap_parse_user(const char __user *ubuf,
96011 {
96012 if (!access_ok(VERIFY_READ, ubuf, ulen))
96013 return -EFAULT;
96014- return __bitmap_parse((const char __force *)ubuf,
96015+ return __bitmap_parse((const char __force_kernel *)ubuf,
96016 ulen, 1, maskp, nmaskbits);
96017
96018 }
96019@@ -535,7 +535,7 @@ static int __bitmap_parselist(const char *buf, unsigned int buflen,
96020 {
96021 unsigned a, b;
96022 int c, old_c, totaldigits;
96023- const char __user __force *ubuf = (const char __user __force *)buf;
96024+ const char __user *ubuf = (const char __force_user *)buf;
96025 int exp_digit, in_range;
96026
96027 totaldigits = c = 0;
96028@@ -630,7 +630,7 @@ int bitmap_parselist_user(const char __user *ubuf,
96029 {
96030 if (!access_ok(VERIFY_READ, ubuf, ulen))
96031 return -EFAULT;
96032- return __bitmap_parselist((const char __force *)ubuf,
96033+ return __bitmap_parselist((const char __force_kernel *)ubuf,
96034 ulen, 1, maskp, nmaskbits);
96035 }
96036 EXPORT_SYMBOL(bitmap_parselist_user);
96037diff --git a/lib/bug.c b/lib/bug.c
96038index 0c3bd95..5a615a1 100644
96039--- a/lib/bug.c
96040+++ b/lib/bug.c
96041@@ -145,6 +145,8 @@ enum bug_trap_type report_bug(unsigned long bugaddr, struct pt_regs *regs)
96042 return BUG_TRAP_TYPE_NONE;
96043
96044 bug = find_bug(bugaddr);
96045+ if (!bug)
96046+ return BUG_TRAP_TYPE_NONE;
96047
96048 file = NULL;
96049 line = 0;
96050diff --git a/lib/debugobjects.c b/lib/debugobjects.c
96051index 547f7f9..a6d4ba0 100644
96052--- a/lib/debugobjects.c
96053+++ b/lib/debugobjects.c
96054@@ -289,7 +289,7 @@ static void debug_object_is_on_stack(void *addr, int onstack)
96055 if (limit > 4)
96056 return;
96057
96058- is_on_stack = object_is_on_stack(addr);
96059+ is_on_stack = object_starts_on_stack(addr);
96060 if (is_on_stack == onstack)
96061 return;
96062
96063diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c
96064index 6dd0335..1e9c239 100644
96065--- a/lib/decompress_bunzip2.c
96066+++ b/lib/decompress_bunzip2.c
96067@@ -665,7 +665,8 @@ static int INIT start_bunzip(struct bunzip_data **bdp, void *inbuf, long len,
96068
96069 /* Fourth byte (ascii '1'-'9'), indicates block size in units of 100k of
96070 uncompressed data. Allocate intermediate buffer for block. */
96071- bd->dbufSize = 100000*(i-BZh0);
96072+ i -= BZh0;
96073+ bd->dbufSize = 100000 * i;
96074
96075 bd->dbuf = large_malloc(bd->dbufSize * sizeof(int));
96076 if (!bd->dbuf)
96077diff --git a/lib/div64.c b/lib/div64.c
96078index 4382ad7..08aa558 100644
96079--- a/lib/div64.c
96080+++ b/lib/div64.c
96081@@ -59,7 +59,7 @@ uint32_t __attribute__((weak)) __div64_32(uint64_t *n, uint32_t base)
96082 EXPORT_SYMBOL(__div64_32);
96083
96084 #ifndef div_s64_rem
96085-s64 div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
96086+s64 __intentional_overflow(-1) div_s64_rem(s64 dividend, s32 divisor, s32 *remainder)
96087 {
96088 u64 quotient;
96089
96090@@ -130,7 +130,7 @@ EXPORT_SYMBOL(div64_u64_rem);
96091 * 'http://www.hackersdelight.org/HDcode/newCode/divDouble.c.txt'
96092 */
96093 #ifndef div64_u64
96094-u64 div64_u64(u64 dividend, u64 divisor)
96095+u64 __intentional_overflow(-1) div64_u64(u64 dividend, u64 divisor)
96096 {
96097 u32 high = divisor >> 32;
96098 u64 quot;
96099diff --git a/lib/dma-debug.c b/lib/dma-debug.c
96100index 9722bd2..0d826f4 100644
96101--- a/lib/dma-debug.c
96102+++ b/lib/dma-debug.c
96103@@ -979,7 +979,7 @@ static int dma_debug_device_change(struct notifier_block *nb, unsigned long acti
96104
96105 void dma_debug_add_bus(struct bus_type *bus)
96106 {
96107- struct notifier_block *nb;
96108+ notifier_block_no_const *nb;
96109
96110 if (dma_debug_disabled())
96111 return;
96112@@ -1161,7 +1161,7 @@ static void check_unmap(struct dma_debug_entry *ref)
96113
96114 static void check_for_stack(struct device *dev, void *addr)
96115 {
96116- if (object_is_on_stack(addr))
96117+ if (object_starts_on_stack(addr))
96118 err_printk(dev, NULL, "DMA-API: device driver maps memory from "
96119 "stack [addr=%p]\n", addr);
96120 }
96121diff --git a/lib/inflate.c b/lib/inflate.c
96122index 013a761..c28f3fc 100644
96123--- a/lib/inflate.c
96124+++ b/lib/inflate.c
96125@@ -269,7 +269,7 @@ static void free(void *where)
96126 malloc_ptr = free_mem_ptr;
96127 }
96128 #else
96129-#define malloc(a) kmalloc(a, GFP_KERNEL)
96130+#define malloc(a) kmalloc((a), GFP_KERNEL)
96131 #define free(a) kfree(a)
96132 #endif
96133
96134diff --git a/lib/ioremap.c b/lib/ioremap.c
96135index 0c9216c..863bd89 100644
96136--- a/lib/ioremap.c
96137+++ b/lib/ioremap.c
96138@@ -38,7 +38,7 @@ static inline int ioremap_pmd_range(pud_t *pud, unsigned long addr,
96139 unsigned long next;
96140
96141 phys_addr -= addr;
96142- pmd = pmd_alloc(&init_mm, pud, addr);
96143+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
96144 if (!pmd)
96145 return -ENOMEM;
96146 do {
96147@@ -56,7 +56,7 @@ static inline int ioremap_pud_range(pgd_t *pgd, unsigned long addr,
96148 unsigned long next;
96149
96150 phys_addr -= addr;
96151- pud = pud_alloc(&init_mm, pgd, addr);
96152+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
96153 if (!pud)
96154 return -ENOMEM;
96155 do {
96156diff --git a/lib/is_single_threaded.c b/lib/is_single_threaded.c
96157index bd2bea9..6b3c95e 100644
96158--- a/lib/is_single_threaded.c
96159+++ b/lib/is_single_threaded.c
96160@@ -22,6 +22,9 @@ bool current_is_single_threaded(void)
96161 struct task_struct *p, *t;
96162 bool ret;
96163
96164+ if (!mm)
96165+ return true;
96166+
96167 if (atomic_read(&task->signal->live) != 1)
96168 return false;
96169
96170diff --git a/lib/kobject.c b/lib/kobject.c
96171index 03d4ab3..46f6374 100644
96172--- a/lib/kobject.c
96173+++ b/lib/kobject.c
96174@@ -931,9 +931,9 @@ EXPORT_SYMBOL_GPL(kset_create_and_add);
96175
96176
96177 static DEFINE_SPINLOCK(kobj_ns_type_lock);
96178-static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES];
96179+static const struct kobj_ns_type_operations *kobj_ns_ops_tbl[KOBJ_NS_TYPES] __read_only;
96180
96181-int kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
96182+int __init kobj_ns_type_register(const struct kobj_ns_type_operations *ops)
96183 {
96184 enum kobj_ns_type type = ops->type;
96185 int error;
96186diff --git a/lib/list_debug.c b/lib/list_debug.c
96187index c24c2f7..f0296f4 100644
96188--- a/lib/list_debug.c
96189+++ b/lib/list_debug.c
96190@@ -11,7 +11,9 @@
96191 #include <linux/bug.h>
96192 #include <linux/kernel.h>
96193 #include <linux/rculist.h>
96194+#include <linux/mm.h>
96195
96196+#ifdef CONFIG_DEBUG_LIST
96197 /*
96198 * Insert a new entry between two known consecutive entries.
96199 *
96200@@ -19,21 +21,40 @@
96201 * the prev/next entries already!
96202 */
96203
96204+static bool __list_add_debug(struct list_head *new,
96205+ struct list_head *prev,
96206+ struct list_head *next)
96207+{
96208+ if (unlikely(next->prev != prev)) {
96209+ printk(KERN_ERR "list_add corruption. next->prev should be "
96210+ "prev (%p), but was %p. (next=%p).\n",
96211+ prev, next->prev, next);
96212+ BUG();
96213+ return false;
96214+ }
96215+ if (unlikely(prev->next != next)) {
96216+ printk(KERN_ERR "list_add corruption. prev->next should be "
96217+ "next (%p), but was %p. (prev=%p).\n",
96218+ next, prev->next, prev);
96219+ BUG();
96220+ return false;
96221+ }
96222+ if (unlikely(new == prev || new == next)) {
96223+ printk(KERN_ERR "list_add double add: new=%p, prev=%p, next=%p.\n",
96224+ new, prev, next);
96225+ BUG();
96226+ return false;
96227+ }
96228+ return true;
96229+}
96230+
96231 void __list_add(struct list_head *new,
96232- struct list_head *prev,
96233- struct list_head *next)
96234+ struct list_head *prev,
96235+ struct list_head *next)
96236 {
96237- WARN(next->prev != prev,
96238- "list_add corruption. next->prev should be "
96239- "prev (%p), but was %p. (next=%p).\n",
96240- prev, next->prev, next);
96241- WARN(prev->next != next,
96242- "list_add corruption. prev->next should be "
96243- "next (%p), but was %p. (prev=%p).\n",
96244- next, prev->next, prev);
96245- WARN(new == prev || new == next,
96246- "list_add double add: new=%p, prev=%p, next=%p.\n",
96247- new, prev, next);
96248+ if (!__list_add_debug(new, prev, next))
96249+ return;
96250+
96251 next->prev = new;
96252 new->next = next;
96253 new->prev = prev;
96254@@ -41,28 +62,46 @@ void __list_add(struct list_head *new,
96255 }
96256 EXPORT_SYMBOL(__list_add);
96257
96258-void __list_del_entry(struct list_head *entry)
96259+static bool __list_del_entry_debug(struct list_head *entry)
96260 {
96261 struct list_head *prev, *next;
96262
96263 prev = entry->prev;
96264 next = entry->next;
96265
96266- if (WARN(next == LIST_POISON1,
96267- "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
96268- entry, LIST_POISON1) ||
96269- WARN(prev == LIST_POISON2,
96270- "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
96271- entry, LIST_POISON2) ||
96272- WARN(prev->next != entry,
96273- "list_del corruption. prev->next should be %p, "
96274- "but was %p\n", entry, prev->next) ||
96275- WARN(next->prev != entry,
96276- "list_del corruption. next->prev should be %p, "
96277- "but was %p\n", entry, next->prev))
96278+ if (unlikely(next == LIST_POISON1)) {
96279+ printk(KERN_ERR "list_del corruption, %p->next is LIST_POISON1 (%p)\n",
96280+ entry, LIST_POISON1);
96281+ BUG();
96282+ return false;
96283+ }
96284+ if (unlikely(prev == LIST_POISON2)) {
96285+ printk(KERN_ERR "list_del corruption, %p->prev is LIST_POISON2 (%p)\n",
96286+ entry, LIST_POISON2);
96287+ BUG();
96288+ return false;
96289+ }
96290+ if (unlikely(entry->prev->next != entry)) {
96291+ printk(KERN_ERR "list_del corruption. prev->next should be %p, "
96292+ "but was %p\n", entry, prev->next);
96293+ BUG();
96294+ return false;
96295+ }
96296+ if (unlikely(entry->next->prev != entry)) {
96297+ printk(KERN_ERR "list_del corruption. next->prev should be %p, "
96298+ "but was %p\n", entry, next->prev);
96299+ BUG();
96300+ return false;
96301+ }
96302+ return true;
96303+}
96304+
96305+void __list_del_entry(struct list_head *entry)
96306+{
96307+ if (!__list_del_entry_debug(entry))
96308 return;
96309
96310- __list_del(prev, next);
96311+ __list_del(entry->prev, entry->next);
96312 }
96313 EXPORT_SYMBOL(__list_del_entry);
96314
96315@@ -86,15 +125,85 @@ EXPORT_SYMBOL(list_del);
96316 void __list_add_rcu(struct list_head *new,
96317 struct list_head *prev, struct list_head *next)
96318 {
96319- WARN(next->prev != prev,
96320- "list_add_rcu corruption. next->prev should be prev (%p), but was %p. (next=%p).\n",
96321- prev, next->prev, next);
96322- WARN(prev->next != next,
96323- "list_add_rcu corruption. prev->next should be next (%p), but was %p. (prev=%p).\n",
96324- next, prev->next, prev);
96325+ if (!__list_add_debug(new, prev, next))
96326+ return;
96327+
96328 new->next = next;
96329 new->prev = prev;
96330 rcu_assign_pointer(list_next_rcu(prev), new);
96331 next->prev = new;
96332 }
96333 EXPORT_SYMBOL(__list_add_rcu);
96334+#endif
96335+
96336+void __pax_list_add(struct list_head *new, struct list_head *prev, struct list_head *next)
96337+{
96338+#ifdef CONFIG_DEBUG_LIST
96339+ if (!__list_add_debug(new, prev, next))
96340+ return;
96341+#endif
96342+
96343+ pax_open_kernel();
96344+ next->prev = new;
96345+ new->next = next;
96346+ new->prev = prev;
96347+ prev->next = new;
96348+ pax_close_kernel();
96349+}
96350+EXPORT_SYMBOL(__pax_list_add);
96351+
96352+void pax_list_del(struct list_head *entry)
96353+{
96354+#ifdef CONFIG_DEBUG_LIST
96355+ if (!__list_del_entry_debug(entry))
96356+ return;
96357+#endif
96358+
96359+ pax_open_kernel();
96360+ __list_del(entry->prev, entry->next);
96361+ entry->next = LIST_POISON1;
96362+ entry->prev = LIST_POISON2;
96363+ pax_close_kernel();
96364+}
96365+EXPORT_SYMBOL(pax_list_del);
96366+
96367+void pax_list_del_init(struct list_head *entry)
96368+{
96369+ pax_open_kernel();
96370+ __list_del(entry->prev, entry->next);
96371+ INIT_LIST_HEAD(entry);
96372+ pax_close_kernel();
96373+}
96374+EXPORT_SYMBOL(pax_list_del_init);
96375+
96376+void __pax_list_add_rcu(struct list_head *new,
96377+ struct list_head *prev, struct list_head *next)
96378+{
96379+#ifdef CONFIG_DEBUG_LIST
96380+ if (!__list_add_debug(new, prev, next))
96381+ return;
96382+#endif
96383+
96384+ pax_open_kernel();
96385+ new->next = next;
96386+ new->prev = prev;
96387+ rcu_assign_pointer(list_next_rcu(prev), new);
96388+ next->prev = new;
96389+ pax_close_kernel();
96390+}
96391+EXPORT_SYMBOL(__pax_list_add_rcu);
96392+
96393+void pax_list_del_rcu(struct list_head *entry)
96394+{
96395+#ifdef CONFIG_DEBUG_LIST
96396+ if (!__list_del_entry_debug(entry))
96397+ return;
96398+#endif
96399+
96400+ pax_open_kernel();
96401+ __list_del(entry->prev, entry->next);
96402+ entry->next = LIST_POISON1;
96403+ entry->prev = LIST_POISON2;
96404+ pax_close_kernel();
96405+}
96406+EXPORT_SYMBOL(pax_list_del_rcu);
96407diff --git a/lib/lockref.c b/lib/lockref.c
96408index ecb9a66..a044fc5 100644
96409--- a/lib/lockref.c
96410+++ b/lib/lockref.c
96411@@ -48,13 +48,13 @@
96412 void lockref_get(struct lockref *lockref)
96413 {
96414 CMPXCHG_LOOP(
96415- new.count++;
96416+ __lockref_inc(&new);
96417 ,
96418 return;
96419 );
96420
96421 spin_lock(&lockref->lock);
96422- lockref->count++;
96423+ __lockref_inc(lockref);
96424 spin_unlock(&lockref->lock);
96425 }
96426 EXPORT_SYMBOL(lockref_get);
96427@@ -69,8 +69,8 @@ int lockref_get_not_zero(struct lockref *lockref)
96428 int retval;
96429
96430 CMPXCHG_LOOP(
96431- new.count++;
96432- if (old.count <= 0)
96433+ __lockref_inc(&new);
96434+ if (__lockref_read(&old) <= 0)
96435 return 0;
96436 ,
96437 return 1;
96438@@ -78,8 +78,8 @@ int lockref_get_not_zero(struct lockref *lockref)
96439
96440 spin_lock(&lockref->lock);
96441 retval = 0;
96442- if (lockref->count > 0) {
96443- lockref->count++;
96444+ if (__lockref_read(lockref) > 0) {
96445+ __lockref_inc(lockref);
96446 retval = 1;
96447 }
96448 spin_unlock(&lockref->lock);
96449@@ -96,17 +96,17 @@ EXPORT_SYMBOL(lockref_get_not_zero);
96450 int lockref_get_or_lock(struct lockref *lockref)
96451 {
96452 CMPXCHG_LOOP(
96453- new.count++;
96454- if (old.count <= 0)
96455+ __lockref_inc(&new);
96456+ if (__lockref_read(&old) <= 0)
96457 break;
96458 ,
96459 return 1;
96460 );
96461
96462 spin_lock(&lockref->lock);
96463- if (lockref->count <= 0)
96464+ if (__lockref_read(lockref) <= 0)
96465 return 0;
96466- lockref->count++;
96467+ __lockref_inc(lockref);
96468 spin_unlock(&lockref->lock);
96469 return 1;
96470 }
96471@@ -122,11 +122,11 @@ EXPORT_SYMBOL(lockref_get_or_lock);
96472 int lockref_put_return(struct lockref *lockref)
96473 {
96474 CMPXCHG_LOOP(
96475- new.count--;
96476- if (old.count <= 0)
96477+ __lockref_dec(&new);
96478+ if (__lockref_read(&old) <= 0)
96479 return -1;
96480 ,
96481- return new.count;
96482+ return __lockref_read(&new);
96483 );
96484 return -1;
96485 }
96486@@ -140,17 +140,17 @@ EXPORT_SYMBOL(lockref_put_return);
96487 int lockref_put_or_lock(struct lockref *lockref)
96488 {
96489 CMPXCHG_LOOP(
96490- new.count--;
96491- if (old.count <= 1)
96492+ __lockref_dec(&new);
96493+ if (__lockref_read(&old) <= 1)
96494 break;
96495 ,
96496 return 1;
96497 );
96498
96499 spin_lock(&lockref->lock);
96500- if (lockref->count <= 1)
96501+ if (__lockref_read(lockref) <= 1)
96502 return 0;
96503- lockref->count--;
96504+ __lockref_dec(lockref);
96505 spin_unlock(&lockref->lock);
96506 return 1;
96507 }
96508@@ -163,7 +163,7 @@ EXPORT_SYMBOL(lockref_put_or_lock);
96509 void lockref_mark_dead(struct lockref *lockref)
96510 {
96511 assert_spin_locked(&lockref->lock);
96512- lockref->count = -128;
96513+ __lockref_set(lockref, -128);
96514 }
96515 EXPORT_SYMBOL(lockref_mark_dead);
96516
96517@@ -177,8 +177,8 @@ int lockref_get_not_dead(struct lockref *lockref)
96518 int retval;
96519
96520 CMPXCHG_LOOP(
96521- new.count++;
96522- if (old.count < 0)
96523+ __lockref_inc(&new);
96524+ if (__lockref_read(&old) < 0)
96525 return 0;
96526 ,
96527 return 1;
96528@@ -186,8 +186,8 @@ int lockref_get_not_dead(struct lockref *lockref)
96529
96530 spin_lock(&lockref->lock);
96531 retval = 0;
96532- if (lockref->count >= 0) {
96533- lockref->count++;
96534+ if (__lockref_read(lockref) >= 0) {
96535+ __lockref_inc(lockref);
96536 retval = 1;
96537 }
96538 spin_unlock(&lockref->lock);
96539diff --git a/lib/nlattr.c b/lib/nlattr.c
96540index f5907d2..36072be 100644
96541--- a/lib/nlattr.c
96542+++ b/lib/nlattr.c
96543@@ -278,6 +278,8 @@ int nla_memcpy(void *dest, const struct nlattr *src, int count)
96544 {
96545 int minlen = min_t(int, count, nla_len(src));
96546
96547+ BUG_ON(minlen < 0);
96548+
96549 memcpy(dest, nla_data(src), minlen);
96550 if (count > minlen)
96551 memset(dest + minlen, 0, count - minlen);
96552diff --git a/lib/percpu-refcount.c b/lib/percpu-refcount.c
96553index 6111bcb..02e816b 100644
96554--- a/lib/percpu-refcount.c
96555+++ b/lib/percpu-refcount.c
96556@@ -31,7 +31,7 @@
96557 * atomic_long_t can't hit 0 before we've added up all the percpu refs.
96558 */
96559
96560-#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 1))
96561+#define PERCPU_COUNT_BIAS (1LU << (BITS_PER_LONG - 2))
96562
96563 static DECLARE_WAIT_QUEUE_HEAD(percpu_ref_switch_waitq);
96564
96565diff --git a/lib/radix-tree.c b/lib/radix-tree.c
96566index 3d2aa27..a472f20 100644
96567--- a/lib/radix-tree.c
96568+++ b/lib/radix-tree.c
96569@@ -67,7 +67,7 @@ struct radix_tree_preload {
96570 int nr;
96571 struct radix_tree_node *nodes[RADIX_TREE_PRELOAD_SIZE];
96572 };
96573-static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
96574+static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads);
96575
96576 static inline void *ptr_to_indirect(void *ptr)
96577 {
96578diff --git a/lib/random32.c b/lib/random32.c
96579index 0bee183..526f12f 100644
96580--- a/lib/random32.c
96581+++ b/lib/random32.c
96582@@ -47,7 +47,7 @@ static inline void prandom_state_selftest(void)
96583 }
96584 #endif
96585
96586-static DEFINE_PER_CPU(struct rnd_state, net_rand_state);
96587+static DEFINE_PER_CPU(struct rnd_state, net_rand_state) __latent_entropy;
96588
96589 /**
96590 * prandom_u32_state - seeded pseudo-random number generator.
96591diff --git a/lib/rbtree.c b/lib/rbtree.c
96592index c16c81a..4dcbda1 100644
96593--- a/lib/rbtree.c
96594+++ b/lib/rbtree.c
96595@@ -380,7 +380,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {}
96596 static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {}
96597
96598 static const struct rb_augment_callbacks dummy_callbacks = {
96599- dummy_propagate, dummy_copy, dummy_rotate
96600+ .propagate = dummy_propagate,
96601+ .copy = dummy_copy,
96602+ .rotate = dummy_rotate
96603 };
96604
96605 void rb_insert_color(struct rb_node *node, struct rb_root *root)
96606diff --git a/lib/show_mem.c b/lib/show_mem.c
96607index adc98e18..0ce83c2 100644
96608--- a/lib/show_mem.c
96609+++ b/lib/show_mem.c
96610@@ -49,6 +49,6 @@ void show_mem(unsigned int filter)
96611 quicklist_total_size());
96612 #endif
96613 #ifdef CONFIG_MEMORY_FAILURE
96614- printk("%lu pages hwpoisoned\n", atomic_long_read(&num_poisoned_pages));
96615+ printk("%lu pages hwpoisoned\n", atomic_long_read_unchecked(&num_poisoned_pages));
96616 #endif
96617 }
96618diff --git a/lib/strncpy_from_user.c b/lib/strncpy_from_user.c
96619index e0af6ff..fcc9f15 100644
96620--- a/lib/strncpy_from_user.c
96621+++ b/lib/strncpy_from_user.c
96622@@ -22,7 +22,7 @@
96623 */
96624 static inline long do_strncpy_from_user(char *dst, const char __user *src, long count, unsigned long max)
96625 {
96626- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
96627+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
96628 long res = 0;
96629
96630 /*
96631diff --git a/lib/strnlen_user.c b/lib/strnlen_user.c
96632index a28df52..3d55877 100644
96633--- a/lib/strnlen_user.c
96634+++ b/lib/strnlen_user.c
96635@@ -26,7 +26,7 @@
96636 */
96637 static inline long do_strnlen_user(const char __user *src, unsigned long count, unsigned long max)
96638 {
96639- const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
96640+ static const struct word_at_a_time constants = WORD_AT_A_TIME_CONSTANTS;
96641 long align, res = 0;
96642 unsigned long c;
96643
96644diff --git a/lib/swiotlb.c b/lib/swiotlb.c
96645index 4abda07..b9d3765 100644
96646--- a/lib/swiotlb.c
96647+++ b/lib/swiotlb.c
96648@@ -682,7 +682,7 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
96649
96650 void
96651 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
96652- dma_addr_t dev_addr)
96653+ dma_addr_t dev_addr, struct dma_attrs *attrs)
96654 {
96655 phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
96656
96657diff --git a/lib/usercopy.c b/lib/usercopy.c
96658index 4f5b1dd..7cab418 100644
96659--- a/lib/usercopy.c
96660+++ b/lib/usercopy.c
96661@@ -7,3 +7,9 @@ void copy_from_user_overflow(void)
96662 WARN(1, "Buffer overflow detected!\n");
96663 }
96664 EXPORT_SYMBOL(copy_from_user_overflow);
96665+
96666+void copy_to_user_overflow(void)
96667+{
96668+ WARN(1, "Buffer overflow detected!\n");
96669+}
96670+EXPORT_SYMBOL(copy_to_user_overflow);
96671diff --git a/lib/vsprintf.c b/lib/vsprintf.c
96672index b235c96..343ffc1 100644
96673--- a/lib/vsprintf.c
96674+++ b/lib/vsprintf.c
96675@@ -16,6 +16,9 @@
96676 * - scnprintf and vscnprintf
96677 */
96678
96679+#ifdef CONFIG_GRKERNSEC_HIDESYM
96680+#define __INCLUDED_BY_HIDESYM 1
96681+#endif
96682 #include <stdarg.h>
96683 #include <linux/module.h> /* for KSYM_SYMBOL_LEN */
96684 #include <linux/types.h>
96685@@ -626,7 +629,7 @@ char *symbol_string(char *buf, char *end, void *ptr,
96686 #ifdef CONFIG_KALLSYMS
96687 if (*fmt == 'B')
96688 sprint_backtrace(sym, value);
96689- else if (*fmt != 'f' && *fmt != 's')
96690+ else if (*fmt != 'f' && *fmt != 's' && *fmt != 'X')
96691 sprint_symbol(sym, value);
96692 else
96693 sprint_symbol_no_offset(sym, value);
96694@@ -1322,7 +1325,11 @@ char *address_val(char *buf, char *end, const void *addr,
96695 return number(buf, end, num, spec);
96696 }
96697
96698+#ifdef CONFIG_GRKERNSEC_HIDESYM
96699+int kptr_restrict __read_mostly = 2;
96700+#else
96701 int kptr_restrict __read_mostly;
96702+#endif
96703
96704 /*
96705 * Show a '%p' thing. A kernel extension is that the '%p' is followed
96706@@ -1333,8 +1340,10 @@ int kptr_restrict __read_mostly;
96707 *
96708 * - 'F' For symbolic function descriptor pointers with offset
96709 * - 'f' For simple symbolic function names without offset
96710+ * - 'X' For simple symbolic function names without offset approved for use with GRKERNSEC_HIDESYM
96711 * - 'S' For symbolic direct pointers with offset
96712 * - 's' For symbolic direct pointers without offset
96713+ * - 'A' For symbolic direct pointers with offset approved for use with GRKERNSEC_HIDESYM
96714 * - '[FfSs]R' as above with __builtin_extract_return_addr() translation
96715 * - 'B' For backtraced symbolic direct pointers with offset
96716 * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
96717@@ -1417,12 +1426,12 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
96718
96719 if (!ptr && *fmt != 'K') {
96720 /*
96721- * Print (null) with the same width as a pointer so it makes
96722+ * Print (nil) with the same width as a pointer so it makes
96723 * tabular output look nice.
96724 */
96725 if (spec.field_width == -1)
96726 spec.field_width = default_width;
96727- return string(buf, end, "(null)", spec);
96728+ return string(buf, end, "(nil)", spec);
96729 }
96730
96731 switch (*fmt) {
96732@@ -1432,6 +1441,14 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
96733 /* Fallthrough */
96734 case 'S':
96735 case 's':
96736+#ifdef CONFIG_GRKERNSEC_HIDESYM
96737+ break;
96738+#else
96739+ return symbol_string(buf, end, ptr, spec, fmt);
96740+#endif
96741+ case 'X':
96742+ ptr = dereference_function_descriptor(ptr);
96743+ case 'A':
96744 case 'B':
96745 return symbol_string(buf, end, ptr, spec, fmt);
96746 case 'R':
96747@@ -1496,6 +1513,8 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
96748 va_end(va);
96749 return buf;
96750 }
96751+ case 'P':
96752+ break;
96753 case 'K':
96754 /*
96755 * %pK cannot be used in IRQ context because its test
96756@@ -1553,6 +1572,22 @@ char *pointer(const char *fmt, char *buf, char *end, void *ptr,
96757 ((const struct file *)ptr)->f_path.dentry,
96758 spec, fmt);
96759 }
96760+
96761+#ifdef CONFIG_GRKERNSEC_HIDESYM
96762+ /* 'P' = approved pointers to copy to userland,
96763+ as in the /proc/kallsyms case, as we make it display nothing
96764+ for non-root users, and the real contents for root users
96765+ 'X' = approved simple symbols
96766+ Also ignore 'K' pointers, since we force their NULLing for non-root users
96767+ above
96768+ */
96769+ if ((unsigned long)ptr > TASK_SIZE && *fmt != 'P' && *fmt != 'X' && *fmt != 'K' && is_usercopy_object(buf)) {
96770+ printk(KERN_ALERT "grsec: kernel infoleak detected! Please report this log to spender@grsecurity.net.\n");
96771+ dump_stack();
96772+ ptr = NULL;
96773+ }
96774+#endif
96775+
96776 spec.flags |= SMALL;
96777 if (spec.field_width == -1) {
96778 spec.field_width = default_width;
96779@@ -2254,11 +2289,11 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
96780 typeof(type) value; \
96781 if (sizeof(type) == 8) { \
96782 args = PTR_ALIGN(args, sizeof(u32)); \
96783- *(u32 *)&value = *(u32 *)args; \
96784- *((u32 *)&value + 1) = *(u32 *)(args + 4); \
96785+ *(u32 *)&value = *(const u32 *)args; \
96786+ *((u32 *)&value + 1) = *(const u32 *)(args + 4); \
96787 } else { \
96788 args = PTR_ALIGN(args, sizeof(type)); \
96789- value = *(typeof(type) *)args; \
96790+ value = *(const typeof(type) *)args; \
96791 } \
96792 args += sizeof(type); \
96793 value; \
96794@@ -2321,7 +2356,7 @@ int bstr_printf(char *buf, size_t size, const char *fmt, const u32 *bin_buf)
96795 case FORMAT_TYPE_STR: {
96796 const char *str_arg = args;
96797 args += strlen(str_arg) + 1;
96798- str = string(str, end, (char *)str_arg, spec);
96799+ str = string(str, end, str_arg, spec);
96800 break;
96801 }
96802
96803diff --git a/localversion-grsec b/localversion-grsec
96804new file mode 100644
96805index 0000000..7cd6065
96806--- /dev/null
96807+++ b/localversion-grsec
96808@@ -0,0 +1 @@
96809+-grsec
96810diff --git a/mm/Kconfig b/mm/Kconfig
96811index a03131b..1b1bafb 100644
96812--- a/mm/Kconfig
96813+++ b/mm/Kconfig
96814@@ -342,10 +342,11 @@ config KSM
96815 root has set /sys/kernel/mm/ksm/run to 1 (if CONFIG_SYSFS is set).
96816
96817 config DEFAULT_MMAP_MIN_ADDR
96818- int "Low address space to protect from user allocation"
96819+ int "Low address space to protect from user allocation"
96820 depends on MMU
96821- default 4096
96822- help
96823+ default 32768 if ALPHA || ARM || PARISC || SPARC32
96824+ default 65536
96825+ help
96826 This is the portion of low virtual memory which should be protected
96827 from userspace allocation. Keeping a user from writing to low pages
96828 can help reduce the impact of kernel NULL pointer bugs.
96829@@ -376,7 +377,7 @@ config MEMORY_FAILURE
96830
96831 config HWPOISON_INJECT
96832 tristate "HWPoison pages injector"
96833- depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS
96834+ depends on MEMORY_FAILURE && DEBUG_KERNEL && PROC_FS && !GRKERNSEC
96835 select PROC_PAGE_MONITOR
96836
96837 config NOMMU_INITIAL_TRIM_EXCESS
96838diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
96839index 957d3da..1d34e20 100644
96840--- a/mm/Kconfig.debug
96841+++ b/mm/Kconfig.debug
96842@@ -10,6 +10,7 @@ config PAGE_EXTENSION
96843 config DEBUG_PAGEALLOC
96844 bool "Debug page memory allocations"
96845 depends on DEBUG_KERNEL
96846+ depends on !PAX_MEMORY_SANITIZE
96847 depends on !HIBERNATION || ARCH_SUPPORTS_DEBUG_PAGEALLOC && !PPC && !SPARC
96848 depends on !KMEMCHECK
96849 select PAGE_EXTENSION
96850diff --git a/mm/backing-dev.c b/mm/backing-dev.c
96851index 6dc4580..e031ec1 100644
96852--- a/mm/backing-dev.c
96853+++ b/mm/backing-dev.c
96854@@ -12,7 +12,7 @@
96855 #include <linux/device.h>
96856 #include <trace/events/writeback.h>
96857
96858-static atomic_long_t bdi_seq = ATOMIC_LONG_INIT(0);
96859+static atomic_long_unchecked_t bdi_seq = ATOMIC_LONG_INIT(0);
96860
96861 struct backing_dev_info noop_backing_dev_info = {
96862 .name = "noop",
96863@@ -474,7 +474,7 @@ int bdi_setup_and_register(struct backing_dev_info *bdi, char *name)
96864 return err;
96865
96866 err = bdi_register(bdi, NULL, "%.28s-%ld", name,
96867- atomic_long_inc_return(&bdi_seq));
96868+ atomic_long_inc_return_unchecked(&bdi_seq));
96869 if (err) {
96870 bdi_destroy(bdi);
96871 return err;
96872diff --git a/mm/filemap.c b/mm/filemap.c
96873index ad72420..0a20ef2 100644
96874--- a/mm/filemap.c
96875+++ b/mm/filemap.c
96876@@ -2097,7 +2097,7 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
96877 struct address_space *mapping = file->f_mapping;
96878
96879 if (!mapping->a_ops->readpage)
96880- return -ENOEXEC;
96881+ return -ENODEV;
96882 file_accessed(file);
96883 vma->vm_ops = &generic_file_vm_ops;
96884 return 0;
96885@@ -2275,6 +2275,7 @@ inline int generic_write_checks(struct file *file, loff_t *pos, size_t *count, i
96886 *pos = i_size_read(inode);
96887
96888 if (limit != RLIM_INFINITY) {
96889+ gr_learn_resource(current, RLIMIT_FSIZE,*pos, 0);
96890 if (*pos >= limit) {
96891 send_sig(SIGXFSZ, current, 0);
96892 return -EFBIG;
96893diff --git a/mm/gup.c b/mm/gup.c
96894index a6e24e2..72dd2cf 100644
96895--- a/mm/gup.c
96896+++ b/mm/gup.c
96897@@ -265,11 +265,6 @@ static int faultin_page(struct task_struct *tsk, struct vm_area_struct *vma,
96898 unsigned int fault_flags = 0;
96899 int ret;
96900
96901- /* For mlock, just skip the stack guard page. */
96902- if ((*flags & FOLL_MLOCK) &&
96903- (stack_guard_page_start(vma, address) ||
96904- stack_guard_page_end(vma, address + PAGE_SIZE)))
96905- return -ENOENT;
96906 if (*flags & FOLL_WRITE)
96907 fault_flags |= FAULT_FLAG_WRITE;
96908 if (nonblocking)
96909@@ -435,14 +430,14 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
96910 if (!(gup_flags & FOLL_FORCE))
96911 gup_flags |= FOLL_NUMA;
96912
96913- do {
96914+ while (nr_pages) {
96915 struct page *page;
96916 unsigned int foll_flags = gup_flags;
96917 unsigned int page_increm;
96918
96919 /* first iteration or cross vma bound */
96920 if (!vma || start >= vma->vm_end) {
96921- vma = find_extend_vma(mm, start);
96922+ vma = find_vma(mm, start);
96923 if (!vma && in_gate_area(mm, start)) {
96924 int ret;
96925 ret = get_gate_page(mm, start & PAGE_MASK,
96926@@ -454,7 +449,7 @@ long __get_user_pages(struct task_struct *tsk, struct mm_struct *mm,
96927 goto next_page;
96928 }
96929
96930- if (!vma || check_vma_flags(vma, gup_flags))
96931+ if (!vma || start < vma->vm_start || check_vma_flags(vma, gup_flags))
96932 return i ? : -EFAULT;
96933 if (is_vm_hugetlb_page(vma)) {
96934 i = follow_hugetlb_page(mm, vma, pages, vmas,
96935@@ -509,7 +504,7 @@ next_page:
96936 i += page_increm;
96937 start += page_increm * PAGE_SIZE;
96938 nr_pages -= page_increm;
96939- } while (nr_pages);
96940+ }
96941 return i;
96942 }
96943 EXPORT_SYMBOL(__get_user_pages);
96944diff --git a/mm/highmem.c b/mm/highmem.c
96945index 123bcd3..0de52ba 100644
96946--- a/mm/highmem.c
96947+++ b/mm/highmem.c
96948@@ -195,8 +195,9 @@ static void flush_all_zero_pkmaps(void)
96949 * So no dangers, even with speculative execution.
96950 */
96951 page = pte_page(pkmap_page_table[i]);
96952+ pax_open_kernel();
96953 pte_clear(&init_mm, PKMAP_ADDR(i), &pkmap_page_table[i]);
96954-
96955+ pax_close_kernel();
96956 set_page_address(page, NULL);
96957 need_flush = 1;
96958 }
96959@@ -259,9 +260,11 @@ start:
96960 }
96961 }
96962 vaddr = PKMAP_ADDR(last_pkmap_nr);
96963+
96964+ pax_open_kernel();
96965 set_pte_at(&init_mm, vaddr,
96966 &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot));
96967-
96968+ pax_close_kernel();
96969 pkmap_count[last_pkmap_nr] = 1;
96970 set_page_address(page, (void *)vaddr);
96971
96972diff --git a/mm/hugetlb.c b/mm/hugetlb.c
96973index caad3c5..4f68807 100644
96974--- a/mm/hugetlb.c
96975+++ b/mm/hugetlb.c
96976@@ -2260,6 +2260,7 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
96977 struct ctl_table *table, int write,
96978 void __user *buffer, size_t *length, loff_t *ppos)
96979 {
96980+ ctl_table_no_const t;
96981 struct hstate *h = &default_hstate;
96982 unsigned long tmp = h->max_huge_pages;
96983 int ret;
96984@@ -2267,9 +2268,10 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,
96985 if (!hugepages_supported())
96986 return -ENOTSUPP;
96987
96988- table->data = &tmp;
96989- table->maxlen = sizeof(unsigned long);
96990- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
96991+ t = *table;
96992+ t.data = &tmp;
96993+ t.maxlen = sizeof(unsigned long);
96994+ ret = proc_doulongvec_minmax(&t, write, buffer, length, ppos);
96995 if (ret)
96996 goto out;
96997
96998@@ -2304,6 +2306,7 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
96999 struct hstate *h = &default_hstate;
97000 unsigned long tmp;
97001 int ret;
97002+ ctl_table_no_const hugetlb_table;
97003
97004 if (!hugepages_supported())
97005 return -ENOTSUPP;
97006@@ -2313,9 +2316,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
97007 if (write && hstate_is_gigantic(h))
97008 return -EINVAL;
97009
97010- table->data = &tmp;
97011- table->maxlen = sizeof(unsigned long);
97012- ret = proc_doulongvec_minmax(table, write, buffer, length, ppos);
97013+ hugetlb_table = *table;
97014+ hugetlb_table.data = &tmp;
97015+ hugetlb_table.maxlen = sizeof(unsigned long);
97016+ ret = proc_doulongvec_minmax(&hugetlb_table, write, buffer, length, ppos);
97017 if (ret)
97018 goto out;
97019
97020@@ -2800,6 +2804,27 @@ static void unmap_ref_private(struct mm_struct *mm, struct vm_area_struct *vma,
97021 i_mmap_unlock_write(mapping);
97022 }
97023
97024+#ifdef CONFIG_PAX_SEGMEXEC
97025+static void pax_mirror_huge_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m)
97026+{
97027+ struct mm_struct *mm = vma->vm_mm;
97028+ struct vm_area_struct *vma_m;
97029+ unsigned long address_m;
97030+ pte_t *ptep_m;
97031+
97032+ vma_m = pax_find_mirror_vma(vma);
97033+ if (!vma_m)
97034+ return;
97035+
97036+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
97037+ address_m = address + SEGMEXEC_TASK_SIZE;
97038+ ptep_m = huge_pte_offset(mm, address_m & HPAGE_MASK);
97039+ get_page(page_m);
97040+ hugepage_add_anon_rmap(page_m, vma_m, address_m);
97041+ set_huge_pte_at(mm, address_m, ptep_m, make_huge_pte(vma_m, page_m, 0));
97042+}
97043+#endif
97044+
97045 /*
97046 * Hugetlb_cow() should be called with page lock of the original hugepage held.
97047 * Called with hugetlb_instantiation_mutex held and pte_page locked so we
97048@@ -2912,6 +2937,11 @@ retry_avoidcopy:
97049 make_huge_pte(vma, new_page, 1));
97050 page_remove_rmap(old_page);
97051 hugepage_add_new_anon_rmap(new_page, vma, address);
97052+
97053+#ifdef CONFIG_PAX_SEGMEXEC
97054+ pax_mirror_huge_pte(vma, address, new_page);
97055+#endif
97056+
97057 /* Make the old page be freed below */
97058 new_page = old_page;
97059 }
97060@@ -3072,6 +3102,10 @@ retry:
97061 && (vma->vm_flags & VM_SHARED)));
97062 set_huge_pte_at(mm, address, ptep, new_pte);
97063
97064+#ifdef CONFIG_PAX_SEGMEXEC
97065+ pax_mirror_huge_pte(vma, address, page);
97066+#endif
97067+
97068 if ((flags & FAULT_FLAG_WRITE) && !(vma->vm_flags & VM_SHARED)) {
97069 /* Optimization, do the COW without a second fault */
97070 ret = hugetlb_cow(mm, vma, address, ptep, new_pte, page, ptl);
97071@@ -3139,6 +3173,10 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
97072 struct address_space *mapping;
97073 int need_wait_lock = 0;
97074
97075+#ifdef CONFIG_PAX_SEGMEXEC
97076+ struct vm_area_struct *vma_m;
97077+#endif
97078+
97079 address &= huge_page_mask(h);
97080
97081 ptep = huge_pte_offset(mm, address);
97082@@ -3152,6 +3190,26 @@ int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
97083 VM_FAULT_SET_HINDEX(hstate_index(h));
97084 }
97085
97086+#ifdef CONFIG_PAX_SEGMEXEC
97087+ vma_m = pax_find_mirror_vma(vma);
97088+ if (vma_m) {
97089+ unsigned long address_m;
97090+
97091+ if (vma->vm_start > vma_m->vm_start) {
97092+ address_m = address;
97093+ address -= SEGMEXEC_TASK_SIZE;
97094+ vma = vma_m;
97095+ h = hstate_vma(vma);
97096+ } else
97097+ address_m = address + SEGMEXEC_TASK_SIZE;
97098+
97099+ if (!huge_pte_alloc(mm, address_m, huge_page_size(h)))
97100+ return VM_FAULT_OOM;
97101+ address_m &= HPAGE_MASK;
97102+ unmap_hugepage_range(vma, address_m, address_m + HPAGE_SIZE, NULL);
97103+ }
97104+#endif
97105+
97106 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
97107 if (!ptep)
97108 return VM_FAULT_OOM;
97109diff --git a/mm/internal.h b/mm/internal.h
97110index a96da5b..42ebd54 100644
97111--- a/mm/internal.h
97112+++ b/mm/internal.h
97113@@ -156,6 +156,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
97114
97115 extern int __isolate_free_page(struct page *page, unsigned int order);
97116 extern void __free_pages_bootmem(struct page *page, unsigned int order);
97117+extern void free_compound_page(struct page *page);
97118 extern void prep_compound_page(struct page *page, unsigned long order);
97119 #ifdef CONFIG_MEMORY_FAILURE
97120 extern bool is_free_buddy_page(struct page *page);
97121@@ -411,7 +412,7 @@ extern u32 hwpoison_filter_enable;
97122
97123 extern unsigned long vm_mmap_pgoff(struct file *, unsigned long,
97124 unsigned long, unsigned long,
97125- unsigned long, unsigned long);
97126+ unsigned long, unsigned long) __intentional_overflow(-1);
97127
97128 extern void set_pageblock_order(void);
97129 unsigned long reclaim_clean_pages_from_list(struct zone *zone,
97130diff --git a/mm/kmemleak.c b/mm/kmemleak.c
97131index 5405aff..483406d 100644
97132--- a/mm/kmemleak.c
97133+++ b/mm/kmemleak.c
97134@@ -365,7 +365,7 @@ static void print_unreferenced(struct seq_file *seq,
97135
97136 for (i = 0; i < object->trace_len; i++) {
97137 void *ptr = (void *)object->trace[i];
97138- seq_printf(seq, " [<%p>] %pS\n", ptr, ptr);
97139+ seq_printf(seq, " [<%pP>] %pA\n", ptr, ptr);
97140 }
97141 }
97142
97143@@ -1911,7 +1911,7 @@ static int __init kmemleak_late_init(void)
97144 return -ENOMEM;
97145 }
97146
97147- dentry = debugfs_create_file("kmemleak", S_IRUGO, NULL, NULL,
97148+ dentry = debugfs_create_file("kmemleak", S_IRUSR, NULL, NULL,
97149 &kmemleak_fops);
97150 if (!dentry)
97151 pr_warning("Failed to create the debugfs kmemleak file\n");
97152diff --git a/mm/maccess.c b/mm/maccess.c
97153index d53adf9..03a24bf 100644
97154--- a/mm/maccess.c
97155+++ b/mm/maccess.c
97156@@ -26,7 +26,7 @@ long __probe_kernel_read(void *dst, const void *src, size_t size)
97157 set_fs(KERNEL_DS);
97158 pagefault_disable();
97159 ret = __copy_from_user_inatomic(dst,
97160- (__force const void __user *)src, size);
97161+ (const void __force_user *)src, size);
97162 pagefault_enable();
97163 set_fs(old_fs);
97164
97165@@ -53,7 +53,7 @@ long __probe_kernel_write(void *dst, const void *src, size_t size)
97166
97167 set_fs(KERNEL_DS);
97168 pagefault_disable();
97169- ret = __copy_to_user_inatomic((__force void __user *)dst, src, size);
97170+ ret = __copy_to_user_inatomic((void __force_user *)dst, src, size);
97171 pagefault_enable();
97172 set_fs(old_fs);
97173
97174diff --git a/mm/madvise.c b/mm/madvise.c
97175index d551475..8fdd7f3 100644
97176--- a/mm/madvise.c
97177+++ b/mm/madvise.c
97178@@ -51,6 +51,10 @@ static long madvise_behavior(struct vm_area_struct *vma,
97179 pgoff_t pgoff;
97180 unsigned long new_flags = vma->vm_flags;
97181
97182+#ifdef CONFIG_PAX_SEGMEXEC
97183+ struct vm_area_struct *vma_m;
97184+#endif
97185+
97186 switch (behavior) {
97187 case MADV_NORMAL:
97188 new_flags = new_flags & ~VM_RAND_READ & ~VM_SEQ_READ;
97189@@ -126,6 +130,13 @@ success:
97190 /*
97191 * vm_flags is protected by the mmap_sem held in write mode.
97192 */
97193+
97194+#ifdef CONFIG_PAX_SEGMEXEC
97195+ vma_m = pax_find_mirror_vma(vma);
97196+ if (vma_m)
97197+ vma_m->vm_flags = new_flags & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT);
97198+#endif
97199+
97200 vma->vm_flags = new_flags;
97201
97202 out:
97203@@ -277,11 +288,27 @@ static long madvise_dontneed(struct vm_area_struct *vma,
97204 struct vm_area_struct **prev,
97205 unsigned long start, unsigned long end)
97206 {
97207+
97208+#ifdef CONFIG_PAX_SEGMEXEC
97209+ struct vm_area_struct *vma_m;
97210+#endif
97211+
97212 *prev = vma;
97213 if (vma->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
97214 return -EINVAL;
97215
97216 zap_page_range(vma, start, end - start, NULL);
97217+
97218+#ifdef CONFIG_PAX_SEGMEXEC
97219+ vma_m = pax_find_mirror_vma(vma);
97220+ if (vma_m) {
97221+ if (vma_m->vm_flags & (VM_LOCKED|VM_HUGETLB|VM_PFNMAP))
97222+ return -EINVAL;
97223+
97224+ zap_page_range(vma_m, start + SEGMEXEC_TASK_SIZE, end - start, NULL);
97225+ }
97226+#endif
97227+
97228 return 0;
97229 }
97230
97231@@ -484,6 +511,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, start, size_t, len_in, int, behavior)
97232 if (end < start)
97233 return error;
97234
97235+#ifdef CONFIG_PAX_SEGMEXEC
97236+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
97237+ if (end > SEGMEXEC_TASK_SIZE)
97238+ return error;
97239+ } else
97240+#endif
97241+
97242+ if (end > TASK_SIZE)
97243+ return error;
97244+
97245 error = 0;
97246 if (end == start)
97247 return error;
97248diff --git a/mm/memory-failure.c b/mm/memory-failure.c
97249index d487f8d..39ebbf6 100644
97250--- a/mm/memory-failure.c
97251+++ b/mm/memory-failure.c
97252@@ -61,7 +61,7 @@ int sysctl_memory_failure_early_kill __read_mostly = 0;
97253
97254 int sysctl_memory_failure_recovery __read_mostly = 1;
97255
97256-atomic_long_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
97257+atomic_long_unchecked_t num_poisoned_pages __read_mostly = ATOMIC_LONG_INIT(0);
97258
97259 #if defined(CONFIG_HWPOISON_INJECT) || defined(CONFIG_HWPOISON_INJECT_MODULE)
97260
97261@@ -198,7 +198,7 @@ static int kill_proc(struct task_struct *t, unsigned long addr, int trapno,
97262 pfn, t->comm, t->pid);
97263 si.si_signo = SIGBUS;
97264 si.si_errno = 0;
97265- si.si_addr = (void *)addr;
97266+ si.si_addr = (void __user *)addr;
97267 #ifdef __ARCH_SI_TRAPNO
97268 si.si_trapno = trapno;
97269 #endif
97270@@ -779,7 +779,7 @@ static struct page_state {
97271 unsigned long res;
97272 char *msg;
97273 int (*action)(struct page *p, unsigned long pfn);
97274-} error_states[] = {
97275+} __do_const error_states[] = {
97276 { reserved, reserved, "reserved kernel", me_kernel },
97277 /*
97278 * free pages are specially detected outside this table:
97279@@ -1087,7 +1087,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
97280 nr_pages = 1 << compound_order(hpage);
97281 else /* normal page or thp */
97282 nr_pages = 1;
97283- atomic_long_add(nr_pages, &num_poisoned_pages);
97284+ atomic_long_add_unchecked(nr_pages, &num_poisoned_pages);
97285
97286 /*
97287 * We need/can do nothing about count=0 pages.
97288@@ -1116,7 +1116,7 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
97289 if (PageHWPoison(hpage)) {
97290 if ((hwpoison_filter(p) && TestClearPageHWPoison(p))
97291 || (p != hpage && TestSetPageHWPoison(hpage))) {
97292- atomic_long_sub(nr_pages, &num_poisoned_pages);
97293+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
97294 unlock_page(hpage);
97295 return 0;
97296 }
97297@@ -1184,14 +1184,14 @@ int memory_failure(unsigned long pfn, int trapno, int flags)
97298 */
97299 if (!PageHWPoison(p)) {
97300 printk(KERN_ERR "MCE %#lx: just unpoisoned\n", pfn);
97301- atomic_long_sub(nr_pages, &num_poisoned_pages);
97302+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
97303 put_page(hpage);
97304 res = 0;
97305 goto out;
97306 }
97307 if (hwpoison_filter(p)) {
97308 if (TestClearPageHWPoison(p))
97309- atomic_long_sub(nr_pages, &num_poisoned_pages);
97310+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
97311 unlock_page(hpage);
97312 put_page(hpage);
97313 return 0;
97314@@ -1421,7 +1421,7 @@ int unpoison_memory(unsigned long pfn)
97315 return 0;
97316 }
97317 if (TestClearPageHWPoison(p))
97318- atomic_long_dec(&num_poisoned_pages);
97319+ atomic_long_dec_unchecked(&num_poisoned_pages);
97320 pr_info("MCE: Software-unpoisoned free page %#lx\n", pfn);
97321 return 0;
97322 }
97323@@ -1435,7 +1435,7 @@ int unpoison_memory(unsigned long pfn)
97324 */
97325 if (TestClearPageHWPoison(page)) {
97326 pr_info("MCE: Software-unpoisoned page %#lx\n", pfn);
97327- atomic_long_sub(nr_pages, &num_poisoned_pages);
97328+ atomic_long_sub_unchecked(nr_pages, &num_poisoned_pages);
97329 freeit = 1;
97330 if (PageHuge(page))
97331 clear_page_hwpoison_huge_page(page);
97332@@ -1560,11 +1560,11 @@ static int soft_offline_huge_page(struct page *page, int flags)
97333 if (PageHuge(page)) {
97334 set_page_hwpoison_huge_page(hpage);
97335 dequeue_hwpoisoned_huge_page(hpage);
97336- atomic_long_add(1 << compound_order(hpage),
97337+ atomic_long_add_unchecked(1 << compound_order(hpage),
97338 &num_poisoned_pages);
97339 } else {
97340 SetPageHWPoison(page);
97341- atomic_long_inc(&num_poisoned_pages);
97342+ atomic_long_inc_unchecked(&num_poisoned_pages);
97343 }
97344 }
97345 return ret;
97346@@ -1603,7 +1603,7 @@ static int __soft_offline_page(struct page *page, int flags)
97347 put_page(page);
97348 pr_info("soft_offline: %#lx: invalidated\n", pfn);
97349 SetPageHWPoison(page);
97350- atomic_long_inc(&num_poisoned_pages);
97351+ atomic_long_inc_unchecked(&num_poisoned_pages);
97352 return 0;
97353 }
97354
97355@@ -1652,7 +1652,7 @@ static int __soft_offline_page(struct page *page, int flags)
97356 if (!is_free_buddy_page(page))
97357 pr_info("soft offline: %#lx: page leaked\n",
97358 pfn);
97359- atomic_long_inc(&num_poisoned_pages);
97360+ atomic_long_inc_unchecked(&num_poisoned_pages);
97361 }
97362 } else {
97363 pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n",
97364@@ -1722,11 +1722,11 @@ int soft_offline_page(struct page *page, int flags)
97365 if (PageHuge(page)) {
97366 set_page_hwpoison_huge_page(hpage);
97367 dequeue_hwpoisoned_huge_page(hpage);
97368- atomic_long_add(1 << compound_order(hpage),
97369+ atomic_long_add_unchecked(1 << compound_order(hpage),
97370 &num_poisoned_pages);
97371 } else {
97372 SetPageHWPoison(page);
97373- atomic_long_inc(&num_poisoned_pages);
97374+ atomic_long_inc_unchecked(&num_poisoned_pages);
97375 }
97376 }
97377 unset_migratetype_isolate(page, MIGRATE_MOVABLE);
97378diff --git a/mm/memory.c b/mm/memory.c
97379index 97839f5..4bc5530 100644
97380--- a/mm/memory.c
97381+++ b/mm/memory.c
97382@@ -414,6 +414,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
97383 free_pte_range(tlb, pmd, addr);
97384 } while (pmd++, addr = next, addr != end);
97385
97386+#if !defined(CONFIG_X86_32) || !defined(CONFIG_PAX_PER_CPU_PGD)
97387 start &= PUD_MASK;
97388 if (start < floor)
97389 return;
97390@@ -429,6 +430,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud,
97391 pud_clear(pud);
97392 pmd_free_tlb(tlb, pmd, start);
97393 mm_dec_nr_pmds(tlb->mm);
97394+#endif
97395 }
97396
97397 static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
97398@@ -448,6 +450,7 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
97399 free_pmd_range(tlb, pud, addr, next, floor, ceiling);
97400 } while (pud++, addr = next, addr != end);
97401
97402+#if !defined(CONFIG_X86_64) || !defined(CONFIG_PAX_PER_CPU_PGD)
97403 start &= PGDIR_MASK;
97404 if (start < floor)
97405 return;
97406@@ -462,6 +465,8 @@ static inline void free_pud_range(struct mmu_gather *tlb, pgd_t *pgd,
97407 pud = pud_offset(pgd, start);
97408 pgd_clear(pgd);
97409 pud_free_tlb(tlb, pud, start);
97410+#endif
97411+
97412 }
97413
97414 /*
97415@@ -691,10 +696,10 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr,
97416 * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y
97417 */
97418 if (vma->vm_ops)
97419- printk(KERN_ALERT "vma->vm_ops->fault: %pSR\n",
97420+ printk(KERN_ALERT "vma->vm_ops->fault: %pAR\n",
97421 vma->vm_ops->fault);
97422 if (vma->vm_file)
97423- printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pSR\n",
97424+ printk(KERN_ALERT "vma->vm_file->f_op->mmap: %pAR\n",
97425 vma->vm_file->f_op->mmap);
97426 dump_stack();
97427 add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
97428@@ -1464,6 +1469,10 @@ static int insert_page(struct vm_area_struct *vma, unsigned long addr,
97429 page_add_file_rmap(page);
97430 set_pte_at(mm, addr, pte, mk_pte(page, prot));
97431
97432+#ifdef CONFIG_PAX_SEGMEXEC
97433+ pax_mirror_file_pte(vma, addr, page, ptl);
97434+#endif
97435+
97436 retval = 0;
97437 pte_unmap_unlock(pte, ptl);
97438 return retval;
97439@@ -1508,9 +1517,21 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr,
97440 if (!page_count(page))
97441 return -EINVAL;
97442 if (!(vma->vm_flags & VM_MIXEDMAP)) {
97443+
97444+#ifdef CONFIG_PAX_SEGMEXEC
97445+ struct vm_area_struct *vma_m;
97446+#endif
97447+
97448 BUG_ON(down_read_trylock(&vma->vm_mm->mmap_sem));
97449 BUG_ON(vma->vm_flags & VM_PFNMAP);
97450 vma->vm_flags |= VM_MIXEDMAP;
97451+
97452+#ifdef CONFIG_PAX_SEGMEXEC
97453+ vma_m = pax_find_mirror_vma(vma);
97454+ if (vma_m)
97455+ vma_m->vm_flags |= VM_MIXEDMAP;
97456+#endif
97457+
97458 }
97459 return insert_page(vma, addr, page, vma->vm_page_prot);
97460 }
97461@@ -1593,6 +1614,7 @@ int vm_insert_mixed(struct vm_area_struct *vma, unsigned long addr,
97462 unsigned long pfn)
97463 {
97464 BUG_ON(!(vma->vm_flags & VM_MIXEDMAP));
97465+ BUG_ON(vma->vm_mirror);
97466
97467 if (addr < vma->vm_start || addr >= vma->vm_end)
97468 return -EFAULT;
97469@@ -1840,7 +1862,9 @@ static int apply_to_pmd_range(struct mm_struct *mm, pud_t *pud,
97470
97471 BUG_ON(pud_huge(*pud));
97472
97473- pmd = pmd_alloc(mm, pud, addr);
97474+ pmd = (mm == &init_mm) ?
97475+ pmd_alloc_kernel(mm, pud, addr) :
97476+ pmd_alloc(mm, pud, addr);
97477 if (!pmd)
97478 return -ENOMEM;
97479 do {
97480@@ -1860,7 +1884,9 @@ static int apply_to_pud_range(struct mm_struct *mm, pgd_t *pgd,
97481 unsigned long next;
97482 int err;
97483
97484- pud = pud_alloc(mm, pgd, addr);
97485+ pud = (mm == &init_mm) ?
97486+ pud_alloc_kernel(mm, pgd, addr) :
97487+ pud_alloc(mm, pgd, addr);
97488 if (!pud)
97489 return -ENOMEM;
97490 do {
97491@@ -1982,6 +2008,185 @@ static int do_page_mkwrite(struct vm_area_struct *vma, struct page *page,
97492 return ret;
97493 }
97494
97495+#ifdef CONFIG_PAX_SEGMEXEC
97496+static void pax_unmap_mirror_pte(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd)
97497+{
97498+ struct mm_struct *mm = vma->vm_mm;
97499+ spinlock_t *ptl;
97500+ pte_t *pte, entry;
97501+
97502+ pte = pte_offset_map_lock(mm, pmd, address, &ptl);
97503+ entry = *pte;
97504+ if (!pte_present(entry)) {
97505+ if (!pte_none(entry)) {
97506+ free_swap_and_cache(pte_to_swp_entry(entry));
97507+ pte_clear_not_present_full(mm, address, pte, 0);
97508+ }
97509+ } else {
97510+ struct page *page;
97511+
97512+ flush_cache_page(vma, address, pte_pfn(entry));
97513+ entry = ptep_clear_flush(vma, address, pte);
97514+ BUG_ON(pte_dirty(entry));
97515+ page = vm_normal_page(vma, address, entry);
97516+ if (page) {
97517+ update_hiwater_rss(mm);
97518+ if (PageAnon(page))
97519+ dec_mm_counter_fast(mm, MM_ANONPAGES);
97520+ else
97521+ dec_mm_counter_fast(mm, MM_FILEPAGES);
97522+ page_remove_rmap(page);
97523+ page_cache_release(page);
97524+ }
97525+ }
97526+ pte_unmap_unlock(pte, ptl);
97527+}
97528+
97529+/* PaX: if vma is mirrored, synchronize the mirror's PTE
97530+ *
97531+ * the ptl of the lower mapped page is held on entry and is not released on exit
97532+ * or inside to ensure atomic changes to the PTE states (swapout, mremap, munmap, etc)
97533+ */
97534+static void pax_mirror_anon_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
97535+{
97536+ struct mm_struct *mm = vma->vm_mm;
97537+ unsigned long address_m;
97538+ spinlock_t *ptl_m;
97539+ struct vm_area_struct *vma_m;
97540+ pmd_t *pmd_m;
97541+ pte_t *pte_m, entry_m;
97542+
97543+ BUG_ON(!page_m || !PageAnon(page_m));
97544+
97545+ vma_m = pax_find_mirror_vma(vma);
97546+ if (!vma_m)
97547+ return;
97548+
97549+ BUG_ON(!PageLocked(page_m));
97550+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
97551+ address_m = address + SEGMEXEC_TASK_SIZE;
97552+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
97553+ pte_m = pte_offset_map(pmd_m, address_m);
97554+ ptl_m = pte_lockptr(mm, pmd_m);
97555+ if (ptl != ptl_m) {
97556+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
97557+ if (!pte_none(*pte_m))
97558+ goto out;
97559+ }
97560+
97561+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
97562+ page_cache_get(page_m);
97563+ page_add_anon_rmap(page_m, vma_m, address_m);
97564+ inc_mm_counter_fast(mm, MM_ANONPAGES);
97565+ set_pte_at(mm, address_m, pte_m, entry_m);
97566+ update_mmu_cache(vma_m, address_m, pte_m);
97567+out:
97568+ if (ptl != ptl_m)
97569+ spin_unlock(ptl_m);
97570+ pte_unmap(pte_m);
97571+ unlock_page(page_m);
97572+}
97573+
97574+void pax_mirror_file_pte(struct vm_area_struct *vma, unsigned long address, struct page *page_m, spinlock_t *ptl)
97575+{
97576+ struct mm_struct *mm = vma->vm_mm;
97577+ unsigned long address_m;
97578+ spinlock_t *ptl_m;
97579+ struct vm_area_struct *vma_m;
97580+ pmd_t *pmd_m;
97581+ pte_t *pte_m, entry_m;
97582+
97583+ BUG_ON(!page_m || PageAnon(page_m));
97584+
97585+ vma_m = pax_find_mirror_vma(vma);
97586+ if (!vma_m)
97587+ return;
97588+
97589+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
97590+ address_m = address + SEGMEXEC_TASK_SIZE;
97591+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
97592+ pte_m = pte_offset_map(pmd_m, address_m);
97593+ ptl_m = pte_lockptr(mm, pmd_m);
97594+ if (ptl != ptl_m) {
97595+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
97596+ if (!pte_none(*pte_m))
97597+ goto out;
97598+ }
97599+
97600+ entry_m = pfn_pte(page_to_pfn(page_m), vma_m->vm_page_prot);
97601+ page_cache_get(page_m);
97602+ page_add_file_rmap(page_m);
97603+ inc_mm_counter_fast(mm, MM_FILEPAGES);
97604+ set_pte_at(mm, address_m, pte_m, entry_m);
97605+ update_mmu_cache(vma_m, address_m, pte_m);
97606+out:
97607+ if (ptl != ptl_m)
97608+ spin_unlock(ptl_m);
97609+ pte_unmap(pte_m);
97610+}
97611+
97612+static void pax_mirror_pfn_pte(struct vm_area_struct *vma, unsigned long address, unsigned long pfn_m, spinlock_t *ptl)
97613+{
97614+ struct mm_struct *mm = vma->vm_mm;
97615+ unsigned long address_m;
97616+ spinlock_t *ptl_m;
97617+ struct vm_area_struct *vma_m;
97618+ pmd_t *pmd_m;
97619+ pte_t *pte_m, entry_m;
97620+
97621+ vma_m = pax_find_mirror_vma(vma);
97622+ if (!vma_m)
97623+ return;
97624+
97625+ BUG_ON(address >= SEGMEXEC_TASK_SIZE);
97626+ address_m = address + SEGMEXEC_TASK_SIZE;
97627+ pmd_m = pmd_offset(pud_offset(pgd_offset(mm, address_m), address_m), address_m);
97628+ pte_m = pte_offset_map(pmd_m, address_m);
97629+ ptl_m = pte_lockptr(mm, pmd_m);
97630+ if (ptl != ptl_m) {
97631+ spin_lock_nested(ptl_m, SINGLE_DEPTH_NESTING);
97632+ if (!pte_none(*pte_m))
97633+ goto out;
97634+ }
97635+
97636+ entry_m = pfn_pte(pfn_m, vma_m->vm_page_prot);
97637+ set_pte_at(mm, address_m, pte_m, entry_m);
97638+out:
97639+ if (ptl != ptl_m)
97640+ spin_unlock(ptl_m);
97641+ pte_unmap(pte_m);
97642+}
97643+
97644+static void pax_mirror_pte(struct vm_area_struct *vma, unsigned long address, pte_t *pte, pmd_t *pmd, spinlock_t *ptl)
97645+{
97646+ struct page *page_m;
97647+ pte_t entry;
97648+
97649+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC))
97650+ goto out;
97651+
97652+ entry = *pte;
97653+ page_m = vm_normal_page(vma, address, entry);
97654+ if (!page_m)
97655+ pax_mirror_pfn_pte(vma, address, pte_pfn(entry), ptl);
97656+ else if (PageAnon(page_m)) {
97657+ if (pax_find_mirror_vma(vma)) {
97658+ pte_unmap_unlock(pte, ptl);
97659+ lock_page(page_m);
97660+ pte = pte_offset_map_lock(vma->vm_mm, pmd, address, &ptl);
97661+ if (pte_same(entry, *pte))
97662+ pax_mirror_anon_pte(vma, address, page_m, ptl);
97663+ else
97664+ unlock_page(page_m);
97665+ }
97666+ } else
97667+ pax_mirror_file_pte(vma, address, page_m, ptl);
97668+
97669+out:
97670+ pte_unmap_unlock(pte, ptl);
97671+}
97672+#endif
97673+
97674 /*
97675 * This routine handles present pages, when users try to write
97676 * to a shared page. It is done by copying the page to a new address
97677@@ -2172,6 +2377,12 @@ gotten:
97678 */
97679 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
97680 if (likely(pte_same(*page_table, orig_pte))) {
97681+
97682+#ifdef CONFIG_PAX_SEGMEXEC
97683+ if (pax_find_mirror_vma(vma))
97684+ BUG_ON(!trylock_page(new_page));
97685+#endif
97686+
97687 if (old_page) {
97688 if (!PageAnon(old_page)) {
97689 dec_mm_counter_fast(mm, MM_FILEPAGES);
97690@@ -2225,6 +2436,10 @@ gotten:
97691 page_remove_rmap(old_page);
97692 }
97693
97694+#ifdef CONFIG_PAX_SEGMEXEC
97695+ pax_mirror_anon_pte(vma, address, new_page, ptl);
97696+#endif
97697+
97698 /* Free the old page.. */
97699 new_page = old_page;
97700 ret |= VM_FAULT_WRITE;
97701@@ -2483,6 +2698,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
97702 swap_free(entry);
97703 if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page))
97704 try_to_free_swap(page);
97705+
97706+#ifdef CONFIG_PAX_SEGMEXEC
97707+ if ((flags & FAULT_FLAG_WRITE) || !pax_find_mirror_vma(vma))
97708+#endif
97709+
97710 unlock_page(page);
97711 if (page != swapcache) {
97712 /*
97713@@ -2506,6 +2726,11 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma,
97714
97715 /* No need to invalidate - it was non-present before */
97716 update_mmu_cache(vma, address, page_table);
97717+
97718+#ifdef CONFIG_PAX_SEGMEXEC
97719+ pax_mirror_anon_pte(vma, address, page, ptl);
97720+#endif
97721+
97722 unlock:
97723 pte_unmap_unlock(page_table, ptl);
97724 out:
97725@@ -2525,40 +2750,6 @@ out_release:
97726 }
97727
97728 /*
97729- * This is like a special single-page "expand_{down|up}wards()",
97730- * except we must first make sure that 'address{-|+}PAGE_SIZE'
97731- * doesn't hit another vma.
97732- */
97733-static inline int check_stack_guard_page(struct vm_area_struct *vma, unsigned long address)
97734-{
97735- address &= PAGE_MASK;
97736- if ((vma->vm_flags & VM_GROWSDOWN) && address == vma->vm_start) {
97737- struct vm_area_struct *prev = vma->vm_prev;
97738-
97739- /*
97740- * Is there a mapping abutting this one below?
97741- *
97742- * That's only ok if it's the same stack mapping
97743- * that has gotten split..
97744- */
97745- if (prev && prev->vm_end == address)
97746- return prev->vm_flags & VM_GROWSDOWN ? 0 : -ENOMEM;
97747-
97748- return expand_downwards(vma, address - PAGE_SIZE);
97749- }
97750- if ((vma->vm_flags & VM_GROWSUP) && address + PAGE_SIZE == vma->vm_end) {
97751- struct vm_area_struct *next = vma->vm_next;
97752-
97753- /* As VM_GROWSDOWN but s/below/above/ */
97754- if (next && next->vm_start == address + PAGE_SIZE)
97755- return next->vm_flags & VM_GROWSUP ? 0 : -ENOMEM;
97756-
97757- return expand_upwards(vma, address + PAGE_SIZE);
97758- }
97759- return 0;
97760-}
97761-
97762-/*
97763 * We enter with non-exclusive mmap_sem (to exclude vma changes,
97764 * but allow concurrent faults), and pte mapped but not yet locked.
97765 * We return with mmap_sem still held, but pte unmapped and unlocked.
97766@@ -2568,27 +2759,23 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
97767 unsigned int flags)
97768 {
97769 struct mem_cgroup *memcg;
97770- struct page *page;
97771+ struct page *page = NULL;
97772 spinlock_t *ptl;
97773 pte_t entry;
97774
97775- pte_unmap(page_table);
97776-
97777- /* Check if we need to add a guard page to the stack */
97778- if (check_stack_guard_page(vma, address) < 0)
97779- return VM_FAULT_SIGSEGV;
97780-
97781- /* Use the zero-page for reads */
97782 if (!(flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(mm)) {
97783 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
97784 vma->vm_page_prot));
97785- page_table = pte_offset_map_lock(mm, pmd, address, &ptl);
97786+ ptl = pte_lockptr(mm, pmd);
97787+ spin_lock(ptl);
97788 if (!pte_none(*page_table))
97789 goto unlock;
97790 goto setpte;
97791 }
97792
97793 /* Allocate our own private page. */
97794+ pte_unmap(page_table);
97795+
97796 if (unlikely(anon_vma_prepare(vma)))
97797 goto oom;
97798 page = alloc_zeroed_user_highpage_movable(vma, address);
97799@@ -2612,6 +2799,11 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
97800 if (!pte_none(*page_table))
97801 goto release;
97802
97803+#ifdef CONFIG_PAX_SEGMEXEC
97804+ if (pax_find_mirror_vma(vma))
97805+ BUG_ON(!trylock_page(page));
97806+#endif
97807+
97808 inc_mm_counter_fast(mm, MM_ANONPAGES);
97809 page_add_new_anon_rmap(page, vma, address);
97810 mem_cgroup_commit_charge(page, memcg, false);
97811@@ -2621,6 +2813,12 @@ setpte:
97812
97813 /* No need to invalidate - it was non-present before */
97814 update_mmu_cache(vma, address, page_table);
97815+
97816+#ifdef CONFIG_PAX_SEGMEXEC
97817+ if (page)
97818+ pax_mirror_anon_pte(vma, address, page, ptl);
97819+#endif
97820+
97821 unlock:
97822 pte_unmap_unlock(page_table, ptl);
97823 return 0;
97824@@ -2853,6 +3051,11 @@ static int do_read_fault(struct mm_struct *mm, struct vm_area_struct *vma,
97825 return ret;
97826 }
97827 do_set_pte(vma, address, fault_page, pte, false, false);
97828+
97829+#ifdef CONFIG_PAX_SEGMEXEC
97830+ pax_mirror_file_pte(vma, address, fault_page, ptl);
97831+#endif
97832+
97833 unlock_page(fault_page);
97834 unlock_out:
97835 pte_unmap_unlock(pte, ptl);
97836@@ -2904,7 +3107,18 @@ static int do_cow_fault(struct mm_struct *mm, struct vm_area_struct *vma,
97837 }
97838 goto uncharge_out;
97839 }
97840+
97841+#ifdef CONFIG_PAX_SEGMEXEC
97842+ if (pax_find_mirror_vma(vma))
97843+ BUG_ON(!trylock_page(new_page));
97844+#endif
97845+
97846 do_set_pte(vma, address, new_page, pte, true, true);
97847+
97848+#ifdef CONFIG_PAX_SEGMEXEC
97849+ pax_mirror_anon_pte(vma, address, new_page, ptl);
97850+#endif
97851+
97852 mem_cgroup_commit_charge(new_page, memcg, false);
97853 lru_cache_add_active_or_unevictable(new_page, vma);
97854 pte_unmap_unlock(pte, ptl);
97855@@ -2962,6 +3176,11 @@ static int do_shared_fault(struct mm_struct *mm, struct vm_area_struct *vma,
97856 return ret;
97857 }
97858 do_set_pte(vma, address, fault_page, pte, true, false);
97859+
97860+#ifdef CONFIG_PAX_SEGMEXEC
97861+ pax_mirror_file_pte(vma, address, fault_page, ptl);
97862+#endif
97863+
97864 pte_unmap_unlock(pte, ptl);
97865
97866 if (set_page_dirty(fault_page))
97867@@ -3185,6 +3404,12 @@ static int handle_pte_fault(struct mm_struct *mm,
97868 if (flags & FAULT_FLAG_WRITE)
97869 flush_tlb_fix_spurious_fault(vma, address);
97870 }
97871+
97872+#ifdef CONFIG_PAX_SEGMEXEC
97873+ pax_mirror_pte(vma, address, pte, pmd, ptl);
97874+ return 0;
97875+#endif
97876+
97877 unlock:
97878 pte_unmap_unlock(pte, ptl);
97879 return 0;
97880@@ -3204,9 +3429,41 @@ static int __handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma,
97881 pmd_t *pmd;
97882 pte_t *pte;
97883
97884+#ifdef CONFIG_PAX_SEGMEXEC
97885+ struct vm_area_struct *vma_m;
97886+#endif
97887+
97888 if (unlikely(is_vm_hugetlb_page(vma)))
97889 return hugetlb_fault(mm, vma, address, flags);
97890
97891+#ifdef CONFIG_PAX_SEGMEXEC
97892+ vma_m = pax_find_mirror_vma(vma);
97893+ if (vma_m) {
97894+ unsigned long address_m;
97895+ pgd_t *pgd_m;
97896+ pud_t *pud_m;
97897+ pmd_t *pmd_m;
97898+
97899+ if (vma->vm_start > vma_m->vm_start) {
97900+ address_m = address;
97901+ address -= SEGMEXEC_TASK_SIZE;
97902+ vma = vma_m;
97903+ } else
97904+ address_m = address + SEGMEXEC_TASK_SIZE;
97905+
97906+ pgd_m = pgd_offset(mm, address_m);
97907+ pud_m = pud_alloc(mm, pgd_m, address_m);
97908+ if (!pud_m)
97909+ return VM_FAULT_OOM;
97910+ pmd_m = pmd_alloc(mm, pud_m, address_m);
97911+ if (!pmd_m)
97912+ return VM_FAULT_OOM;
97913+ if (!pmd_present(*pmd_m) && __pte_alloc(mm, vma_m, pmd_m, address_m))
97914+ return VM_FAULT_OOM;
97915+ pax_unmap_mirror_pte(vma_m, address_m, pmd_m);
97916+ }
97917+#endif
97918+
97919 pgd = pgd_offset(mm, address);
97920 pud = pud_alloc(mm, pgd, address);
97921 if (!pud)
97922@@ -3341,6 +3598,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
97923 spin_unlock(&mm->page_table_lock);
97924 return 0;
97925 }
97926+
97927+int __pud_alloc_kernel(struct mm_struct *mm, pgd_t *pgd, unsigned long address)
97928+{
97929+ pud_t *new = pud_alloc_one(mm, address);
97930+ if (!new)
97931+ return -ENOMEM;
97932+
97933+ smp_wmb(); /* See comment in __pte_alloc */
97934+
97935+ spin_lock(&mm->page_table_lock);
97936+ if (pgd_present(*pgd)) /* Another has populated it */
97937+ pud_free(mm, new);
97938+ else
97939+ pgd_populate_kernel(mm, pgd, new);
97940+ spin_unlock(&mm->page_table_lock);
97941+ return 0;
97942+}
97943 #endif /* __PAGETABLE_PUD_FOLDED */
97944
97945 #ifndef __PAGETABLE_PMD_FOLDED
97946@@ -3373,6 +3647,32 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address)
97947 spin_unlock(&mm->page_table_lock);
97948 return 0;
97949 }
97950+
97951+int __pmd_alloc_kernel(struct mm_struct *mm, pud_t *pud, unsigned long address)
97952+{
97953+ pmd_t *new = pmd_alloc_one(mm, address);
97954+ if (!new)
97955+ return -ENOMEM;
97956+
97957+ smp_wmb(); /* See comment in __pte_alloc */
97958+
97959+ spin_lock(&mm->page_table_lock);
97960+#ifndef __ARCH_HAS_4LEVEL_HACK
97961+ if (!pud_present(*pud)) {
97962+ mm_inc_nr_pmds(mm);
97963+ pud_populate_kernel(mm, pud, new);
97964+ } else /* Another has populated it */
97965+ pmd_free(mm, new);
97966+#else
97967+ if (!pgd_present(*pud)) {
97968+ mm_inc_nr_pmds(mm);
97969+ pgd_populate_kernel(mm, pud, new);
97970+ } else /* Another has populated it */
97971+ pmd_free(mm, new);
97972+#endif /* __ARCH_HAS_4LEVEL_HACK */
97973+ spin_unlock(&mm->page_table_lock);
97974+ return 0;
97975+}
97976 #endif /* __PAGETABLE_PMD_FOLDED */
97977
97978 static int __follow_pte(struct mm_struct *mm, unsigned long address,
97979@@ -3482,8 +3782,8 @@ out:
97980 return ret;
97981 }
97982
97983-int generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
97984- void *buf, int len, int write)
97985+ssize_t generic_access_phys(struct vm_area_struct *vma, unsigned long addr,
97986+ void *buf, size_t len, int write)
97987 {
97988 resource_size_t phys_addr;
97989 unsigned long prot = 0;
97990@@ -3509,8 +3809,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys);
97991 * Access another process' address space as given in mm. If non-NULL, use the
97992 * given task for page fault accounting.
97993 */
97994-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97995- unsigned long addr, void *buf, int len, int write)
97996+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
97997+ unsigned long addr, void *buf, size_t len, int write)
97998 {
97999 struct vm_area_struct *vma;
98000 void *old_buf = buf;
98001@@ -3518,7 +3818,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
98002 down_read(&mm->mmap_sem);
98003 /* ignore errors, just check how much was successfully transferred */
98004 while (len) {
98005- int bytes, ret, offset;
98006+ ssize_t bytes, ret, offset;
98007 void *maddr;
98008 struct page *page = NULL;
98009
98010@@ -3579,8 +3879,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
98011 *
98012 * The caller must hold a reference on @mm.
98013 */
98014-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
98015- void *buf, int len, int write)
98016+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
98017+ void *buf, size_t len, int write)
98018 {
98019 return __access_remote_vm(NULL, mm, addr, buf, len, write);
98020 }
98021@@ -3590,11 +3890,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
98022 * Source/target buffer must be kernel space,
98023 * Do not walk the page table directly, use get_user_pages
98024 */
98025-int access_process_vm(struct task_struct *tsk, unsigned long addr,
98026- void *buf, int len, int write)
98027+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr,
98028+ void *buf, size_t len, int write)
98029 {
98030 struct mm_struct *mm;
98031- int ret;
98032+ ssize_t ret;
98033
98034 mm = get_task_mm(tsk);
98035 if (!mm)
98036diff --git a/mm/mempolicy.c b/mm/mempolicy.c
98037index de5dc5e..68a4ea3 100644
98038--- a/mm/mempolicy.c
98039+++ b/mm/mempolicy.c
98040@@ -703,6 +703,10 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
98041 unsigned long vmstart;
98042 unsigned long vmend;
98043
98044+#ifdef CONFIG_PAX_SEGMEXEC
98045+ struct vm_area_struct *vma_m;
98046+#endif
98047+
98048 vma = find_vma(mm, start);
98049 if (!vma || vma->vm_start > start)
98050 return -EFAULT;
98051@@ -746,6 +750,16 @@ static int mbind_range(struct mm_struct *mm, unsigned long start,
98052 err = vma_replace_policy(vma, new_pol);
98053 if (err)
98054 goto out;
98055+
98056+#ifdef CONFIG_PAX_SEGMEXEC
98057+ vma_m = pax_find_mirror_vma(vma);
98058+ if (vma_m) {
98059+ err = vma_replace_policy(vma_m, new_pol);
98060+ if (err)
98061+ goto out;
98062+ }
98063+#endif
98064+
98065 }
98066
98067 out:
98068@@ -1160,6 +1174,17 @@ static long do_mbind(unsigned long start, unsigned long len,
98069
98070 if (end < start)
98071 return -EINVAL;
98072+
98073+#ifdef CONFIG_PAX_SEGMEXEC
98074+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
98075+ if (end > SEGMEXEC_TASK_SIZE)
98076+ return -EINVAL;
98077+ } else
98078+#endif
98079+
98080+ if (end > TASK_SIZE)
98081+ return -EINVAL;
98082+
98083 if (end == start)
98084 return 0;
98085
98086@@ -1385,8 +1410,7 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
98087 */
98088 tcred = __task_cred(task);
98089 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
98090- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
98091- !capable(CAP_SYS_NICE)) {
98092+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
98093 rcu_read_unlock();
98094 err = -EPERM;
98095 goto out_put;
98096@@ -1417,6 +1441,15 @@ SYSCALL_DEFINE4(migrate_pages, pid_t, pid, unsigned long, maxnode,
98097 goto out;
98098 }
98099
98100+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
98101+ if (mm != current->mm &&
98102+ (mm->pax_flags & MF_PAX_RANDMMAP || mm->pax_flags & MF_PAX_SEGMEXEC)) {
98103+ mmput(mm);
98104+ err = -EPERM;
98105+ goto out;
98106+ }
98107+#endif
98108+
98109 err = do_migrate_pages(mm, old, new,
98110 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE);
98111
98112diff --git a/mm/migrate.c b/mm/migrate.c
98113index 85e0426..be49beb 100644
98114--- a/mm/migrate.c
98115+++ b/mm/migrate.c
98116@@ -1472,8 +1472,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages,
98117 */
98118 tcred = __task_cred(task);
98119 if (!uid_eq(cred->euid, tcred->suid) && !uid_eq(cred->euid, tcred->uid) &&
98120- !uid_eq(cred->uid, tcred->suid) && !uid_eq(cred->uid, tcred->uid) &&
98121- !capable(CAP_SYS_NICE)) {
98122+ !uid_eq(cred->uid, tcred->suid) && !capable(CAP_SYS_NICE)) {
98123 rcu_read_unlock();
98124 err = -EPERM;
98125 goto out;
98126diff --git a/mm/mlock.c b/mm/mlock.c
98127index 8a54cd2..92f1747 100644
98128--- a/mm/mlock.c
98129+++ b/mm/mlock.c
98130@@ -14,6 +14,7 @@
98131 #include <linux/pagevec.h>
98132 #include <linux/mempolicy.h>
98133 #include <linux/syscalls.h>
98134+#include <linux/security.h>
98135 #include <linux/sched.h>
98136 #include <linux/export.h>
98137 #include <linux/rmap.h>
98138@@ -613,7 +614,7 @@ static int do_mlock(unsigned long start, size_t len, int on)
98139 {
98140 unsigned long nstart, end, tmp;
98141 struct vm_area_struct * vma, * prev;
98142- int error;
98143+ int error = 0;
98144
98145 VM_BUG_ON(start & ~PAGE_MASK);
98146 VM_BUG_ON(len != PAGE_ALIGN(len));
98147@@ -622,6 +623,9 @@ static int do_mlock(unsigned long start, size_t len, int on)
98148 return -EINVAL;
98149 if (end == start)
98150 return 0;
98151+ if (end > TASK_SIZE)
98152+ return -EINVAL;
98153+
98154 vma = find_vma(current->mm, start);
98155 if (!vma || vma->vm_start > start)
98156 return -ENOMEM;
98157@@ -633,6 +637,11 @@ static int do_mlock(unsigned long start, size_t len, int on)
98158 for (nstart = start ; ; ) {
98159 vm_flags_t newflags;
98160
98161+#ifdef CONFIG_PAX_SEGMEXEC
98162+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
98163+ break;
98164+#endif
98165+
98166 /* Here we know that vma->vm_start <= nstart < vma->vm_end. */
98167
98168 newflags = vma->vm_flags & ~VM_LOCKED;
98169@@ -746,6 +755,7 @@ SYSCALL_DEFINE2(mlock, unsigned long, start, size_t, len)
98170 locked += current->mm->locked_vm;
98171
98172 /* check against resource limits */
98173+ gr_learn_resource(current, RLIMIT_MEMLOCK, (current->mm->locked_vm << PAGE_SHIFT) + len, 1);
98174 if ((locked <= lock_limit) || capable(CAP_IPC_LOCK))
98175 error = do_mlock(start, len, 1);
98176
98177@@ -783,6 +793,11 @@ static int do_mlockall(int flags)
98178 for (vma = current->mm->mmap; vma ; vma = prev->vm_next) {
98179 vm_flags_t newflags;
98180
98181+#ifdef CONFIG_PAX_SEGMEXEC
98182+ if ((current->mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE))
98183+ break;
98184+#endif
98185+
98186 newflags = vma->vm_flags & ~VM_LOCKED;
98187 if (flags & MCL_CURRENT)
98188 newflags |= VM_LOCKED;
98189@@ -814,8 +829,10 @@ SYSCALL_DEFINE1(mlockall, int, flags)
98190 lock_limit >>= PAGE_SHIFT;
98191
98192 ret = -ENOMEM;
98193+
98194+ gr_learn_resource(current, RLIMIT_MEMLOCK, current->mm->total_vm << PAGE_SHIFT, 1);
98195+
98196 down_write(&current->mm->mmap_sem);
98197-
98198 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
98199 capable(CAP_IPC_LOCK))
98200 ret = do_mlockall(flags);
98201diff --git a/mm/mm_init.c b/mm/mm_init.c
98202index 5f420f7..dd42fb1b 100644
98203--- a/mm/mm_init.c
98204+++ b/mm/mm_init.c
98205@@ -177,7 +177,7 @@ static int __meminit mm_compute_batch_notifier(struct notifier_block *self,
98206 return NOTIFY_OK;
98207 }
98208
98209-static struct notifier_block compute_batch_nb __meminitdata = {
98210+static struct notifier_block compute_batch_nb __meminitconst = {
98211 .notifier_call = mm_compute_batch_notifier,
98212 .priority = IPC_CALLBACK_PRI, /* use lowest priority */
98213 };
98214diff --git a/mm/mmap.c b/mm/mmap.c
98215index 9ec50a3..0476e2d 100644
98216--- a/mm/mmap.c
98217+++ b/mm/mmap.c
98218@@ -41,6 +41,7 @@
98219 #include <linux/notifier.h>
98220 #include <linux/memory.h>
98221 #include <linux/printk.h>
98222+#include <linux/random.h>
98223
98224 #include <asm/uaccess.h>
98225 #include <asm/cacheflush.h>
98226@@ -57,6 +58,16 @@
98227 #define arch_rebalance_pgtables(addr, len) (addr)
98228 #endif
98229
98230+static inline void verify_mm_writelocked(struct mm_struct *mm)
98231+{
98232+#if defined(CONFIG_DEBUG_VM) || defined(CONFIG_PAX)
98233+ if (unlikely(down_read_trylock(&mm->mmap_sem))) {
98234+ up_read(&mm->mmap_sem);
98235+ BUG();
98236+ }
98237+#endif
98238+}
98239+
98240 static void unmap_region(struct mm_struct *mm,
98241 struct vm_area_struct *vma, struct vm_area_struct *prev,
98242 unsigned long start, unsigned long end);
98243@@ -76,16 +87,25 @@ static void unmap_region(struct mm_struct *mm,
98244 * x: (no) no x: (no) yes x: (no) yes x: (yes) yes
98245 *
98246 */
98247-pgprot_t protection_map[16] = {
98248+pgprot_t protection_map[16] __read_only = {
98249 __P000, __P001, __P010, __P011, __P100, __P101, __P110, __P111,
98250 __S000, __S001, __S010, __S011, __S100, __S101, __S110, __S111
98251 };
98252
98253-pgprot_t vm_get_page_prot(unsigned long vm_flags)
98254+pgprot_t vm_get_page_prot(vm_flags_t vm_flags)
98255 {
98256- return __pgprot(pgprot_val(protection_map[vm_flags &
98257+ pgprot_t prot = __pgprot(pgprot_val(protection_map[vm_flags &
98258 (VM_READ|VM_WRITE|VM_EXEC|VM_SHARED)]) |
98259 pgprot_val(arch_vm_get_page_prot(vm_flags)));
98260+
98261+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
98262+ if (!(__supported_pte_mask & _PAGE_NX) &&
98263+ (vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC &&
98264+ (vm_flags & (VM_READ | VM_WRITE)))
98265+ prot = __pgprot(pte_val(pte_exprotect(__pte(pgprot_val(prot)))));
98266+#endif
98267+
98268+ return prot;
98269 }
98270 EXPORT_SYMBOL(vm_get_page_prot);
98271
98272@@ -114,6 +134,7 @@ unsigned long sysctl_overcommit_kbytes __read_mostly;
98273 int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT;
98274 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
98275 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
98276+unsigned long sysctl_heap_stack_gap __read_mostly = 64*1024;
98277 /*
98278 * Make sure vm_committed_as in one cacheline and not cacheline shared with
98279 * other variables. It can be updated by several CPUs frequently.
98280@@ -271,6 +292,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
98281 struct vm_area_struct *next = vma->vm_next;
98282
98283 might_sleep();
98284+ BUG_ON(vma->vm_mirror);
98285 if (vma->vm_ops && vma->vm_ops->close)
98286 vma->vm_ops->close(vma);
98287 if (vma->vm_file)
98288@@ -284,6 +306,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len);
98289
98290 SYSCALL_DEFINE1(brk, unsigned long, brk)
98291 {
98292+ unsigned long rlim;
98293 unsigned long retval;
98294 unsigned long newbrk, oldbrk;
98295 struct mm_struct *mm = current->mm;
98296@@ -314,7 +337,13 @@ SYSCALL_DEFINE1(brk, unsigned long, brk)
98297 * segment grow beyond its set limit the in case where the limit is
98298 * not page aligned -Ram Gupta
98299 */
98300- if (check_data_rlimit(rlimit(RLIMIT_DATA), brk, mm->start_brk,
98301+ rlim = rlimit(RLIMIT_DATA);
98302+#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP
98303+ /* force a minimum 16MB brk heap on setuid/setgid binaries */
98304+ if (rlim < PAGE_SIZE && (get_dumpable(mm) != SUID_DUMP_USER) && gr_is_global_nonroot(current_uid()))
98305+ rlim = 4096 * PAGE_SIZE;
98306+#endif
98307+ if (check_data_rlimit(rlim, brk, mm->start_brk,
98308 mm->end_data, mm->start_data))
98309 goto out;
98310
98311@@ -967,6 +996,12 @@ static int
98312 can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags,
98313 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
98314 {
98315+
98316+#ifdef CONFIG_PAX_SEGMEXEC
98317+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_start == SEGMEXEC_TASK_SIZE)
98318+ return 0;
98319+#endif
98320+
98321 if (is_mergeable_vma(vma, file, vm_flags) &&
98322 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
98323 if (vma->vm_pgoff == vm_pgoff)
98324@@ -986,6 +1021,12 @@ static int
98325 can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags,
98326 struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff)
98327 {
98328+
98329+#ifdef CONFIG_PAX_SEGMEXEC
98330+ if ((vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end == SEGMEXEC_TASK_SIZE)
98331+ return 0;
98332+#endif
98333+
98334 if (is_mergeable_vma(vma, file, vm_flags) &&
98335 is_mergeable_anon_vma(anon_vma, vma->anon_vma, vma)) {
98336 pgoff_t vm_pglen;
98337@@ -1035,6 +1076,13 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
98338 struct vm_area_struct *area, *next;
98339 int err;
98340
98341+#ifdef CONFIG_PAX_SEGMEXEC
98342+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE, end_m = end + SEGMEXEC_TASK_SIZE;
98343+ struct vm_area_struct *area_m = NULL, *next_m = NULL, *prev_m = NULL;
98344+
98345+ BUG_ON((mm->pax_flags & MF_PAX_SEGMEXEC) && SEGMEXEC_TASK_SIZE < end);
98346+#endif
98347+
98348 /*
98349 * We later require that vma->vm_flags == vm_flags,
98350 * so this tests vma->vm_flags & VM_SPECIAL, too.
98351@@ -1050,6 +1098,15 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
98352 if (next && next->vm_end == end) /* cases 6, 7, 8 */
98353 next = next->vm_next;
98354
98355+#ifdef CONFIG_PAX_SEGMEXEC
98356+ if (prev)
98357+ prev_m = pax_find_mirror_vma(prev);
98358+ if (area)
98359+ area_m = pax_find_mirror_vma(area);
98360+ if (next)
98361+ next_m = pax_find_mirror_vma(next);
98362+#endif
98363+
98364 /*
98365 * Can it merge with the predecessor?
98366 */
98367@@ -1069,9 +1126,24 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
98368 /* cases 1, 6 */
98369 err = vma_adjust(prev, prev->vm_start,
98370 next->vm_end, prev->vm_pgoff, NULL);
98371- } else /* cases 2, 5, 7 */
98372+
98373+#ifdef CONFIG_PAX_SEGMEXEC
98374+ if (!err && prev_m)
98375+ err = vma_adjust(prev_m, prev_m->vm_start,
98376+ next_m->vm_end, prev_m->vm_pgoff, NULL);
98377+#endif
98378+
98379+ } else { /* cases 2, 5, 7 */
98380 err = vma_adjust(prev, prev->vm_start,
98381 end, prev->vm_pgoff, NULL);
98382+
98383+#ifdef CONFIG_PAX_SEGMEXEC
98384+ if (!err && prev_m)
98385+ err = vma_adjust(prev_m, prev_m->vm_start,
98386+ end_m, prev_m->vm_pgoff, NULL);
98387+#endif
98388+
98389+ }
98390 if (err)
98391 return NULL;
98392 khugepaged_enter_vma_merge(prev, vm_flags);
98393@@ -1085,12 +1157,27 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
98394 mpol_equal(policy, vma_policy(next)) &&
98395 can_vma_merge_before(next, vm_flags,
98396 anon_vma, file, pgoff+pglen)) {
98397- if (prev && addr < prev->vm_end) /* case 4 */
98398+ if (prev && addr < prev->vm_end) { /* case 4 */
98399 err = vma_adjust(prev, prev->vm_start,
98400 addr, prev->vm_pgoff, NULL);
98401- else /* cases 3, 8 */
98402+
98403+#ifdef CONFIG_PAX_SEGMEXEC
98404+ if (!err && prev_m)
98405+ err = vma_adjust(prev_m, prev_m->vm_start,
98406+ addr_m, prev_m->vm_pgoff, NULL);
98407+#endif
98408+
98409+ } else { /* cases 3, 8 */
98410 err = vma_adjust(area, addr, next->vm_end,
98411 next->vm_pgoff - pglen, NULL);
98412+
98413+#ifdef CONFIG_PAX_SEGMEXEC
98414+ if (!err && area_m)
98415+ err = vma_adjust(area_m, addr_m, next_m->vm_end,
98416+ next_m->vm_pgoff - pglen, NULL);
98417+#endif
98418+
98419+ }
98420 if (err)
98421 return NULL;
98422 khugepaged_enter_vma_merge(area, vm_flags);
98423@@ -1199,8 +1286,10 @@ none:
98424 void vm_stat_account(struct mm_struct *mm, unsigned long flags,
98425 struct file *file, long pages)
98426 {
98427- const unsigned long stack_flags
98428- = VM_STACK_FLAGS & (VM_GROWSUP|VM_GROWSDOWN);
98429+
98430+#ifdef CONFIG_PAX_RANDMMAP
98431+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
98432+#endif
98433
98434 mm->total_vm += pages;
98435
98436@@ -1208,7 +1297,7 @@ void vm_stat_account(struct mm_struct *mm, unsigned long flags,
98437 mm->shared_vm += pages;
98438 if ((flags & (VM_EXEC|VM_WRITE)) == VM_EXEC)
98439 mm->exec_vm += pages;
98440- } else if (flags & stack_flags)
98441+ } else if (flags & (VM_GROWSUP|VM_GROWSDOWN))
98442 mm->stack_vm += pages;
98443 }
98444 #endif /* CONFIG_PROC_FS */
98445@@ -1238,6 +1327,7 @@ static inline int mlock_future_check(struct mm_struct *mm,
98446 locked += mm->locked_vm;
98447 lock_limit = rlimit(RLIMIT_MEMLOCK);
98448 lock_limit >>= PAGE_SHIFT;
98449+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
98450 if (locked > lock_limit && !capable(CAP_IPC_LOCK))
98451 return -EAGAIN;
98452 }
98453@@ -1264,7 +1354,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
98454 * (the exception is when the underlying filesystem is noexec
98455 * mounted, in which case we dont add PROT_EXEC.)
98456 */
98457- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
98458+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
98459 if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC)))
98460 prot |= PROT_EXEC;
98461
98462@@ -1290,7 +1380,7 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
98463 /* Obtain the address to map to. we verify (or select) it and ensure
98464 * that it represents a valid section of the address space.
98465 */
98466- addr = get_unmapped_area(file, addr, len, pgoff, flags);
98467+ addr = get_unmapped_area(file, addr, len, pgoff, flags | ((prot & PROT_EXEC) ? MAP_EXECUTABLE : 0));
98468 if (addr & ~PAGE_MASK)
98469 return addr;
98470
98471@@ -1301,6 +1391,43 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
98472 vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) |
98473 mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC;
98474
98475+#ifdef CONFIG_PAX_MPROTECT
98476+ if (mm->pax_flags & MF_PAX_MPROTECT) {
98477+
98478+#ifdef CONFIG_GRKERNSEC_RWXMAP_LOG
98479+ if (file && !pgoff && (vm_flags & VM_EXEC) && mm->binfmt &&
98480+ mm->binfmt->handle_mmap)
98481+ mm->binfmt->handle_mmap(file);
98482+#endif
98483+
98484+#ifndef CONFIG_PAX_MPROTECT_COMPAT
98485+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC)) {
98486+ gr_log_rwxmmap(file);
98487+
98488+#ifdef CONFIG_PAX_EMUPLT
98489+ vm_flags &= ~VM_EXEC;
98490+#else
98491+ return -EPERM;
98492+#endif
98493+
98494+ }
98495+
98496+ if (!(vm_flags & VM_EXEC))
98497+ vm_flags &= ~VM_MAYEXEC;
98498+#else
98499+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
98500+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
98501+#endif
98502+ else
98503+ vm_flags &= ~VM_MAYWRITE;
98504+ }
98505+#endif
98506+
98507+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
98508+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && file)
98509+ vm_flags &= ~VM_PAGEEXEC;
98510+#endif
98511+
98512 if (flags & MAP_LOCKED)
98513 if (!can_do_mlock())
98514 return -EPERM;
98515@@ -1388,6 +1515,9 @@ unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
98516 vm_flags |= VM_NORESERVE;
98517 }
98518
98519+ if (!gr_acl_handle_mmap(file, prot))
98520+ return -EACCES;
98521+
98522 addr = mmap_region(file, addr, len, vm_flags, pgoff);
98523 if (!IS_ERR_VALUE(addr) &&
98524 ((vm_flags & VM_LOCKED) ||
98525@@ -1481,7 +1611,7 @@ int vma_wants_writenotify(struct vm_area_struct *vma)
98526 vm_flags_t vm_flags = vma->vm_flags;
98527
98528 /* If it was private or non-writable, the write bit is already clear */
98529- if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
98530+ if ((vm_flags & (VM_WRITE|VM_SHARED)) != (VM_WRITE|VM_SHARED))
98531 return 0;
98532
98533 /* The backer wishes to know when pages are first written to? */
98534@@ -1532,7 +1662,22 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
98535 struct rb_node **rb_link, *rb_parent;
98536 unsigned long charged = 0;
98537
98538+#ifdef CONFIG_PAX_SEGMEXEC
98539+ struct vm_area_struct *vma_m = NULL;
98540+#endif
98541+
98542+ /*
98543+ * mm->mmap_sem is required to protect against another thread
98544+ * changing the mappings in case we sleep.
98545+ */
98546+ verify_mm_writelocked(mm);
98547+
98548 /* Check against address space limit. */
98549+
98550+#ifdef CONFIG_PAX_RANDMMAP
98551+ if (!(mm->pax_flags & MF_PAX_RANDMMAP) || (vm_flags & (VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)))
98552+#endif
98553+
98554 if (!may_expand_vm(mm, len >> PAGE_SHIFT)) {
98555 unsigned long nr_pages;
98556
98557@@ -1551,11 +1696,10 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
98558
98559 /* Clear old maps */
98560 error = -ENOMEM;
98561-munmap_back:
98562 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
98563 if (do_munmap(mm, addr, len))
98564 return -ENOMEM;
98565- goto munmap_back;
98566+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
98567 }
98568
98569 /*
98570@@ -1586,6 +1730,16 @@ munmap_back:
98571 goto unacct_error;
98572 }
98573
98574+#ifdef CONFIG_PAX_SEGMEXEC
98575+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vm_flags & VM_EXEC)) {
98576+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
98577+ if (!vma_m) {
98578+ error = -ENOMEM;
98579+ goto free_vma;
98580+ }
98581+ }
98582+#endif
98583+
98584 vma->vm_mm = mm;
98585 vma->vm_start = addr;
98586 vma->vm_end = addr + len;
98587@@ -1616,6 +1770,13 @@ munmap_back:
98588 if (error)
98589 goto unmap_and_free_vma;
98590
98591+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_X86_32)
98592+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && !(vma->vm_flags & VM_SPECIAL)) {
98593+ vma->vm_flags |= VM_PAGEEXEC;
98594+ vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
98595+ }
98596+#endif
98597+
98598 /* Can addr have changed??
98599 *
98600 * Answer: Yes, several device drivers can do it in their
98601@@ -1634,6 +1795,12 @@ munmap_back:
98602 }
98603
98604 vma_link(mm, vma, prev, rb_link, rb_parent);
98605+
98606+#ifdef CONFIG_PAX_SEGMEXEC
98607+ if (vma_m)
98608+ BUG_ON(pax_mirror_vma(vma_m, vma));
98609+#endif
98610+
98611 /* Once vma denies write, undo our temporary denial count */
98612 if (file) {
98613 if (vm_flags & VM_SHARED)
98614@@ -1646,6 +1813,7 @@ out:
98615 perf_event_mmap(vma);
98616
98617 vm_stat_account(mm, vm_flags, file, len >> PAGE_SHIFT);
98618+ track_exec_limit(mm, addr, addr + len, vm_flags);
98619 if (vm_flags & VM_LOCKED) {
98620 if (!((vm_flags & VM_SPECIAL) || is_vm_hugetlb_page(vma) ||
98621 vma == get_gate_vma(current->mm)))
98622@@ -1683,6 +1851,12 @@ allow_write_and_free_vma:
98623 if (vm_flags & VM_DENYWRITE)
98624 allow_write_access(file);
98625 free_vma:
98626+
98627+#ifdef CONFIG_PAX_SEGMEXEC
98628+ if (vma_m)
98629+ kmem_cache_free(vm_area_cachep, vma_m);
98630+#endif
98631+
98632 kmem_cache_free(vm_area_cachep, vma);
98633 unacct_error:
98634 if (charged)
98635@@ -1690,7 +1864,63 @@ unacct_error:
98636 return error;
98637 }
98638
98639-unsigned long unmapped_area(struct vm_unmapped_area_info *info)
98640+#ifdef CONFIG_GRKERNSEC_RAND_THREADSTACK
98641+unsigned long gr_rand_threadstack_offset(const struct mm_struct *mm, const struct file *filp, unsigned long flags)
98642+{
98643+ if ((mm->pax_flags & MF_PAX_RANDMMAP) && !filp && (flags & MAP_STACK))
98644+ return ((prandom_u32() & 0xFF) + 1) << PAGE_SHIFT;
98645+
98646+ return 0;
98647+}
98648+#endif
98649+
98650+bool check_heap_stack_gap(const struct vm_area_struct *vma, unsigned long addr, unsigned long len, unsigned long offset)
98651+{
98652+ if (!vma) {
98653+#ifdef CONFIG_STACK_GROWSUP
98654+ if (addr > sysctl_heap_stack_gap)
98655+ vma = find_vma(current->mm, addr - sysctl_heap_stack_gap);
98656+ else
98657+ vma = find_vma(current->mm, 0);
98658+ if (vma && (vma->vm_flags & VM_GROWSUP))
98659+ return false;
98660+#endif
98661+ return true;
98662+ }
98663+
98664+ if (addr + len > vma->vm_start)
98665+ return false;
98666+
98667+ if (vma->vm_flags & VM_GROWSDOWN)
98668+ return sysctl_heap_stack_gap <= vma->vm_start - addr - len;
98669+#ifdef CONFIG_STACK_GROWSUP
98670+ else if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP))
98671+ return addr - vma->vm_prev->vm_end >= sysctl_heap_stack_gap;
98672+#endif
98673+ else if (offset)
98674+ return offset <= vma->vm_start - addr - len;
98675+
98676+ return true;
98677+}
98678+
98679+unsigned long skip_heap_stack_gap(const struct vm_area_struct *vma, unsigned long len, unsigned long offset)
98680+{
98681+ if (vma->vm_start < len)
98682+ return -ENOMEM;
98683+
98684+ if (!(vma->vm_flags & VM_GROWSDOWN)) {
98685+ if (offset <= vma->vm_start - len)
98686+ return vma->vm_start - len - offset;
98687+ else
98688+ return -ENOMEM;
98689+ }
98690+
98691+ if (sysctl_heap_stack_gap <= vma->vm_start - len)
98692+ return vma->vm_start - len - sysctl_heap_stack_gap;
98693+ return -ENOMEM;
98694+}
98695+
98696+unsigned long unmapped_area(const struct vm_unmapped_area_info *info)
98697 {
98698 /*
98699 * We implement the search by looking for an rbtree node that
98700@@ -1738,11 +1968,29 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info)
98701 }
98702 }
98703
98704- gap_start = vma->vm_prev ? vma->vm_prev->vm_end : 0;
98705+ gap_start = vma->vm_prev ? vma->vm_prev->vm_end: 0;
98706 check_current:
98707 /* Check if current node has a suitable gap */
98708 if (gap_start > high_limit)
98709 return -ENOMEM;
98710+
98711+ if (gap_end - gap_start > info->threadstack_offset)
98712+ gap_start += info->threadstack_offset;
98713+ else
98714+ gap_start = gap_end;
98715+
98716+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
98717+ if (gap_end - gap_start > sysctl_heap_stack_gap)
98718+ gap_start += sysctl_heap_stack_gap;
98719+ else
98720+ gap_start = gap_end;
98721+ }
98722+ if (vma->vm_flags & VM_GROWSDOWN) {
98723+ if (gap_end - gap_start > sysctl_heap_stack_gap)
98724+ gap_end -= sysctl_heap_stack_gap;
98725+ else
98726+ gap_end = gap_start;
98727+ }
98728 if (gap_end >= low_limit && gap_end - gap_start >= length)
98729 goto found;
98730
98731@@ -1792,7 +2040,7 @@ found:
98732 return gap_start;
98733 }
98734
98735-unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info)
98736+unsigned long unmapped_area_topdown(const struct vm_unmapped_area_info *info)
98737 {
98738 struct mm_struct *mm = current->mm;
98739 struct vm_area_struct *vma;
98740@@ -1846,6 +2094,24 @@ check_current:
98741 gap_end = vma->vm_start;
98742 if (gap_end < low_limit)
98743 return -ENOMEM;
98744+
98745+ if (gap_end - gap_start > info->threadstack_offset)
98746+ gap_end -= info->threadstack_offset;
98747+ else
98748+ gap_end = gap_start;
98749+
98750+ if (vma->vm_prev && (vma->vm_prev->vm_flags & VM_GROWSUP)) {
98751+ if (gap_end - gap_start > sysctl_heap_stack_gap)
98752+ gap_start += sysctl_heap_stack_gap;
98753+ else
98754+ gap_start = gap_end;
98755+ }
98756+ if (vma->vm_flags & VM_GROWSDOWN) {
98757+ if (gap_end - gap_start > sysctl_heap_stack_gap)
98758+ gap_end -= sysctl_heap_stack_gap;
98759+ else
98760+ gap_end = gap_start;
98761+ }
98762 if (gap_start <= high_limit && gap_end - gap_start >= length)
98763 goto found;
98764
98765@@ -1909,6 +2175,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
98766 struct mm_struct *mm = current->mm;
98767 struct vm_area_struct *vma;
98768 struct vm_unmapped_area_info info;
98769+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
98770
98771 if (len > TASK_SIZE - mmap_min_addr)
98772 return -ENOMEM;
98773@@ -1916,11 +2183,15 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
98774 if (flags & MAP_FIXED)
98775 return addr;
98776
98777+#ifdef CONFIG_PAX_RANDMMAP
98778+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
98779+#endif
98780+
98781 if (addr) {
98782 addr = PAGE_ALIGN(addr);
98783 vma = find_vma(mm, addr);
98784 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
98785- (!vma || addr + len <= vma->vm_start))
98786+ check_heap_stack_gap(vma, addr, len, offset))
98787 return addr;
98788 }
98789
98790@@ -1929,6 +2200,7 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
98791 info.low_limit = mm->mmap_base;
98792 info.high_limit = TASK_SIZE;
98793 info.align_mask = 0;
98794+ info.threadstack_offset = offset;
98795 return vm_unmapped_area(&info);
98796 }
98797 #endif
98798@@ -1947,6 +2219,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
98799 struct mm_struct *mm = current->mm;
98800 unsigned long addr = addr0;
98801 struct vm_unmapped_area_info info;
98802+ unsigned long offset = gr_rand_threadstack_offset(mm, filp, flags);
98803
98804 /* requested length too big for entire address space */
98805 if (len > TASK_SIZE - mmap_min_addr)
98806@@ -1955,12 +2228,16 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
98807 if (flags & MAP_FIXED)
98808 return addr;
98809
98810+#ifdef CONFIG_PAX_RANDMMAP
98811+ if (!(mm->pax_flags & MF_PAX_RANDMMAP))
98812+#endif
98813+
98814 /* requesting a specific address */
98815 if (addr) {
98816 addr = PAGE_ALIGN(addr);
98817 vma = find_vma(mm, addr);
98818 if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&
98819- (!vma || addr + len <= vma->vm_start))
98820+ check_heap_stack_gap(vma, addr, len, offset))
98821 return addr;
98822 }
98823
98824@@ -1969,6 +2246,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
98825 info.low_limit = max(PAGE_SIZE, mmap_min_addr);
98826 info.high_limit = mm->mmap_base;
98827 info.align_mask = 0;
98828+ info.threadstack_offset = offset;
98829 addr = vm_unmapped_area(&info);
98830
98831 /*
98832@@ -1981,6 +2259,12 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
98833 VM_BUG_ON(addr != -ENOMEM);
98834 info.flags = 0;
98835 info.low_limit = TASK_UNMAPPED_BASE;
98836+
98837+#ifdef CONFIG_PAX_RANDMMAP
98838+ if (mm->pax_flags & MF_PAX_RANDMMAP)
98839+ info.low_limit += mm->delta_mmap;
98840+#endif
98841+
98842 info.high_limit = TASK_SIZE;
98843 addr = vm_unmapped_area(&info);
98844 }
98845@@ -2081,6 +2365,28 @@ find_vma_prev(struct mm_struct *mm, unsigned long addr,
98846 return vma;
98847 }
98848
98849+#ifdef CONFIG_PAX_SEGMEXEC
98850+struct vm_area_struct *pax_find_mirror_vma(struct vm_area_struct *vma)
98851+{
98852+ struct vm_area_struct *vma_m;
98853+
98854+ BUG_ON(!vma || vma->vm_start >= vma->vm_end);
98855+ if (!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC)) {
98856+ BUG_ON(vma->vm_mirror);
98857+ return NULL;
98858+ }
98859+ BUG_ON(vma->vm_start < SEGMEXEC_TASK_SIZE && SEGMEXEC_TASK_SIZE < vma->vm_end);
98860+ vma_m = vma->vm_mirror;
98861+ BUG_ON(!vma_m || vma_m->vm_mirror != vma);
98862+ BUG_ON(vma->vm_file != vma_m->vm_file);
98863+ BUG_ON(vma->vm_end - vma->vm_start != vma_m->vm_end - vma_m->vm_start);
98864+ BUG_ON(vma->vm_pgoff != vma_m->vm_pgoff);
98865+ BUG_ON(vma->anon_vma != vma_m->anon_vma && vma->anon_vma->root != vma_m->anon_vma->root);
98866+ BUG_ON((vma->vm_flags ^ vma_m->vm_flags) & ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED));
98867+ return vma_m;
98868+}
98869+#endif
98870+
98871 /*
98872 * Verify that the stack growth is acceptable and
98873 * update accounting. This is shared with both the
98874@@ -2098,8 +2404,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
98875
98876 /* Stack limit test */
98877 actual_size = size;
98878- if (size && (vma->vm_flags & (VM_GROWSUP | VM_GROWSDOWN)))
98879- actual_size -= PAGE_SIZE;
98880+ gr_learn_resource(current, RLIMIT_STACK, actual_size, 1);
98881 if (actual_size > ACCESS_ONCE(rlim[RLIMIT_STACK].rlim_cur))
98882 return -ENOMEM;
98883
98884@@ -2110,6 +2415,7 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
98885 locked = mm->locked_vm + grow;
98886 limit = ACCESS_ONCE(rlim[RLIMIT_MEMLOCK].rlim_cur);
98887 limit >>= PAGE_SHIFT;
98888+ gr_learn_resource(current, RLIMIT_MEMLOCK, locked << PAGE_SHIFT, 1);
98889 if (locked > limit && !capable(CAP_IPC_LOCK))
98890 return -ENOMEM;
98891 }
98892@@ -2139,37 +2445,48 @@ static int acct_stack_growth(struct vm_area_struct *vma, unsigned long size, uns
98893 * PA-RISC uses this for its stack; IA64 for its Register Backing Store.
98894 * vma is the last one with address > vma->vm_end. Have to extend vma.
98895 */
98896+#ifndef CONFIG_IA64
98897+static
98898+#endif
98899 int expand_upwards(struct vm_area_struct *vma, unsigned long address)
98900 {
98901 int error;
98902+ bool locknext;
98903
98904 if (!(vma->vm_flags & VM_GROWSUP))
98905 return -EFAULT;
98906
98907+ /* Also guard against wrapping around to address 0. */
98908+ if (address < PAGE_ALIGN(address+1))
98909+ address = PAGE_ALIGN(address+1);
98910+ else
98911+ return -ENOMEM;
98912+
98913 /*
98914 * We must make sure the anon_vma is allocated
98915 * so that the anon_vma locking is not a noop.
98916 */
98917 if (unlikely(anon_vma_prepare(vma)))
98918 return -ENOMEM;
98919+ locknext = vma->vm_next && (vma->vm_next->vm_flags & VM_GROWSDOWN);
98920+ if (locknext && anon_vma_prepare(vma->vm_next))
98921+ return -ENOMEM;
98922 vma_lock_anon_vma(vma);
98923+ if (locknext)
98924+ vma_lock_anon_vma(vma->vm_next);
98925
98926 /*
98927 * vma->vm_start/vm_end cannot change under us because the caller
98928 * is required to hold the mmap_sem in read mode. We need the
98929- * anon_vma lock to serialize against concurrent expand_stacks.
98930- * Also guard against wrapping around to address 0.
98931+ * anon_vma locks to serialize against concurrent expand_stacks
98932+ * and expand_upwards.
98933 */
98934- if (address < PAGE_ALIGN(address+4))
98935- address = PAGE_ALIGN(address+4);
98936- else {
98937- vma_unlock_anon_vma(vma);
98938- return -ENOMEM;
98939- }
98940 error = 0;
98941
98942 /* Somebody else might have raced and expanded it already */
98943- if (address > vma->vm_end) {
98944+ 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)
98945+ error = -ENOMEM;
98946+ else if (address > vma->vm_end && (!locknext || vma->vm_next->vm_start >= address)) {
98947 unsigned long size, grow;
98948
98949 size = address - vma->vm_start;
98950@@ -2204,6 +2521,8 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
98951 }
98952 }
98953 }
98954+ if (locknext)
98955+ vma_unlock_anon_vma(vma->vm_next);
98956 vma_unlock_anon_vma(vma);
98957 khugepaged_enter_vma_merge(vma, vma->vm_flags);
98958 validate_mm(vma->vm_mm);
98959@@ -2218,6 +2537,8 @@ int expand_downwards(struct vm_area_struct *vma,
98960 unsigned long address)
98961 {
98962 int error;
98963+ bool lockprev = false;
98964+ struct vm_area_struct *prev;
98965
98966 /*
98967 * We must make sure the anon_vma is allocated
98968@@ -2231,6 +2552,15 @@ int expand_downwards(struct vm_area_struct *vma,
98969 if (error)
98970 return error;
98971
98972+ prev = vma->vm_prev;
98973+#if defined(CONFIG_STACK_GROWSUP) || defined(CONFIG_IA64)
98974+ lockprev = prev && (prev->vm_flags & VM_GROWSUP);
98975+#endif
98976+ if (lockprev && anon_vma_prepare(prev))
98977+ return -ENOMEM;
98978+ if (lockprev)
98979+ vma_lock_anon_vma(prev);
98980+
98981 vma_lock_anon_vma(vma);
98982
98983 /*
98984@@ -2240,9 +2570,17 @@ int expand_downwards(struct vm_area_struct *vma,
98985 */
98986
98987 /* Somebody else might have raced and expanded it already */
98988- if (address < vma->vm_start) {
98989+ if (prev && (prev->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)) && address - prev->vm_end < sysctl_heap_stack_gap)
98990+ error = -ENOMEM;
98991+ else if (address < vma->vm_start && (!lockprev || prev->vm_end <= address)) {
98992 unsigned long size, grow;
98993
98994+#ifdef CONFIG_PAX_SEGMEXEC
98995+ struct vm_area_struct *vma_m;
98996+
98997+ vma_m = pax_find_mirror_vma(vma);
98998+#endif
98999+
99000 size = vma->vm_end - address;
99001 grow = (vma->vm_start - address) >> PAGE_SHIFT;
99002
99003@@ -2267,13 +2605,27 @@ int expand_downwards(struct vm_area_struct *vma,
99004 vma->vm_pgoff -= grow;
99005 anon_vma_interval_tree_post_update_vma(vma);
99006 vma_gap_update(vma);
99007+
99008+#ifdef CONFIG_PAX_SEGMEXEC
99009+ if (vma_m) {
99010+ anon_vma_interval_tree_pre_update_vma(vma_m);
99011+ vma_m->vm_start -= grow << PAGE_SHIFT;
99012+ vma_m->vm_pgoff -= grow;
99013+ anon_vma_interval_tree_post_update_vma(vma_m);
99014+ vma_gap_update(vma_m);
99015+ }
99016+#endif
99017+
99018 spin_unlock(&vma->vm_mm->page_table_lock);
99019
99020+ track_exec_limit(vma->vm_mm, vma->vm_start, vma->vm_end, vma->vm_flags);
99021 perf_event_mmap(vma);
99022 }
99023 }
99024 }
99025 vma_unlock_anon_vma(vma);
99026+ if (lockprev)
99027+ vma_unlock_anon_vma(prev);
99028 khugepaged_enter_vma_merge(vma, vma->vm_flags);
99029 validate_mm(vma->vm_mm);
99030 return error;
99031@@ -2373,6 +2725,13 @@ static void remove_vma_list(struct mm_struct *mm, struct vm_area_struct *vma)
99032 do {
99033 long nrpages = vma_pages(vma);
99034
99035+#ifdef CONFIG_PAX_SEGMEXEC
99036+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_start >= SEGMEXEC_TASK_SIZE)) {
99037+ vma = remove_vma(vma);
99038+ continue;
99039+ }
99040+#endif
99041+
99042 if (vma->vm_flags & VM_ACCOUNT)
99043 nr_accounted += nrpages;
99044 vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages);
99045@@ -2417,6 +2776,16 @@ detach_vmas_to_be_unmapped(struct mm_struct *mm, struct vm_area_struct *vma,
99046 insertion_point = (prev ? &prev->vm_next : &mm->mmap);
99047 vma->vm_prev = NULL;
99048 do {
99049+
99050+#ifdef CONFIG_PAX_SEGMEXEC
99051+ if (vma->vm_mirror) {
99052+ BUG_ON(!vma->vm_mirror->vm_mirror || vma->vm_mirror->vm_mirror != vma);
99053+ vma->vm_mirror->vm_mirror = NULL;
99054+ vma->vm_mirror->vm_flags &= ~VM_EXEC;
99055+ vma->vm_mirror = NULL;
99056+ }
99057+#endif
99058+
99059 vma_rb_erase(vma, &mm->mm_rb);
99060 mm->map_count--;
99061 tail_vma = vma;
99062@@ -2444,14 +2813,33 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
99063 struct vm_area_struct *new;
99064 int err = -ENOMEM;
99065
99066+#ifdef CONFIG_PAX_SEGMEXEC
99067+ struct vm_area_struct *vma_m, *new_m = NULL;
99068+ unsigned long addr_m = addr + SEGMEXEC_TASK_SIZE;
99069+#endif
99070+
99071 if (is_vm_hugetlb_page(vma) && (addr &
99072 ~(huge_page_mask(hstate_vma(vma)))))
99073 return -EINVAL;
99074
99075+#ifdef CONFIG_PAX_SEGMEXEC
99076+ vma_m = pax_find_mirror_vma(vma);
99077+#endif
99078+
99079 new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
99080 if (!new)
99081 goto out_err;
99082
99083+#ifdef CONFIG_PAX_SEGMEXEC
99084+ if (vma_m) {
99085+ new_m = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
99086+ if (!new_m) {
99087+ kmem_cache_free(vm_area_cachep, new);
99088+ goto out_err;
99089+ }
99090+ }
99091+#endif
99092+
99093 /* most fields are the same, copy all, and then fixup */
99094 *new = *vma;
99095
99096@@ -2464,6 +2852,22 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
99097 new->vm_pgoff += ((addr - vma->vm_start) >> PAGE_SHIFT);
99098 }
99099
99100+#ifdef CONFIG_PAX_SEGMEXEC
99101+ if (vma_m) {
99102+ *new_m = *vma_m;
99103+ INIT_LIST_HEAD(&new_m->anon_vma_chain);
99104+ new_m->vm_mirror = new;
99105+ new->vm_mirror = new_m;
99106+
99107+ if (new_below)
99108+ new_m->vm_end = addr_m;
99109+ else {
99110+ new_m->vm_start = addr_m;
99111+ new_m->vm_pgoff += ((addr_m - vma_m->vm_start) >> PAGE_SHIFT);
99112+ }
99113+ }
99114+#endif
99115+
99116 err = vma_dup_policy(vma, new);
99117 if (err)
99118 goto out_free_vma;
99119@@ -2484,6 +2888,38 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
99120 else
99121 err = vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
99122
99123+#ifdef CONFIG_PAX_SEGMEXEC
99124+ if (!err && vma_m) {
99125+ struct mempolicy *pol = vma_policy(new);
99126+
99127+ if (anon_vma_clone(new_m, vma_m))
99128+ goto out_free_mpol;
99129+
99130+ mpol_get(pol);
99131+ set_vma_policy(new_m, pol);
99132+
99133+ if (new_m->vm_file)
99134+ get_file(new_m->vm_file);
99135+
99136+ if (new_m->vm_ops && new_m->vm_ops->open)
99137+ new_m->vm_ops->open(new_m);
99138+
99139+ if (new_below)
99140+ err = vma_adjust(vma_m, addr_m, vma_m->vm_end, vma_m->vm_pgoff +
99141+ ((addr_m - new_m->vm_start) >> PAGE_SHIFT), new_m);
99142+ else
99143+ err = vma_adjust(vma_m, vma_m->vm_start, addr_m, vma_m->vm_pgoff, new_m);
99144+
99145+ if (err) {
99146+ if (new_m->vm_ops && new_m->vm_ops->close)
99147+ new_m->vm_ops->close(new_m);
99148+ if (new_m->vm_file)
99149+ fput(new_m->vm_file);
99150+ mpol_put(pol);
99151+ }
99152+ }
99153+#endif
99154+
99155 /* Success. */
99156 if (!err)
99157 return 0;
99158@@ -2493,10 +2929,18 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
99159 new->vm_ops->close(new);
99160 if (new->vm_file)
99161 fput(new->vm_file);
99162- unlink_anon_vmas(new);
99163 out_free_mpol:
99164 mpol_put(vma_policy(new));
99165 out_free_vma:
99166+
99167+#ifdef CONFIG_PAX_SEGMEXEC
99168+ if (new_m) {
99169+ unlink_anon_vmas(new_m);
99170+ kmem_cache_free(vm_area_cachep, new_m);
99171+ }
99172+#endif
99173+
99174+ unlink_anon_vmas(new);
99175 kmem_cache_free(vm_area_cachep, new);
99176 out_err:
99177 return err;
99178@@ -2509,6 +2953,15 @@ static int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
99179 int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
99180 unsigned long addr, int new_below)
99181 {
99182+
99183+#ifdef CONFIG_PAX_SEGMEXEC
99184+ if (mm->pax_flags & MF_PAX_SEGMEXEC) {
99185+ BUG_ON(vma->vm_end > SEGMEXEC_TASK_SIZE);
99186+ if (mm->map_count >= sysctl_max_map_count-1)
99187+ return -ENOMEM;
99188+ } else
99189+#endif
99190+
99191 if (mm->map_count >= sysctl_max_map_count)
99192 return -ENOMEM;
99193
99194@@ -2520,11 +2973,30 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
99195 * work. This now handles partial unmappings.
99196 * Jeremy Fitzhardinge <jeremy@goop.org>
99197 */
99198+#ifdef CONFIG_PAX_SEGMEXEC
99199 int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
99200 {
99201+ int ret = __do_munmap(mm, start, len);
99202+ if (ret || !(mm->pax_flags & MF_PAX_SEGMEXEC))
99203+ return ret;
99204+
99205+ return __do_munmap(mm, start + SEGMEXEC_TASK_SIZE, len);
99206+}
99207+
99208+int __do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
99209+#else
99210+int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
99211+#endif
99212+{
99213 unsigned long end;
99214 struct vm_area_struct *vma, *prev, *last;
99215
99216+ /*
99217+ * mm->mmap_sem is required to protect against another thread
99218+ * changing the mappings in case we sleep.
99219+ */
99220+ verify_mm_writelocked(mm);
99221+
99222 if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start)
99223 return -EINVAL;
99224
99225@@ -2602,6 +3074,8 @@ int do_munmap(struct mm_struct *mm, unsigned long start, size_t len)
99226 /* Fix up all other VM information */
99227 remove_vma_list(mm, vma);
99228
99229+ track_exec_limit(mm, start, end, 0UL);
99230+
99231 return 0;
99232 }
99233
99234@@ -2610,6 +3084,13 @@ int vm_munmap(unsigned long start, size_t len)
99235 int ret;
99236 struct mm_struct *mm = current->mm;
99237
99238+
99239+#ifdef CONFIG_PAX_SEGMEXEC
99240+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) &&
99241+ (len > SEGMEXEC_TASK_SIZE || start > SEGMEXEC_TASK_SIZE-len))
99242+ return -EINVAL;
99243+#endif
99244+
99245 down_write(&mm->mmap_sem);
99246 ret = do_munmap(mm, start, len);
99247 up_write(&mm->mmap_sem);
99248@@ -2656,6 +3137,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
99249 down_write(&mm->mmap_sem);
99250 vma = find_vma(mm, start);
99251
99252+#ifdef CONFIG_PAX_SEGMEXEC
99253+ if (vma && (mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_MAYEXEC))
99254+ goto out;
99255+#endif
99256+
99257 if (!vma || !(vma->vm_flags & VM_SHARED))
99258 goto out;
99259
99260@@ -2692,16 +3178,6 @@ out:
99261 return ret;
99262 }
99263
99264-static inline void verify_mm_writelocked(struct mm_struct *mm)
99265-{
99266-#ifdef CONFIG_DEBUG_VM
99267- if (unlikely(down_read_trylock(&mm->mmap_sem))) {
99268- WARN_ON(1);
99269- up_read(&mm->mmap_sem);
99270- }
99271-#endif
99272-}
99273-
99274 /*
99275 * this is really a simplified "do_mmap". it only handles
99276 * anonymous maps. eventually we may be able to do some
99277@@ -2715,6 +3191,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
99278 struct rb_node **rb_link, *rb_parent;
99279 pgoff_t pgoff = addr >> PAGE_SHIFT;
99280 int error;
99281+ unsigned long charged;
99282
99283 len = PAGE_ALIGN(len);
99284 if (!len)
99285@@ -2722,10 +3199,24 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
99286
99287 flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags;
99288
99289+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)
99290+ if (mm->pax_flags & (MF_PAX_PAGEEXEC | MF_PAX_SEGMEXEC)) {
99291+ flags &= ~VM_EXEC;
99292+
99293+#ifdef CONFIG_PAX_MPROTECT
99294+ if (mm->pax_flags & MF_PAX_MPROTECT)
99295+ flags &= ~VM_MAYEXEC;
99296+#endif
99297+
99298+ }
99299+#endif
99300+
99301 error = get_unmapped_area(NULL, addr, len, 0, MAP_FIXED);
99302 if (error & ~PAGE_MASK)
99303 return error;
99304
99305+ charged = len >> PAGE_SHIFT;
99306+
99307 error = mlock_future_check(mm, mm->def_flags, len);
99308 if (error)
99309 return error;
99310@@ -2739,21 +3230,20 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
99311 /*
99312 * Clear old maps. this also does some error checking for us
99313 */
99314- munmap_back:
99315 if (find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent)) {
99316 if (do_munmap(mm, addr, len))
99317 return -ENOMEM;
99318- goto munmap_back;
99319+ BUG_ON(find_vma_links(mm, addr, addr + len, &prev, &rb_link, &rb_parent));
99320 }
99321
99322 /* Check against address space limits *after* clearing old maps... */
99323- if (!may_expand_vm(mm, len >> PAGE_SHIFT))
99324+ if (!may_expand_vm(mm, charged))
99325 return -ENOMEM;
99326
99327 if (mm->map_count > sysctl_max_map_count)
99328 return -ENOMEM;
99329
99330- if (security_vm_enough_memory_mm(mm, len >> PAGE_SHIFT))
99331+ if (security_vm_enough_memory_mm(mm, charged))
99332 return -ENOMEM;
99333
99334 /* Can we just expand an old private anonymous mapping? */
99335@@ -2767,7 +3257,7 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
99336 */
99337 vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
99338 if (!vma) {
99339- vm_unacct_memory(len >> PAGE_SHIFT);
99340+ vm_unacct_memory(charged);
99341 return -ENOMEM;
99342 }
99343
99344@@ -2781,10 +3271,11 @@ static unsigned long do_brk(unsigned long addr, unsigned long len)
99345 vma_link(mm, vma, prev, rb_link, rb_parent);
99346 out:
99347 perf_event_mmap(vma);
99348- mm->total_vm += len >> PAGE_SHIFT;
99349+ mm->total_vm += charged;
99350 if (flags & VM_LOCKED)
99351- mm->locked_vm += (len >> PAGE_SHIFT);
99352+ mm->locked_vm += charged;
99353 vma->vm_flags |= VM_SOFTDIRTY;
99354+ track_exec_limit(mm, addr, addr + len, flags);
99355 return addr;
99356 }
99357
99358@@ -2846,6 +3337,7 @@ void exit_mmap(struct mm_struct *mm)
99359 while (vma) {
99360 if (vma->vm_flags & VM_ACCOUNT)
99361 nr_accounted += vma_pages(vma);
99362+ vma->vm_mirror = NULL;
99363 vma = remove_vma(vma);
99364 }
99365 vm_unacct_memory(nr_accounted);
99366@@ -2860,6 +3352,13 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
99367 struct vm_area_struct *prev;
99368 struct rb_node **rb_link, *rb_parent;
99369
99370+#ifdef CONFIG_PAX_SEGMEXEC
99371+ struct vm_area_struct *vma_m = NULL;
99372+#endif
99373+
99374+ if (security_mmap_addr(vma->vm_start))
99375+ return -EPERM;
99376+
99377 /*
99378 * The vm_pgoff of a purely anonymous vma should be irrelevant
99379 * until its first write fault, when page's anon_vma and index
99380@@ -2883,7 +3382,21 @@ int insert_vm_struct(struct mm_struct *mm, struct vm_area_struct *vma)
99381 security_vm_enough_memory_mm(mm, vma_pages(vma)))
99382 return -ENOMEM;
99383
99384+#ifdef CONFIG_PAX_SEGMEXEC
99385+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (vma->vm_flags & VM_EXEC)) {
99386+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
99387+ if (!vma_m)
99388+ return -ENOMEM;
99389+ }
99390+#endif
99391+
99392 vma_link(mm, vma, prev, rb_link, rb_parent);
99393+
99394+#ifdef CONFIG_PAX_SEGMEXEC
99395+ if (vma_m)
99396+ BUG_ON(pax_mirror_vma(vma_m, vma));
99397+#endif
99398+
99399 return 0;
99400 }
99401
99402@@ -2902,6 +3415,8 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
99403 struct rb_node **rb_link, *rb_parent;
99404 bool faulted_in_anon_vma = true;
99405
99406+ BUG_ON(vma->vm_mirror);
99407+
99408 /*
99409 * If anonymous vma has not yet been faulted, update new pgoff
99410 * to match new location, to increase its chance of merging.
99411@@ -2966,6 +3481,39 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
99412 return NULL;
99413 }
99414
99415+#ifdef CONFIG_PAX_SEGMEXEC
99416+long pax_mirror_vma(struct vm_area_struct *vma_m, struct vm_area_struct *vma)
99417+{
99418+ struct vm_area_struct *prev_m;
99419+ struct rb_node **rb_link_m, *rb_parent_m;
99420+ struct mempolicy *pol_m;
99421+
99422+ BUG_ON(!(vma->vm_mm->pax_flags & MF_PAX_SEGMEXEC) || !(vma->vm_flags & VM_EXEC));
99423+ BUG_ON(vma->vm_mirror || vma_m->vm_mirror);
99424+ BUG_ON(!mpol_equal(vma_policy(vma), vma_policy(vma_m)));
99425+ *vma_m = *vma;
99426+ INIT_LIST_HEAD(&vma_m->anon_vma_chain);
99427+ if (anon_vma_clone(vma_m, vma))
99428+ return -ENOMEM;
99429+ pol_m = vma_policy(vma_m);
99430+ mpol_get(pol_m);
99431+ set_vma_policy(vma_m, pol_m);
99432+ vma_m->vm_start += SEGMEXEC_TASK_SIZE;
99433+ vma_m->vm_end += SEGMEXEC_TASK_SIZE;
99434+ vma_m->vm_flags &= ~(VM_WRITE | VM_MAYWRITE | VM_ACCOUNT | VM_LOCKED);
99435+ vma_m->vm_page_prot = vm_get_page_prot(vma_m->vm_flags);
99436+ if (vma_m->vm_file)
99437+ get_file(vma_m->vm_file);
99438+ if (vma_m->vm_ops && vma_m->vm_ops->open)
99439+ vma_m->vm_ops->open(vma_m);
99440+ BUG_ON(find_vma_links(vma->vm_mm, vma_m->vm_start, vma_m->vm_end, &prev_m, &rb_link_m, &rb_parent_m));
99441+ vma_link(vma->vm_mm, vma_m, prev_m, rb_link_m, rb_parent_m);
99442+ vma_m->vm_mirror = vma;
99443+ vma->vm_mirror = vma_m;
99444+ return 0;
99445+}
99446+#endif
99447+
99448 /*
99449 * Return true if the calling process may expand its vm space by the passed
99450 * number of pages
99451@@ -2977,6 +3525,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long npages)
99452
99453 lim = rlimit(RLIMIT_AS) >> PAGE_SHIFT;
99454
99455+ gr_learn_resource(current, RLIMIT_AS, (cur + npages) << PAGE_SHIFT, 1);
99456 if (cur + npages > lim)
99457 return 0;
99458 return 1;
99459@@ -3059,6 +3608,22 @@ static struct vm_area_struct *__install_special_mapping(
99460 vma->vm_start = addr;
99461 vma->vm_end = addr + len;
99462
99463+#ifdef CONFIG_PAX_MPROTECT
99464+ if (mm->pax_flags & MF_PAX_MPROTECT) {
99465+#ifndef CONFIG_PAX_MPROTECT_COMPAT
99466+ if ((vm_flags & (VM_WRITE | VM_EXEC)) == (VM_WRITE | VM_EXEC))
99467+ return ERR_PTR(-EPERM);
99468+ if (!(vm_flags & VM_EXEC))
99469+ vm_flags &= ~VM_MAYEXEC;
99470+#else
99471+ if ((vm_flags & (VM_WRITE | VM_EXEC)) != VM_EXEC)
99472+ vm_flags &= ~(VM_EXEC | VM_MAYEXEC);
99473+#endif
99474+ else
99475+ vm_flags &= ~VM_MAYWRITE;
99476+ }
99477+#endif
99478+
99479 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY;
99480 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
99481
99482diff --git a/mm/mprotect.c b/mm/mprotect.c
99483index 8858483..8145fa5 100644
99484--- a/mm/mprotect.c
99485+++ b/mm/mprotect.c
99486@@ -24,10 +24,18 @@
99487 #include <linux/migrate.h>
99488 #include <linux/perf_event.h>
99489 #include <linux/ksm.h>
99490+#include <linux/sched/sysctl.h>
99491+
99492+#ifdef CONFIG_PAX_MPROTECT
99493+#include <linux/elf.h>
99494+#include <linux/binfmts.h>
99495+#endif
99496+
99497 #include <asm/uaccess.h>
99498 #include <asm/pgtable.h>
99499 #include <asm/cacheflush.h>
99500 #include <asm/tlbflush.h>
99501+#include <asm/mmu_context.h>
99502
99503 /*
99504 * For a prot_numa update we only hold mmap_sem for read so there is a
99505@@ -252,6 +260,48 @@ unsigned long change_protection(struct vm_area_struct *vma, unsigned long start,
99506 return pages;
99507 }
99508
99509+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
99510+/* called while holding the mmap semaphor for writing except stack expansion */
99511+void track_exec_limit(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned long prot)
99512+{
99513+ unsigned long oldlimit, newlimit = 0UL;
99514+
99515+ if (!(mm->pax_flags & MF_PAX_PAGEEXEC) || (__supported_pte_mask & _PAGE_NX))
99516+ return;
99517+
99518+ spin_lock(&mm->page_table_lock);
99519+ oldlimit = mm->context.user_cs_limit;
99520+ if ((prot & VM_EXEC) && oldlimit < end)
99521+ /* USER_CS limit moved up */
99522+ newlimit = end;
99523+ else if (!(prot & VM_EXEC) && start < oldlimit && oldlimit <= end)
99524+ /* USER_CS limit moved down */
99525+ newlimit = start;
99526+
99527+ if (newlimit) {
99528+ mm->context.user_cs_limit = newlimit;
99529+
99530+#ifdef CONFIG_SMP
99531+ wmb();
99532+ cpus_clear(mm->context.cpu_user_cs_mask);
99533+ cpu_set(smp_processor_id(), mm->context.cpu_user_cs_mask);
99534+#endif
99535+
99536+ set_user_cs(mm->context.user_cs_base, mm->context.user_cs_limit, smp_processor_id());
99537+ }
99538+ spin_unlock(&mm->page_table_lock);
99539+ if (newlimit == end) {
99540+ struct vm_area_struct *vma = find_vma(mm, oldlimit);
99541+
99542+ for (; vma && vma->vm_start < end; vma = vma->vm_next)
99543+ if (is_vm_hugetlb_page(vma))
99544+ hugetlb_change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot);
99545+ else
99546+ change_protection(vma, vma->vm_start, vma->vm_end, vma->vm_page_prot, vma_wants_writenotify(vma), 0);
99547+ }
99548+}
99549+#endif
99550+
99551 int
99552 mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
99553 unsigned long start, unsigned long end, unsigned long newflags)
99554@@ -264,11 +314,29 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
99555 int error;
99556 int dirty_accountable = 0;
99557
99558+#ifdef CONFIG_PAX_SEGMEXEC
99559+ struct vm_area_struct *vma_m = NULL;
99560+ unsigned long start_m, end_m;
99561+
99562+ start_m = start + SEGMEXEC_TASK_SIZE;
99563+ end_m = end + SEGMEXEC_TASK_SIZE;
99564+#endif
99565+
99566 if (newflags == oldflags) {
99567 *pprev = vma;
99568 return 0;
99569 }
99570
99571+ if (newflags & (VM_READ | VM_WRITE | VM_EXEC)) {
99572+ struct vm_area_struct *prev = vma->vm_prev, *next = vma->vm_next;
99573+
99574+ if (next && (next->vm_flags & VM_GROWSDOWN) && sysctl_heap_stack_gap > next->vm_start - end)
99575+ return -ENOMEM;
99576+
99577+ if (prev && (prev->vm_flags & VM_GROWSUP) && sysctl_heap_stack_gap > start - prev->vm_end)
99578+ return -ENOMEM;
99579+ }
99580+
99581 /*
99582 * If we make a private mapping writable we increase our commit;
99583 * but (without finer accounting) cannot reduce our commit if we
99584@@ -285,6 +353,42 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
99585 }
99586 }
99587
99588+#ifdef CONFIG_PAX_SEGMEXEC
99589+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && ((oldflags ^ newflags) & VM_EXEC)) {
99590+ if (start != vma->vm_start) {
99591+ error = split_vma(mm, vma, start, 1);
99592+ if (error)
99593+ goto fail;
99594+ BUG_ON(!*pprev || (*pprev)->vm_next == vma);
99595+ *pprev = (*pprev)->vm_next;
99596+ }
99597+
99598+ if (end != vma->vm_end) {
99599+ error = split_vma(mm, vma, end, 0);
99600+ if (error)
99601+ goto fail;
99602+ }
99603+
99604+ if (pax_find_mirror_vma(vma)) {
99605+ error = __do_munmap(mm, start_m, end_m - start_m);
99606+ if (error)
99607+ goto fail;
99608+ } else {
99609+ vma_m = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);
99610+ if (!vma_m) {
99611+ error = -ENOMEM;
99612+ goto fail;
99613+ }
99614+ vma->vm_flags = newflags;
99615+ error = pax_mirror_vma(vma_m, vma);
99616+ if (error) {
99617+ vma->vm_flags = oldflags;
99618+ goto fail;
99619+ }
99620+ }
99621+ }
99622+#endif
99623+
99624 /*
99625 * First try to merge with previous and/or next vma.
99626 */
99627@@ -315,7 +419,19 @@ success:
99628 * vm_flags and vm_page_prot are protected by the mmap_sem
99629 * held in write mode.
99630 */
99631+
99632+#ifdef CONFIG_PAX_SEGMEXEC
99633+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && (newflags & VM_EXEC) && ((vma->vm_flags ^ newflags) & VM_READ))
99634+ pax_find_mirror_vma(vma)->vm_flags ^= VM_READ;
99635+#endif
99636+
99637 vma->vm_flags = newflags;
99638+
99639+#ifdef CONFIG_PAX_MPROTECT
99640+ if (mm->binfmt && mm->binfmt->handle_mprotect)
99641+ mm->binfmt->handle_mprotect(vma, newflags);
99642+#endif
99643+
99644 dirty_accountable = vma_wants_writenotify(vma);
99645 vma_set_page_prot(vma);
99646
99647@@ -351,6 +467,17 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
99648 end = start + len;
99649 if (end <= start)
99650 return -ENOMEM;
99651+
99652+#ifdef CONFIG_PAX_SEGMEXEC
99653+ if (current->mm->pax_flags & MF_PAX_SEGMEXEC) {
99654+ if (end > SEGMEXEC_TASK_SIZE)
99655+ return -EINVAL;
99656+ } else
99657+#endif
99658+
99659+ if (end > TASK_SIZE)
99660+ return -EINVAL;
99661+
99662 if (!arch_validate_prot(prot))
99663 return -EINVAL;
99664
99665@@ -358,7 +485,7 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
99666 /*
99667 * Does the application expect PROT_READ to imply PROT_EXEC:
99668 */
99669- if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC))
99670+ if ((prot & (PROT_READ | PROT_WRITE)) && (current->personality & READ_IMPLIES_EXEC))
99671 prot |= PROT_EXEC;
99672
99673 vm_flags = calc_vm_prot_bits(prot);
99674@@ -390,6 +517,11 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
99675 if (start > vma->vm_start)
99676 prev = vma;
99677
99678+#ifdef CONFIG_PAX_MPROTECT
99679+ if (current->mm->binfmt && current->mm->binfmt->handle_mprotect)
99680+ current->mm->binfmt->handle_mprotect(vma, vm_flags);
99681+#endif
99682+
99683 for (nstart = start ; ; ) {
99684 unsigned long newflags;
99685
99686@@ -400,6 +532,14 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
99687
99688 /* newflags >> 4 shift VM_MAY% in place of VM_% */
99689 if ((newflags & ~(newflags >> 4)) & (VM_READ | VM_WRITE | VM_EXEC)) {
99690+ if (prot & (PROT_WRITE | PROT_EXEC))
99691+ gr_log_rwxmprotect(vma);
99692+
99693+ error = -EACCES;
99694+ goto out;
99695+ }
99696+
99697+ if (!gr_acl_handle_mprotect(vma->vm_file, prot)) {
99698 error = -EACCES;
99699 goto out;
99700 }
99701@@ -414,6 +554,9 @@ SYSCALL_DEFINE3(mprotect, unsigned long, start, size_t, len,
99702 error = mprotect_fixup(vma, &prev, nstart, tmp, newflags);
99703 if (error)
99704 goto out;
99705+
99706+ track_exec_limit(current->mm, nstart, tmp, vm_flags);
99707+
99708 nstart = tmp;
99709
99710 if (nstart < prev->vm_end)
99711diff --git a/mm/mremap.c b/mm/mremap.c
99712index 2dc44b1..caa1819 100644
99713--- a/mm/mremap.c
99714+++ b/mm/mremap.c
99715@@ -142,6 +142,12 @@ static void move_ptes(struct vm_area_struct *vma, pmd_t *old_pmd,
99716 continue;
99717 pte = ptep_get_and_clear(mm, old_addr, old_pte);
99718 pte = move_pte(pte, new_vma->vm_page_prot, old_addr, new_addr);
99719+
99720+#ifdef CONFIG_ARCH_TRACK_EXEC_LIMIT
99721+ if (!(__supported_pte_mask & _PAGE_NX) && pte_present(pte) && (new_vma->vm_flags & (VM_PAGEEXEC | VM_EXEC)) == VM_PAGEEXEC)
99722+ pte = pte_exprotect(pte);
99723+#endif
99724+
99725 pte = move_soft_dirty_pte(pte);
99726 set_pte_at(mm, new_addr, new_pte, pte);
99727 }
99728@@ -350,6 +356,11 @@ static struct vm_area_struct *vma_to_resize(unsigned long addr,
99729 if (is_vm_hugetlb_page(vma))
99730 goto Einval;
99731
99732+#ifdef CONFIG_PAX_SEGMEXEC
99733+ if (pax_find_mirror_vma(vma))
99734+ goto Einval;
99735+#endif
99736+
99737 /* We can't remap across vm area boundaries */
99738 if (old_len > vma->vm_end - addr)
99739 goto Efault;
99740@@ -405,20 +416,25 @@ static unsigned long mremap_to(unsigned long addr, unsigned long old_len,
99741 unsigned long ret = -EINVAL;
99742 unsigned long charged = 0;
99743 unsigned long map_flags;
99744+ unsigned long pax_task_size = TASK_SIZE;
99745
99746 if (new_addr & ~PAGE_MASK)
99747 goto out;
99748
99749- if (new_len > TASK_SIZE || new_addr > TASK_SIZE - new_len)
99750+#ifdef CONFIG_PAX_SEGMEXEC
99751+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
99752+ pax_task_size = SEGMEXEC_TASK_SIZE;
99753+#endif
99754+
99755+ pax_task_size -= PAGE_SIZE;
99756+
99757+ if (new_len > TASK_SIZE || new_addr > pax_task_size - new_len)
99758 goto out;
99759
99760 /* Check if the location we're moving into overlaps the
99761 * old location at all, and fail if it does.
99762 */
99763- if ((new_addr <= addr) && (new_addr+new_len) > addr)
99764- goto out;
99765-
99766- if ((addr <= new_addr) && (addr+old_len) > new_addr)
99767+ if (addr + old_len > new_addr && new_addr + new_len > addr)
99768 goto out;
99769
99770 ret = do_munmap(mm, new_addr, new_len);
99771@@ -487,6 +503,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
99772 unsigned long ret = -EINVAL;
99773 unsigned long charged = 0;
99774 bool locked = false;
99775+ unsigned long pax_task_size = TASK_SIZE;
99776
99777 if (flags & ~(MREMAP_FIXED | MREMAP_MAYMOVE))
99778 return ret;
99779@@ -508,6 +525,17 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
99780 if (!new_len)
99781 return ret;
99782
99783+#ifdef CONFIG_PAX_SEGMEXEC
99784+ if (mm->pax_flags & MF_PAX_SEGMEXEC)
99785+ pax_task_size = SEGMEXEC_TASK_SIZE;
99786+#endif
99787+
99788+ pax_task_size -= PAGE_SIZE;
99789+
99790+ if (new_len > pax_task_size || addr > pax_task_size-new_len ||
99791+ old_len > pax_task_size || addr > pax_task_size-old_len)
99792+ return ret;
99793+
99794 down_write(&current->mm->mmap_sem);
99795
99796 if (flags & MREMAP_FIXED) {
99797@@ -558,6 +586,7 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
99798 new_addr = addr;
99799 }
99800 ret = addr;
99801+ track_exec_limit(vma->vm_mm, vma->vm_start, addr + new_len, vma->vm_flags);
99802 goto out;
99803 }
99804 }
99805@@ -581,7 +610,12 @@ SYSCALL_DEFINE5(mremap, unsigned long, addr, unsigned long, old_len,
99806 goto out;
99807 }
99808
99809+ map_flags = vma->vm_flags;
99810 ret = move_vma(vma, addr, old_len, new_len, new_addr, &locked);
99811+ if (!(ret & ~PAGE_MASK)) {
99812+ track_exec_limit(current->mm, addr, addr + old_len, 0UL);
99813+ track_exec_limit(current->mm, new_addr, new_addr + new_len, map_flags);
99814+ }
99815 }
99816 out:
99817 if (ret & ~PAGE_MASK)
99818diff --git a/mm/nommu.c b/mm/nommu.c
99819index 3fba2dc..fdad748 100644
99820--- a/mm/nommu.c
99821+++ b/mm/nommu.c
99822@@ -72,7 +72,6 @@ int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
99823 int sysctl_nr_trim_pages = CONFIG_NOMMU_INITIAL_TRIM_EXCESS;
99824 unsigned long sysctl_user_reserve_kbytes __read_mostly = 1UL << 17; /* 128MB */
99825 unsigned long sysctl_admin_reserve_kbytes __read_mostly = 1UL << 13; /* 8MB */
99826-int heap_stack_gap = 0;
99827
99828 atomic_long_t mmap_pages_allocated;
99829
99830@@ -892,15 +891,6 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)
99831 EXPORT_SYMBOL(find_vma);
99832
99833 /*
99834- * find a VMA
99835- * - we don't extend stack VMAs under NOMMU conditions
99836- */
99837-struct vm_area_struct *find_extend_vma(struct mm_struct *mm, unsigned long addr)
99838-{
99839- return find_vma(mm, addr);
99840-}
99841-
99842-/*
99843 * expand a stack to a given address
99844 * - not supported under NOMMU conditions
99845 */
99846@@ -1585,6 +1575,7 @@ int split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
99847
99848 /* most fields are the same, copy all, and then fixup */
99849 *new = *vma;
99850+ INIT_LIST_HEAD(&new->anon_vma_chain);
99851 *region = *vma->vm_region;
99852 new->vm_region = region;
99853
99854@@ -2007,8 +1998,8 @@ void filemap_map_pages(struct vm_area_struct *vma, struct vm_fault *vmf)
99855 }
99856 EXPORT_SYMBOL(filemap_map_pages);
99857
99858-static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
99859- unsigned long addr, void *buf, int len, int write)
99860+static ssize_t __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
99861+ unsigned long addr, void *buf, size_t len, int write)
99862 {
99863 struct vm_area_struct *vma;
99864
99865@@ -2049,8 +2040,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
99866 *
99867 * The caller must hold a reference on @mm.
99868 */
99869-int access_remote_vm(struct mm_struct *mm, unsigned long addr,
99870- void *buf, int len, int write)
99871+ssize_t access_remote_vm(struct mm_struct *mm, unsigned long addr,
99872+ void *buf, size_t len, int write)
99873 {
99874 return __access_remote_vm(NULL, mm, addr, buf, len, write);
99875 }
99876@@ -2059,7 +2050,7 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr,
99877 * Access another process' address space.
99878 * - source/target buffer must be kernel space
99879 */
99880-int access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
99881+ssize_t access_process_vm(struct task_struct *tsk, unsigned long addr, void *buf, size_t len, int write)
99882 {
99883 struct mm_struct *mm;
99884
99885diff --git a/mm/page-writeback.c b/mm/page-writeback.c
99886index 644bcb6..444a2c4 100644
99887--- a/mm/page-writeback.c
99888+++ b/mm/page-writeback.c
99889@@ -664,7 +664,7 @@ static long long pos_ratio_polynom(unsigned long setpoint,
99890 * card's bdi_dirty may rush to many times higher than bdi_setpoint.
99891 * - the bdi dirty thresh drops quickly due to change of JBOD workload
99892 */
99893-static unsigned long bdi_position_ratio(struct backing_dev_info *bdi,
99894+static unsigned long __intentional_overflow(-1) bdi_position_ratio(struct backing_dev_info *bdi,
99895 unsigned long thresh,
99896 unsigned long bg_thresh,
99897 unsigned long dirty,
99898diff --git a/mm/page_alloc.c b/mm/page_alloc.c
99899index 40e2942..0eb29a2 100644
99900--- a/mm/page_alloc.c
99901+++ b/mm/page_alloc.c
99902@@ -61,6 +61,7 @@
99903 #include <linux/hugetlb.h>
99904 #include <linux/sched/rt.h>
99905 #include <linux/page_owner.h>
99906+#include <linux/random.h>
99907
99908 #include <asm/sections.h>
99909 #include <asm/tlbflush.h>
99910@@ -357,7 +358,7 @@ out:
99911 * This usage means that zero-order pages may not be compound.
99912 */
99913
99914-static void free_compound_page(struct page *page)
99915+void free_compound_page(struct page *page)
99916 {
99917 __free_pages_ok(page, compound_order(page));
99918 }
99919@@ -480,7 +481,7 @@ static inline void clear_page_guard(struct zone *zone, struct page *page,
99920 __mod_zone_freepage_state(zone, (1 << order), migratetype);
99921 }
99922 #else
99923-struct page_ext_operations debug_guardpage_ops = { NULL, };
99924+struct page_ext_operations debug_guardpage_ops = { .need = NULL, .init = NULL };
99925 static inline void set_page_guard(struct zone *zone, struct page *page,
99926 unsigned int order, int migratetype) {}
99927 static inline void clear_page_guard(struct zone *zone, struct page *page,
99928@@ -783,6 +784,10 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
99929 bool compound = PageCompound(page);
99930 int i, bad = 0;
99931
99932+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99933+ unsigned long index = 1UL << order;
99934+#endif
99935+
99936 VM_BUG_ON_PAGE(PageTail(page), page);
99937 VM_BUG_ON_PAGE(compound && compound_order(page) != order, page);
99938
99939@@ -809,6 +814,12 @@ static bool free_pages_prepare(struct page *page, unsigned int order)
99940 debug_check_no_obj_freed(page_address(page),
99941 PAGE_SIZE << order);
99942 }
99943+
99944+#ifdef CONFIG_PAX_MEMORY_SANITIZE
99945+ for (; index; --index)
99946+ sanitize_highpage(page + index - 1);
99947+#endif
99948+
99949 arch_free_page(page, order);
99950 kernel_map_pages(page, 1 << order, 0);
99951
99952@@ -832,6 +843,20 @@ static void __free_pages_ok(struct page *page, unsigned int order)
99953 local_irq_restore(flags);
99954 }
99955
99956+#ifdef CONFIG_PAX_LATENT_ENTROPY
99957+bool __meminitdata extra_latent_entropy;
99958+
99959+static int __init setup_pax_extra_latent_entropy(char *str)
99960+{
99961+ extra_latent_entropy = true;
99962+ return 0;
99963+}
99964+early_param("pax_extra_latent_entropy", setup_pax_extra_latent_entropy);
99965+
99966+volatile u64 latent_entropy __latent_entropy;
99967+EXPORT_SYMBOL(latent_entropy);
99968+#endif
99969+
99970 void __init __free_pages_bootmem(struct page *page, unsigned int order)
99971 {
99972 unsigned int nr_pages = 1 << order;
99973@@ -847,6 +872,19 @@ void __init __free_pages_bootmem(struct page *page, unsigned int order)
99974 __ClearPageReserved(p);
99975 set_page_count(p, 0);
99976
99977+#ifdef CONFIG_PAX_LATENT_ENTROPY
99978+ if (extra_latent_entropy && !PageHighMem(page) && page_to_pfn(page) < 0x100000) {
99979+ u64 hash = 0;
99980+ size_t index, end = PAGE_SIZE * nr_pages / sizeof hash;
99981+ const u64 *data = lowmem_page_address(page);
99982+
99983+ for (index = 0; index < end; index++)
99984+ hash ^= hash + data[index];
99985+ latent_entropy ^= hash;
99986+ add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy));
99987+ }
99988+#endif
99989+
99990 page_zone(page)->managed_pages += nr_pages;
99991 set_page_refcounted(page);
99992 __free_pages(page, order);
99993@@ -974,8 +1012,10 @@ static int prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags,
99994 kernel_map_pages(page, 1 << order, 1);
99995 kasan_alloc_pages(page, order);
99996
99997+#ifndef CONFIG_PAX_MEMORY_SANITIZE
99998 if (gfp_flags & __GFP_ZERO)
99999 prep_zero_page(page, order, gfp_flags);
100000+#endif
100001
100002 if (order && (gfp_flags & __GFP_COMP))
100003 prep_compound_page(page, order);
100004@@ -1699,7 +1739,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
100005 }
100006
100007 __mod_zone_page_state(zone, NR_ALLOC_BATCH, -(1 << order));
100008- if (atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
100009+ if (atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]) <= 0 &&
100010 !test_bit(ZONE_FAIR_DEPLETED, &zone->flags))
100011 set_bit(ZONE_FAIR_DEPLETED, &zone->flags);
100012
100013@@ -2018,7 +2058,7 @@ static void reset_alloc_batches(struct zone *preferred_zone)
100014 do {
100015 mod_zone_page_state(zone, NR_ALLOC_BATCH,
100016 high_wmark_pages(zone) - low_wmark_pages(zone) -
100017- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
100018+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
100019 clear_bit(ZONE_FAIR_DEPLETED, &zone->flags);
100020 } while (zone++ != preferred_zone);
100021 }
100022@@ -5738,7 +5778,7 @@ static void __setup_per_zone_wmarks(void)
100023
100024 __mod_zone_page_state(zone, NR_ALLOC_BATCH,
100025 high_wmark_pages(zone) - low_wmark_pages(zone) -
100026- atomic_long_read(&zone->vm_stat[NR_ALLOC_BATCH]));
100027+ atomic_long_read_unchecked(&zone->vm_stat[NR_ALLOC_BATCH]));
100028
100029 setup_zone_migrate_reserve(zone);
100030 spin_unlock_irqrestore(&zone->lock, flags);
100031diff --git a/mm/percpu.c b/mm/percpu.c
100032index 73c97a5..508ee25 100644
100033--- a/mm/percpu.c
100034+++ b/mm/percpu.c
100035@@ -131,7 +131,7 @@ static unsigned int pcpu_low_unit_cpu __read_mostly;
100036 static unsigned int pcpu_high_unit_cpu __read_mostly;
100037
100038 /* the address of the first chunk which starts with the kernel static area */
100039-void *pcpu_base_addr __read_mostly;
100040+void *pcpu_base_addr __read_only;
100041 EXPORT_SYMBOL_GPL(pcpu_base_addr);
100042
100043 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
100044diff --git a/mm/process_vm_access.c b/mm/process_vm_access.c
100045index b159769..d07037f 100644
100046--- a/mm/process_vm_access.c
100047+++ b/mm/process_vm_access.c
100048@@ -13,6 +13,7 @@
100049 #include <linux/uio.h>
100050 #include <linux/sched.h>
100051 #include <linux/highmem.h>
100052+#include <linux/security.h>
100053 #include <linux/ptrace.h>
100054 #include <linux/slab.h>
100055 #include <linux/syscalls.h>
100056@@ -154,19 +155,19 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
100057 ssize_t iov_len;
100058 size_t total_len = iov_iter_count(iter);
100059
100060+ return -ENOSYS; // PaX: until properly audited
100061+
100062 /*
100063 * Work out how many pages of struct pages we're going to need
100064 * when eventually calling get_user_pages
100065 */
100066 for (i = 0; i < riovcnt; i++) {
100067 iov_len = rvec[i].iov_len;
100068- if (iov_len > 0) {
100069- nr_pages_iov = ((unsigned long)rvec[i].iov_base
100070- + iov_len)
100071- / PAGE_SIZE - (unsigned long)rvec[i].iov_base
100072- / PAGE_SIZE + 1;
100073- nr_pages = max(nr_pages, nr_pages_iov);
100074- }
100075+ if (iov_len <= 0)
100076+ continue;
100077+ nr_pages_iov = ((unsigned long)rvec[i].iov_base + iov_len) / PAGE_SIZE -
100078+ (unsigned long)rvec[i].iov_base / PAGE_SIZE + 1;
100079+ nr_pages = max(nr_pages, nr_pages_iov);
100080 }
100081
100082 if (nr_pages == 0)
100083@@ -194,6 +195,11 @@ static ssize_t process_vm_rw_core(pid_t pid, struct iov_iter *iter,
100084 goto free_proc_pages;
100085 }
100086
100087+ if (gr_handle_ptrace(task, vm_write ? PTRACE_POKETEXT : PTRACE_ATTACH)) {
100088+ rc = -EPERM;
100089+ goto put_task_struct;
100090+ }
100091+
100092 mm = mm_access(task, PTRACE_MODE_ATTACH);
100093 if (!mm || IS_ERR(mm)) {
100094 rc = IS_ERR(mm) ? PTR_ERR(mm) : -ESRCH;
100095diff --git a/mm/rmap.c b/mm/rmap.c
100096index c161a14..8a069bb 100644
100097--- a/mm/rmap.c
100098+++ b/mm/rmap.c
100099@@ -166,6 +166,10 @@ int anon_vma_prepare(struct vm_area_struct *vma)
100100 struct anon_vma *anon_vma = vma->anon_vma;
100101 struct anon_vma_chain *avc;
100102
100103+#ifdef CONFIG_PAX_SEGMEXEC
100104+ struct anon_vma_chain *avc_m = NULL;
100105+#endif
100106+
100107 might_sleep();
100108 if (unlikely(!anon_vma)) {
100109 struct mm_struct *mm = vma->vm_mm;
100110@@ -175,6 +179,12 @@ int anon_vma_prepare(struct vm_area_struct *vma)
100111 if (!avc)
100112 goto out_enomem;
100113
100114+#ifdef CONFIG_PAX_SEGMEXEC
100115+ avc_m = anon_vma_chain_alloc(GFP_KERNEL);
100116+ if (!avc_m)
100117+ goto out_enomem_free_avc;
100118+#endif
100119+
100120 anon_vma = find_mergeable_anon_vma(vma);
100121 allocated = NULL;
100122 if (!anon_vma) {
100123@@ -188,6 +198,19 @@ int anon_vma_prepare(struct vm_area_struct *vma)
100124 /* page_table_lock to protect against threads */
100125 spin_lock(&mm->page_table_lock);
100126 if (likely(!vma->anon_vma)) {
100127+
100128+#ifdef CONFIG_PAX_SEGMEXEC
100129+ struct vm_area_struct *vma_m = pax_find_mirror_vma(vma);
100130+
100131+ if (vma_m) {
100132+ BUG_ON(vma_m->anon_vma);
100133+ vma_m->anon_vma = anon_vma;
100134+ anon_vma_chain_link(vma_m, avc_m, anon_vma);
100135+ anon_vma->degree++;
100136+ avc_m = NULL;
100137+ }
100138+#endif
100139+
100140 vma->anon_vma = anon_vma;
100141 anon_vma_chain_link(vma, avc, anon_vma);
100142 /* vma reference or self-parent link for new root */
100143@@ -200,12 +223,24 @@ int anon_vma_prepare(struct vm_area_struct *vma)
100144
100145 if (unlikely(allocated))
100146 put_anon_vma(allocated);
100147+
100148+#ifdef CONFIG_PAX_SEGMEXEC
100149+ if (unlikely(avc_m))
100150+ anon_vma_chain_free(avc_m);
100151+#endif
100152+
100153 if (unlikely(avc))
100154 anon_vma_chain_free(avc);
100155 }
100156 return 0;
100157
100158 out_enomem_free_avc:
100159+
100160+#ifdef CONFIG_PAX_SEGMEXEC
100161+ if (avc_m)
100162+ anon_vma_chain_free(avc_m);
100163+#endif
100164+
100165 anon_vma_chain_free(avc);
100166 out_enomem:
100167 return -ENOMEM;
100168@@ -249,7 +284,7 @@ static inline void unlock_anon_vma_root(struct anon_vma *root)
100169 * good chance of avoiding scanning the whole hierarchy when it searches where
100170 * page is mapped.
100171 */
100172-int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
100173+int anon_vma_clone(struct vm_area_struct *dst, const struct vm_area_struct *src)
100174 {
100175 struct anon_vma_chain *avc, *pavc;
100176 struct anon_vma *root = NULL;
100177@@ -303,7 +338,7 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src)
100178 * the corresponding VMA in the parent process is attached to.
100179 * Returns 0 on success, non-zero on failure.
100180 */
100181-int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma)
100182+int anon_vma_fork(struct vm_area_struct *vma, const struct vm_area_struct *pvma)
100183 {
100184 struct anon_vma_chain *avc;
100185 struct anon_vma *anon_vma;
100186@@ -423,8 +458,10 @@ static void anon_vma_ctor(void *data)
100187 void __init anon_vma_init(void)
100188 {
100189 anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
100190- 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC, anon_vma_ctor);
100191- anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain, SLAB_PANIC);
100192+ 0, SLAB_DESTROY_BY_RCU|SLAB_PANIC|SLAB_NO_SANITIZE,
100193+ anon_vma_ctor);
100194+ anon_vma_chain_cachep = KMEM_CACHE(anon_vma_chain,
100195+ SLAB_PANIC|SLAB_NO_SANITIZE);
100196 }
100197
100198 /*
100199diff --git a/mm/shmem.c b/mm/shmem.c
100200index cf2d0ca..ec06b8b 100644
100201--- a/mm/shmem.c
100202+++ b/mm/shmem.c
100203@@ -33,7 +33,7 @@
100204 #include <linux/swap.h>
100205 #include <linux/aio.h>
100206
100207-static struct vfsmount *shm_mnt;
100208+struct vfsmount *shm_mnt;
100209
100210 #ifdef CONFIG_SHMEM
100211 /*
100212@@ -80,7 +80,7 @@ static struct vfsmount *shm_mnt;
100213 #define BOGO_DIRENT_SIZE 20
100214
100215 /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
100216-#define SHORT_SYMLINK_LEN 128
100217+#define SHORT_SYMLINK_LEN 64
100218
100219 /*
100220 * shmem_fallocate communicates with shmem_fault or shmem_writepage via
100221@@ -2555,6 +2555,11 @@ static const struct xattr_handler *shmem_xattr_handlers[] = {
100222 static int shmem_xattr_validate(const char *name)
100223 {
100224 struct { const char *prefix; size_t len; } arr[] = {
100225+
100226+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
100227+ { XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN},
100228+#endif
100229+
100230 { XATTR_SECURITY_PREFIX, XATTR_SECURITY_PREFIX_LEN },
100231 { XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN }
100232 };
100233@@ -2610,6 +2615,15 @@ static int shmem_setxattr(struct dentry *dentry, const char *name,
100234 if (err)
100235 return err;
100236
100237+#ifdef CONFIG_PAX_XATTR_PAX_FLAGS
100238+ if (!strncmp(name, XATTR_USER_PREFIX, XATTR_USER_PREFIX_LEN)) {
100239+ if (strcmp(name, XATTR_NAME_PAX_FLAGS))
100240+ return -EOPNOTSUPP;
100241+ if (size > 8)
100242+ return -EINVAL;
100243+ }
100244+#endif
100245+
100246 return simple_xattr_set(&info->xattrs, name, value, size, flags);
100247 }
100248
100249@@ -2993,8 +3007,7 @@ int shmem_fill_super(struct super_block *sb, void *data, int silent)
100250 int err = -ENOMEM;
100251
100252 /* Round up to L1_CACHE_BYTES to resist false sharing */
100253- sbinfo = kzalloc(max((int)sizeof(struct shmem_sb_info),
100254- L1_CACHE_BYTES), GFP_KERNEL);
100255+ sbinfo = kzalloc(max(sizeof(struct shmem_sb_info), L1_CACHE_BYTES), GFP_KERNEL);
100256 if (!sbinfo)
100257 return -ENOMEM;
100258
100259diff --git a/mm/slab.c b/mm/slab.c
100260index c4b89ea..20990be 100644
100261--- a/mm/slab.c
100262+++ b/mm/slab.c
100263@@ -314,10 +314,12 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
100264 if ((x)->max_freeable < i) \
100265 (x)->max_freeable = i; \
100266 } while (0)
100267-#define STATS_INC_ALLOCHIT(x) atomic_inc(&(x)->allochit)
100268-#define STATS_INC_ALLOCMISS(x) atomic_inc(&(x)->allocmiss)
100269-#define STATS_INC_FREEHIT(x) atomic_inc(&(x)->freehit)
100270-#define STATS_INC_FREEMISS(x) atomic_inc(&(x)->freemiss)
100271+#define STATS_INC_ALLOCHIT(x) atomic_inc_unchecked(&(x)->allochit)
100272+#define STATS_INC_ALLOCMISS(x) atomic_inc_unchecked(&(x)->allocmiss)
100273+#define STATS_INC_FREEHIT(x) atomic_inc_unchecked(&(x)->freehit)
100274+#define STATS_INC_FREEMISS(x) atomic_inc_unchecked(&(x)->freemiss)
100275+#define STATS_INC_SANITIZED(x) atomic_inc_unchecked(&(x)->sanitized)
100276+#define STATS_INC_NOT_SANITIZED(x) atomic_inc_unchecked(&(x)->not_sanitized)
100277 #else
100278 #define STATS_INC_ACTIVE(x) do { } while (0)
100279 #define STATS_DEC_ACTIVE(x) do { } while (0)
100280@@ -334,6 +336,8 @@ static void kmem_cache_node_init(struct kmem_cache_node *parent)
100281 #define STATS_INC_ALLOCMISS(x) do { } while (0)
100282 #define STATS_INC_FREEHIT(x) do { } while (0)
100283 #define STATS_INC_FREEMISS(x) do { } while (0)
100284+#define STATS_INC_SANITIZED(x) do { } while (0)
100285+#define STATS_INC_NOT_SANITIZED(x) do { } while (0)
100286 #endif
100287
100288 #if DEBUG
100289@@ -450,7 +454,7 @@ static inline void *index_to_obj(struct kmem_cache *cache, struct page *page,
100290 * reciprocal_divide(offset, cache->reciprocal_buffer_size)
100291 */
100292 static inline unsigned int obj_to_index(const struct kmem_cache *cache,
100293- const struct page *page, void *obj)
100294+ const struct page *page, const void *obj)
100295 {
100296 u32 offset = (obj - page->s_mem);
100297 return reciprocal_divide(offset, cache->reciprocal_buffer_size);
100298@@ -1438,7 +1442,7 @@ void __init kmem_cache_init(void)
100299 * structures first. Without this, further allocations will bug.
100300 */
100301 kmalloc_caches[INDEX_NODE] = create_kmalloc_cache("kmalloc-node",
100302- kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS);
100303+ kmalloc_size(INDEX_NODE), SLAB_USERCOPY | ARCH_KMALLOC_FLAGS);
100304 slab_state = PARTIAL_NODE;
100305
100306 slab_early_init = 0;
100307@@ -2059,7 +2063,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
100308
100309 cachep = find_mergeable(size, align, flags, name, ctor);
100310 if (cachep) {
100311- cachep->refcount++;
100312+ atomic_inc(&cachep->refcount);
100313
100314 /*
100315 * Adjust the object sizes so that we clear
100316@@ -3357,6 +3361,20 @@ static inline void __cache_free(struct kmem_cache *cachep, void *objp,
100317 struct array_cache *ac = cpu_cache_get(cachep);
100318
100319 check_irq_off();
100320+
100321+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100322+ if (cachep->flags & (SLAB_POISON | SLAB_NO_SANITIZE))
100323+ STATS_INC_NOT_SANITIZED(cachep);
100324+ else {
100325+ memset(objp, PAX_MEMORY_SANITIZE_VALUE, cachep->object_size);
100326+
100327+ if (cachep->ctor)
100328+ cachep->ctor(objp);
100329+
100330+ STATS_INC_SANITIZED(cachep);
100331+ }
100332+#endif
100333+
100334 kmemleak_free_recursive(objp, cachep->flags);
100335 objp = cache_free_debugcheck(cachep, objp, caller);
100336
100337@@ -3469,7 +3487,7 @@ __do_kmalloc_node(size_t size, gfp_t flags, int node, unsigned long caller)
100338 return kmem_cache_alloc_node_trace(cachep, flags, node, size);
100339 }
100340
100341-void *__kmalloc_node(size_t size, gfp_t flags, int node)
100342+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
100343 {
100344 return __do_kmalloc_node(size, flags, node, _RET_IP_);
100345 }
100346@@ -3489,7 +3507,7 @@ EXPORT_SYMBOL(__kmalloc_node_track_caller);
100347 * @flags: the type of memory to allocate (see kmalloc).
100348 * @caller: function caller for debug tracking of the caller
100349 */
100350-static __always_inline void *__do_kmalloc(size_t size, gfp_t flags,
100351+static __always_inline void * __size_overflow(1) __do_kmalloc(size_t size, gfp_t flags,
100352 unsigned long caller)
100353 {
100354 struct kmem_cache *cachep;
100355@@ -3562,6 +3580,7 @@ void kfree(const void *objp)
100356
100357 if (unlikely(ZERO_OR_NULL_PTR(objp)))
100358 return;
100359+ VM_BUG_ON(!virt_addr_valid(objp));
100360 local_irq_save(flags);
100361 kfree_debugcheck(objp);
100362 c = virt_to_cache(objp);
100363@@ -3981,14 +4000,22 @@ void slabinfo_show_stats(struct seq_file *m, struct kmem_cache *cachep)
100364 }
100365 /* cpu stats */
100366 {
100367- unsigned long allochit = atomic_read(&cachep->allochit);
100368- unsigned long allocmiss = atomic_read(&cachep->allocmiss);
100369- unsigned long freehit = atomic_read(&cachep->freehit);
100370- unsigned long freemiss = atomic_read(&cachep->freemiss);
100371+ unsigned long allochit = atomic_read_unchecked(&cachep->allochit);
100372+ unsigned long allocmiss = atomic_read_unchecked(&cachep->allocmiss);
100373+ unsigned long freehit = atomic_read_unchecked(&cachep->freehit);
100374+ unsigned long freemiss = atomic_read_unchecked(&cachep->freemiss);
100375
100376 seq_printf(m, " : cpustat %6lu %6lu %6lu %6lu",
100377 allochit, allocmiss, freehit, freemiss);
100378 }
100379+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100380+ {
100381+ unsigned long sanitized = atomic_read_unchecked(&cachep->sanitized);
100382+ unsigned long not_sanitized = atomic_read_unchecked(&cachep->not_sanitized);
100383+
100384+ seq_printf(m, " : pax %6lu %6lu", sanitized, not_sanitized);
100385+ }
100386+#endif
100387 #endif
100388 }
100389
100390@@ -4196,13 +4223,69 @@ static const struct file_operations proc_slabstats_operations = {
100391 static int __init slab_proc_init(void)
100392 {
100393 #ifdef CONFIG_DEBUG_SLAB_LEAK
100394- proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
100395+ proc_create("slab_allocators", S_IRUSR, NULL, &proc_slabstats_operations);
100396 #endif
100397 return 0;
100398 }
100399 module_init(slab_proc_init);
100400 #endif
100401
100402+bool is_usercopy_object(const void *ptr)
100403+{
100404+ struct page *page;
100405+ struct kmem_cache *cachep;
100406+
100407+ if (ZERO_OR_NULL_PTR(ptr))
100408+ return false;
100409+
100410+ if (!slab_is_available())
100411+ return false;
100412+
100413+ if (!virt_addr_valid(ptr))
100414+ return false;
100415+
100416+ page = virt_to_head_page(ptr);
100417+
100418+ if (!PageSlab(page))
100419+ return false;
100420+
100421+ cachep = page->slab_cache;
100422+ return cachep->flags & SLAB_USERCOPY;
100423+}
100424+
100425+#ifdef CONFIG_PAX_USERCOPY
100426+const char *check_heap_object(const void *ptr, unsigned long n)
100427+{
100428+ struct page *page;
100429+ struct kmem_cache *cachep;
100430+ unsigned int objnr;
100431+ unsigned long offset;
100432+
100433+ if (ZERO_OR_NULL_PTR(ptr))
100434+ return "<null>";
100435+
100436+ if (!virt_addr_valid(ptr))
100437+ return NULL;
100438+
100439+ page = virt_to_head_page(ptr);
100440+
100441+ if (!PageSlab(page))
100442+ return NULL;
100443+
100444+ cachep = page->slab_cache;
100445+ if (!(cachep->flags & SLAB_USERCOPY))
100446+ return cachep->name;
100447+
100448+ objnr = obj_to_index(cachep, page, ptr);
100449+ BUG_ON(objnr >= cachep->num);
100450+ offset = ptr - index_to_obj(cachep, page, objnr) - obj_offset(cachep);
100451+ if (offset <= cachep->object_size && n <= cachep->object_size - offset)
100452+ return NULL;
100453+
100454+ return cachep->name;
100455+}
100456+#endif
100457+
100458 /**
100459 * ksize - get the actual amount of memory allocated for a given object
100460 * @objp: Pointer to the object
100461diff --git a/mm/slab.h b/mm/slab.h
100462index 4c3ac12..7b2e470 100644
100463--- a/mm/slab.h
100464+++ b/mm/slab.h
100465@@ -22,7 +22,7 @@ struct kmem_cache {
100466 unsigned int align; /* Alignment as calculated */
100467 unsigned long flags; /* Active flags on the slab */
100468 const char *name; /* Slab name for sysfs */
100469- int refcount; /* Use counter */
100470+ atomic_t refcount; /* Use counter */
100471 void (*ctor)(void *); /* Called on object slot creation */
100472 struct list_head list; /* List of all slab caches on the system */
100473 };
100474@@ -66,6 +66,20 @@ extern struct list_head slab_caches;
100475 /* The slab cache that manages slab cache information */
100476 extern struct kmem_cache *kmem_cache;
100477
100478+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100479+#ifdef CONFIG_X86_64
100480+#define PAX_MEMORY_SANITIZE_VALUE '\xfe'
100481+#else
100482+#define PAX_MEMORY_SANITIZE_VALUE '\xff'
100483+#endif
100484+enum pax_sanitize_mode {
100485+ PAX_SANITIZE_SLAB_OFF = 0,
100486+ PAX_SANITIZE_SLAB_FAST,
100487+ PAX_SANITIZE_SLAB_FULL,
100488+};
100489+extern enum pax_sanitize_mode pax_sanitize_slab;
100490+#endif
100491+
100492 unsigned long calculate_alignment(unsigned long flags,
100493 unsigned long align, unsigned long size);
100494
100495@@ -114,7 +128,8 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size,
100496
100497 /* Legal flag mask for kmem_cache_create(), for various configurations */
100498 #define SLAB_CORE_FLAGS (SLAB_HWCACHE_ALIGN | SLAB_CACHE_DMA | SLAB_PANIC | \
100499- SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS )
100500+ SLAB_DESTROY_BY_RCU | SLAB_DEBUG_OBJECTS | \
100501+ SLAB_USERCOPY | SLAB_NO_SANITIZE)
100502
100503 #if defined(CONFIG_DEBUG_SLAB)
100504 #define SLAB_DEBUG_FLAGS (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER)
100505@@ -315,6 +330,9 @@ static inline struct kmem_cache *cache_from_obj(struct kmem_cache *s, void *x)
100506 return s;
100507
100508 page = virt_to_head_page(x);
100509+
100510+ BUG_ON(!PageSlab(page));
100511+
100512 cachep = page->slab_cache;
100513 if (slab_equal_or_root(cachep, s))
100514 return cachep;
100515diff --git a/mm/slab_common.c b/mm/slab_common.c
100516index 999bb34..9843aea 100644
100517--- a/mm/slab_common.c
100518+++ b/mm/slab_common.c
100519@@ -25,11 +25,35 @@
100520
100521 #include "slab.h"
100522
100523-enum slab_state slab_state;
100524+enum slab_state slab_state __read_only;
100525 LIST_HEAD(slab_caches);
100526 DEFINE_MUTEX(slab_mutex);
100527 struct kmem_cache *kmem_cache;
100528
100529+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100530+enum pax_sanitize_mode pax_sanitize_slab __read_only = PAX_SANITIZE_SLAB_FAST;
100531+static int __init pax_sanitize_slab_setup(char *str)
100532+{
100533+ if (!str)
100534+ return 0;
100535+
100536+ if (!strcmp(str, "0") || !strcmp(str, "off")) {
100537+ pr_info("PaX slab sanitization: %s\n", "disabled");
100538+ pax_sanitize_slab = PAX_SANITIZE_SLAB_OFF;
100539+ } else if (!strcmp(str, "1") || !strcmp(str, "fast")) {
100540+ pr_info("PaX slab sanitization: %s\n", "fast");
100541+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FAST;
100542+ } else if (!strcmp(str, "full")) {
100543+ pr_info("PaX slab sanitization: %s\n", "full");
100544+ pax_sanitize_slab = PAX_SANITIZE_SLAB_FULL;
100545+ } else
100546+ pr_err("PaX slab sanitization: unsupported option '%s'\n", str);
100547+
100548+ return 0;
100549+}
100550+early_param("pax_sanitize_slab", pax_sanitize_slab_setup);
100551+#endif
100552+
100553 /*
100554 * Set of flags that will prevent slab merging
100555 */
100556@@ -44,7 +68,7 @@ struct kmem_cache *kmem_cache;
100557 * Merge control. If this is set then no merging of slab caches will occur.
100558 * (Could be removed. This was introduced to pacify the merge skeptics.)
100559 */
100560-static int slab_nomerge;
100561+static int slab_nomerge = 1;
100562
100563 static int __init setup_slab_nomerge(char *str)
100564 {
100565@@ -217,7 +241,7 @@ int slab_unmergeable(struct kmem_cache *s)
100566 /*
100567 * We may have set a slab to be unmergeable during bootstrap.
100568 */
100569- if (s->refcount < 0)
100570+ if (atomic_read(&s->refcount) < 0)
100571 return 1;
100572
100573 return 0;
100574@@ -321,7 +345,7 @@ do_kmem_cache_create(const char *name, size_t object_size, size_t size,
100575 if (err)
100576 goto out_free_cache;
100577
100578- s->refcount = 1;
100579+ atomic_set(&s->refcount, 1);
100580 list_add(&s->list, &slab_caches);
100581 out:
100582 if (err)
100583@@ -386,6 +410,13 @@ kmem_cache_create(const char *name, size_t size, size_t align,
100584 */
100585 flags &= CACHE_CREATE_MASK;
100586
100587+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100588+ if (pax_sanitize_slab == PAX_SANITIZE_SLAB_OFF || (flags & SLAB_DESTROY_BY_RCU))
100589+ flags |= SLAB_NO_SANITIZE;
100590+ else if (pax_sanitize_slab == PAX_SANITIZE_SLAB_FULL)
100591+ flags &= ~SLAB_NO_SANITIZE;
100592+#endif
100593+
100594 s = __kmem_cache_alias(name, size, align, flags, ctor);
100595 if (s)
100596 goto out_unlock;
100597@@ -456,7 +487,7 @@ static void do_kmem_cache_release(struct list_head *release,
100598 rcu_barrier();
100599
100600 list_for_each_entry_safe(s, s2, release, list) {
100601-#ifdef SLAB_SUPPORTS_SYSFS
100602+#if defined(SLAB_SUPPORTS_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
100603 sysfs_slab_remove(s);
100604 #else
100605 slab_kmem_cache_release(s);
100606@@ -625,8 +656,7 @@ void kmem_cache_destroy(struct kmem_cache *s)
100607
100608 mutex_lock(&slab_mutex);
100609
100610- s->refcount--;
100611- if (s->refcount)
100612+ if (!atomic_dec_and_test(&s->refcount))
100613 goto out_unlock;
100614
100615 for_each_memcg_cache_safe(c, c2, s) {
100616@@ -691,7 +721,7 @@ void __init create_boot_cache(struct kmem_cache *s, const char *name, size_t siz
100617 panic("Creation of kmalloc slab %s size=%zu failed. Reason %d\n",
100618 name, size, err);
100619
100620- s->refcount = -1; /* Exempt from merging for now */
100621+ atomic_set(&s->refcount, -1); /* Exempt from merging for now */
100622 }
100623
100624 struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
100625@@ -704,7 +734,7 @@ struct kmem_cache *__init create_kmalloc_cache(const char *name, size_t size,
100626
100627 create_boot_cache(s, name, size, flags);
100628 list_add(&s->list, &slab_caches);
100629- s->refcount = 1;
100630+ atomic_set(&s->refcount, 1);
100631 return s;
100632 }
100633
100634@@ -716,6 +746,11 @@ struct kmem_cache *kmalloc_dma_caches[KMALLOC_SHIFT_HIGH + 1];
100635 EXPORT_SYMBOL(kmalloc_dma_caches);
100636 #endif
100637
100638+#ifdef CONFIG_PAX_USERCOPY_SLABS
100639+struct kmem_cache *kmalloc_usercopy_caches[KMALLOC_SHIFT_HIGH + 1];
100640+EXPORT_SYMBOL(kmalloc_usercopy_caches);
100641+#endif
100642+
100643 /*
100644 * Conversion table for small slabs sizes / 8 to the index in the
100645 * kmalloc array. This is necessary for slabs < 192 since we have non power
100646@@ -780,6 +815,13 @@ struct kmem_cache *kmalloc_slab(size_t size, gfp_t flags)
100647 return kmalloc_dma_caches[index];
100648
100649 #endif
100650+
100651+#ifdef CONFIG_PAX_USERCOPY_SLABS
100652+ if (unlikely((flags & GFP_USERCOPY)))
100653+ return kmalloc_usercopy_caches[index];
100654+
100655+#endif
100656+
100657 return kmalloc_caches[index];
100658 }
100659
100660@@ -836,7 +878,7 @@ void __init create_kmalloc_caches(unsigned long flags)
100661 for (i = KMALLOC_SHIFT_LOW; i <= KMALLOC_SHIFT_HIGH; i++) {
100662 if (!kmalloc_caches[i]) {
100663 kmalloc_caches[i] = create_kmalloc_cache(NULL,
100664- 1 << i, flags);
100665+ 1 << i, SLAB_USERCOPY | flags);
100666 }
100667
100668 /*
100669@@ -845,10 +887,10 @@ void __init create_kmalloc_caches(unsigned long flags)
100670 * earlier power of two caches
100671 */
100672 if (KMALLOC_MIN_SIZE <= 32 && !kmalloc_caches[1] && i == 6)
100673- kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, flags);
100674+ kmalloc_caches[1] = create_kmalloc_cache(NULL, 96, SLAB_USERCOPY | flags);
100675
100676 if (KMALLOC_MIN_SIZE <= 64 && !kmalloc_caches[2] && i == 7)
100677- kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, flags);
100678+ kmalloc_caches[2] = create_kmalloc_cache(NULL, 192, SLAB_USERCOPY | flags);
100679 }
100680
100681 /* Kmalloc array is now usable */
100682@@ -881,6 +923,23 @@ void __init create_kmalloc_caches(unsigned long flags)
100683 }
100684 }
100685 #endif
100686+
100687+#ifdef CONFIG_PAX_USERCOPY_SLABS
100688+ for (i = 0; i <= KMALLOC_SHIFT_HIGH; i++) {
100689+ struct kmem_cache *s = kmalloc_caches[i];
100690+
100691+ if (s) {
100692+ int size = kmalloc_size(i);
100693+ char *n = kasprintf(GFP_NOWAIT,
100694+ "usercopy-kmalloc-%d", size);
100695+
100696+ BUG_ON(!n);
100697+ kmalloc_usercopy_caches[i] = create_kmalloc_cache(n,
100698+ size, SLAB_USERCOPY | flags);
100699+ }
100700+ }
100701+#endif
100702+
100703 }
100704 #endif /* !CONFIG_SLOB */
100705
100706@@ -940,6 +999,9 @@ static void print_slabinfo_header(struct seq_file *m)
100707 seq_puts(m, " : globalstat <listallocs> <maxobjs> <grown> <reaped> "
100708 "<error> <maxfreeable> <nodeallocs> <remotefrees> <alienoverflow>");
100709 seq_puts(m, " : cpustat <allochit> <allocmiss> <freehit> <freemiss>");
100710+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100711+ seq_puts(m, " : pax <sanitized> <not_sanitized>");
100712+#endif
100713 #endif
100714 seq_putc(m, '\n');
100715 }
100716@@ -1069,7 +1131,7 @@ static int __init slab_proc_init(void)
100717 module_init(slab_proc_init);
100718 #endif /* CONFIG_SLABINFO */
100719
100720-static __always_inline void *__do_krealloc(const void *p, size_t new_size,
100721+static __always_inline void * __size_overflow(2) __do_krealloc(const void *p, size_t new_size,
100722 gfp_t flags)
100723 {
100724 void *ret;
100725diff --git a/mm/slob.c b/mm/slob.c
100726index 94a7fed..cf3fb1a 100644
100727--- a/mm/slob.c
100728+++ b/mm/slob.c
100729@@ -157,7 +157,7 @@ static void set_slob(slob_t *s, slobidx_t size, slob_t *next)
100730 /*
100731 * Return the size of a slob block.
100732 */
100733-static slobidx_t slob_units(slob_t *s)
100734+static slobidx_t slob_units(const slob_t *s)
100735 {
100736 if (s->units > 0)
100737 return s->units;
100738@@ -167,7 +167,7 @@ static slobidx_t slob_units(slob_t *s)
100739 /*
100740 * Return the next free slob block pointer after this one.
100741 */
100742-static slob_t *slob_next(slob_t *s)
100743+static slob_t *slob_next(const slob_t *s)
100744 {
100745 slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK);
100746 slobidx_t next;
100747@@ -182,14 +182,14 @@ static slob_t *slob_next(slob_t *s)
100748 /*
100749 * Returns true if s is the last free block in its page.
100750 */
100751-static int slob_last(slob_t *s)
100752+static int slob_last(const slob_t *s)
100753 {
100754 return !((unsigned long)slob_next(s) & ~PAGE_MASK);
100755 }
100756
100757-static void *slob_new_pages(gfp_t gfp, int order, int node)
100758+static struct page *slob_new_pages(gfp_t gfp, unsigned int order, int node)
100759 {
100760- void *page;
100761+ struct page *page;
100762
100763 #ifdef CONFIG_NUMA
100764 if (node != NUMA_NO_NODE)
100765@@ -201,14 +201,18 @@ static void *slob_new_pages(gfp_t gfp, int order, int node)
100766 if (!page)
100767 return NULL;
100768
100769- return page_address(page);
100770+ __SetPageSlab(page);
100771+ return page;
100772 }
100773
100774-static void slob_free_pages(void *b, int order)
100775+static void slob_free_pages(struct page *sp, int order)
100776 {
100777 if (current->reclaim_state)
100778 current->reclaim_state->reclaimed_slab += 1 << order;
100779- free_pages((unsigned long)b, order);
100780+ __ClearPageSlab(sp);
100781+ page_mapcount_reset(sp);
100782+ sp->private = 0;
100783+ __free_pages(sp, order);
100784 }
100785
100786 /*
100787@@ -313,15 +317,15 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
100788
100789 /* Not enough space: must allocate a new page */
100790 if (!b) {
100791- b = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
100792- if (!b)
100793+ sp = slob_new_pages(gfp & ~__GFP_ZERO, 0, node);
100794+ if (!sp)
100795 return NULL;
100796- sp = virt_to_page(b);
100797- __SetPageSlab(sp);
100798+ b = page_address(sp);
100799
100800 spin_lock_irqsave(&slob_lock, flags);
100801 sp->units = SLOB_UNITS(PAGE_SIZE);
100802 sp->freelist = b;
100803+ sp->private = 0;
100804 INIT_LIST_HEAD(&sp->lru);
100805 set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE));
100806 set_slob_page_free(sp, slob_list);
100807@@ -337,7 +341,7 @@ static void *slob_alloc(size_t size, gfp_t gfp, int align, int node)
100808 /*
100809 * slob_free: entry point into the slob allocator.
100810 */
100811-static void slob_free(void *block, int size)
100812+static void slob_free(struct kmem_cache *c, void *block, int size)
100813 {
100814 struct page *sp;
100815 slob_t *prev, *next, *b = (slob_t *)block;
100816@@ -359,12 +363,15 @@ static void slob_free(void *block, int size)
100817 if (slob_page_free(sp))
100818 clear_slob_page_free(sp);
100819 spin_unlock_irqrestore(&slob_lock, flags);
100820- __ClearPageSlab(sp);
100821- page_mapcount_reset(sp);
100822- slob_free_pages(b, 0);
100823+ slob_free_pages(sp, 0);
100824 return;
100825 }
100826
100827+#ifdef CONFIG_PAX_MEMORY_SANITIZE
100828+ if (pax_sanitize_slab && !(c && (c->flags & SLAB_NO_SANITIZE)))
100829+ memset(block, PAX_MEMORY_SANITIZE_VALUE, size);
100830+#endif
100831+
100832 if (!slob_page_free(sp)) {
100833 /* This slob page is about to become partially free. Easy! */
100834 sp->units = units;
100835@@ -424,11 +431,10 @@ out:
100836 */
100837
100838 static __always_inline void *
100839-__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
100840+__do_kmalloc_node_align(size_t size, gfp_t gfp, int node, unsigned long caller, int align)
100841 {
100842- unsigned int *m;
100843- int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
100844- void *ret;
100845+ slob_t *m;
100846+ void *ret = NULL;
100847
100848 gfp &= gfp_allowed_mask;
100849
100850@@ -442,27 +448,45 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
100851
100852 if (!m)
100853 return NULL;
100854- *m = size;
100855+ BUILD_BUG_ON(ARCH_KMALLOC_MINALIGN < 2 * SLOB_UNIT);
100856+ BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT);
100857+ m[0].units = size;
100858+ m[1].units = align;
100859 ret = (void *)m + align;
100860
100861 trace_kmalloc_node(caller, ret,
100862 size, size + align, gfp, node);
100863 } else {
100864 unsigned int order = get_order(size);
100865+ struct page *page;
100866
100867 if (likely(order))
100868 gfp |= __GFP_COMP;
100869- ret = slob_new_pages(gfp, order, node);
100870+ page = slob_new_pages(gfp, order, node);
100871+ if (page) {
100872+ ret = page_address(page);
100873+ page->private = size;
100874+ }
100875
100876 trace_kmalloc_node(caller, ret,
100877 size, PAGE_SIZE << order, gfp, node);
100878 }
100879
100880- kmemleak_alloc(ret, size, 1, gfp);
100881 return ret;
100882 }
100883
100884-void *__kmalloc(size_t size, gfp_t gfp)
100885+static __always_inline void *
100886+__do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
100887+{
100888+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
100889+ void *ret = __do_kmalloc_node_align(size, gfp, node, caller, align);
100890+
100891+ if (!ZERO_OR_NULL_PTR(ret))
100892+ kmemleak_alloc(ret, size, 1, gfp);
100893+ return ret;
100894+}
100895+
100896+void * __size_overflow(1) __kmalloc(size_t size, gfp_t gfp)
100897 {
100898 return __do_kmalloc_node(size, gfp, NUMA_NO_NODE, _RET_IP_);
100899 }
100900@@ -491,34 +515,112 @@ void kfree(const void *block)
100901 return;
100902 kmemleak_free(block);
100903
100904+ VM_BUG_ON(!virt_addr_valid(block));
100905 sp = virt_to_page(block);
100906- if (PageSlab(sp)) {
100907+ VM_BUG_ON(!PageSlab(sp));
100908+ if (!sp->private) {
100909 int align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
100910- unsigned int *m = (unsigned int *)(block - align);
100911- slob_free(m, *m + align);
100912- } else
100913+ slob_t *m = (slob_t *)(block - align);
100914+ slob_free(NULL, m, m[0].units + align);
100915+ } else {
100916+ __ClearPageSlab(sp);
100917+ page_mapcount_reset(sp);
100918+ sp->private = 0;
100919 __free_pages(sp, compound_order(sp));
100920+ }
100921 }
100922 EXPORT_SYMBOL(kfree);
100923
100924+bool is_usercopy_object(const void *ptr)
100925+{
100926+ if (!slab_is_available())
100927+ return false;
100928+
100929+ // PAX: TODO
100930+
100931+ return false;
100932+}
100933+
100934+#ifdef CONFIG_PAX_USERCOPY
100935+const char *check_heap_object(const void *ptr, unsigned long n)
100936+{
100937+ struct page *page;
100938+ const slob_t *free;
100939+ const void *base;
100940+ unsigned long flags;
100941+
100942+ if (ZERO_OR_NULL_PTR(ptr))
100943+ return "<null>";
100944+
100945+ if (!virt_addr_valid(ptr))
100946+ return NULL;
100947+
100948+ page = virt_to_head_page(ptr);
100949+ if (!PageSlab(page))
100950+ return NULL;
100951+
100952+ if (page->private) {
100953+ base = page;
100954+ if (base <= ptr && n <= page->private - (ptr - base))
100955+ return NULL;
100956+ return "<slob>";
100957+ }
100958+
100959+ /* some tricky double walking to find the chunk */
100960+ spin_lock_irqsave(&slob_lock, flags);
100961+ base = (void *)((unsigned long)ptr & PAGE_MASK);
100962+ free = page->freelist;
100963+
100964+ while (!slob_last(free) && (void *)free <= ptr) {
100965+ base = free + slob_units(free);
100966+ free = slob_next(free);
100967+ }
100968+
100969+ while (base < (void *)free) {
100970+ slobidx_t m = ((slob_t *)base)[0].units, align = ((slob_t *)base)[1].units;
100971+ int size = SLOB_UNIT * SLOB_UNITS(m + align);
100972+ int offset;
100973+
100974+ if (ptr < base + align)
100975+ break;
100976+
100977+ offset = ptr - base - align;
100978+ if (offset >= m) {
100979+ base += size;
100980+ continue;
100981+ }
100982+
100983+ if (n > m - offset)
100984+ break;
100985+
100986+ spin_unlock_irqrestore(&slob_lock, flags);
100987+ return NULL;
100988+ }
100989+
100990+ spin_unlock_irqrestore(&slob_lock, flags);
100991+ return "<slob>";
100992+}
100993+#endif
100994+
100995 /* can't use ksize for kmem_cache_alloc memory, only kmalloc */
100996 size_t ksize(const void *block)
100997 {
100998 struct page *sp;
100999 int align;
101000- unsigned int *m;
101001+ slob_t *m;
101002
101003 BUG_ON(!block);
101004 if (unlikely(block == ZERO_SIZE_PTR))
101005 return 0;
101006
101007 sp = virt_to_page(block);
101008- if (unlikely(!PageSlab(sp)))
101009- return PAGE_SIZE << compound_order(sp);
101010+ VM_BUG_ON(!PageSlab(sp));
101011+ if (sp->private)
101012+ return sp->private;
101013
101014 align = max_t(size_t, ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
101015- m = (unsigned int *)(block - align);
101016- return SLOB_UNITS(*m) * SLOB_UNIT;
101017+ m = (slob_t *)(block - align);
101018+ return SLOB_UNITS(m[0].units) * SLOB_UNIT;
101019 }
101020 EXPORT_SYMBOL(ksize);
101021
101022@@ -534,23 +636,33 @@ int __kmem_cache_create(struct kmem_cache *c, unsigned long flags)
101023
101024 void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
101025 {
101026- void *b;
101027+ void *b = NULL;
101028
101029 flags &= gfp_allowed_mask;
101030
101031 lockdep_trace_alloc(flags);
101032
101033+#ifdef CONFIG_PAX_USERCOPY_SLABS
101034+ b = __do_kmalloc_node_align(c->size, flags, node, _RET_IP_, c->align);
101035+#else
101036 if (c->size < PAGE_SIZE) {
101037 b = slob_alloc(c->size, flags, c->align, node);
101038 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
101039 SLOB_UNITS(c->size) * SLOB_UNIT,
101040 flags, node);
101041 } else {
101042- b = slob_new_pages(flags, get_order(c->size), node);
101043+ struct page *sp;
101044+
101045+ sp = slob_new_pages(flags, get_order(c->size), node);
101046+ if (sp) {
101047+ b = page_address(sp);
101048+ sp->private = c->size;
101049+ }
101050 trace_kmem_cache_alloc_node(_RET_IP_, b, c->object_size,
101051 PAGE_SIZE << get_order(c->size),
101052 flags, node);
101053 }
101054+#endif
101055
101056 if (b && c->ctor)
101057 c->ctor(b);
101058@@ -567,7 +679,7 @@ void *kmem_cache_alloc(struct kmem_cache *cachep, gfp_t flags)
101059 EXPORT_SYMBOL(kmem_cache_alloc);
101060
101061 #ifdef CONFIG_NUMA
101062-void *__kmalloc_node(size_t size, gfp_t gfp, int node)
101063+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t gfp, int node)
101064 {
101065 return __do_kmalloc_node(size, gfp, node, _RET_IP_);
101066 }
101067@@ -580,12 +692,16 @@ void *kmem_cache_alloc_node(struct kmem_cache *cachep, gfp_t gfp, int node)
101068 EXPORT_SYMBOL(kmem_cache_alloc_node);
101069 #endif
101070
101071-static void __kmem_cache_free(void *b, int size)
101072+static void __kmem_cache_free(struct kmem_cache *c, void *b, int size)
101073 {
101074- if (size < PAGE_SIZE)
101075- slob_free(b, size);
101076+ struct page *sp;
101077+
101078+ sp = virt_to_page(b);
101079+ BUG_ON(!PageSlab(sp));
101080+ if (!sp->private)
101081+ slob_free(c, b, size);
101082 else
101083- slob_free_pages(b, get_order(size));
101084+ slob_free_pages(sp, get_order(size));
101085 }
101086
101087 static void kmem_rcu_free(struct rcu_head *head)
101088@@ -593,22 +709,36 @@ static void kmem_rcu_free(struct rcu_head *head)
101089 struct slob_rcu *slob_rcu = (struct slob_rcu *)head;
101090 void *b = (void *)slob_rcu - (slob_rcu->size - sizeof(struct slob_rcu));
101091
101092- __kmem_cache_free(b, slob_rcu->size);
101093+ __kmem_cache_free(NULL, b, slob_rcu->size);
101094 }
101095
101096 void kmem_cache_free(struct kmem_cache *c, void *b)
101097 {
101098+ int size = c->size;
101099+
101100+#ifdef CONFIG_PAX_USERCOPY_SLABS
101101+ if (size + c->align < PAGE_SIZE) {
101102+ size += c->align;
101103+ b -= c->align;
101104+ }
101105+#endif
101106+
101107 kmemleak_free_recursive(b, c->flags);
101108 if (unlikely(c->flags & SLAB_DESTROY_BY_RCU)) {
101109 struct slob_rcu *slob_rcu;
101110- slob_rcu = b + (c->size - sizeof(struct slob_rcu));
101111- slob_rcu->size = c->size;
101112+ slob_rcu = b + (size - sizeof(struct slob_rcu));
101113+ slob_rcu->size = size;
101114 call_rcu(&slob_rcu->head, kmem_rcu_free);
101115 } else {
101116- __kmem_cache_free(b, c->size);
101117+ __kmem_cache_free(c, b, size);
101118 }
101119
101120+#ifdef CONFIG_PAX_USERCOPY_SLABS
101121+ trace_kfree(_RET_IP_, b);
101122+#else
101123 trace_kmem_cache_free(_RET_IP_, b);
101124+#endif
101125+
101126 }
101127 EXPORT_SYMBOL(kmem_cache_free);
101128
101129diff --git a/mm/slub.c b/mm/slub.c
101130index 82c4737..55c316a 100644
101131--- a/mm/slub.c
101132+++ b/mm/slub.c
101133@@ -198,7 +198,7 @@ struct track {
101134
101135 enum track_item { TRACK_ALLOC, TRACK_FREE };
101136
101137-#ifdef CONFIG_SYSFS
101138+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
101139 static int sysfs_slab_add(struct kmem_cache *);
101140 static int sysfs_slab_alias(struct kmem_cache *, const char *);
101141 static void memcg_propagate_slab_attrs(struct kmem_cache *s);
101142@@ -556,7 +556,7 @@ static void print_track(const char *s, struct track *t)
101143 if (!t->addr)
101144 return;
101145
101146- pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
101147+ pr_err("INFO: %s in %pA age=%lu cpu=%u pid=%d\n",
101148 s, (void *)t->addr, jiffies - t->when, t->cpu, t->pid);
101149 #ifdef CONFIG_STACKTRACE
101150 {
101151@@ -2709,6 +2709,14 @@ static __always_inline void slab_free(struct kmem_cache *s,
101152
101153 slab_free_hook(s, x);
101154
101155+#ifdef CONFIG_PAX_MEMORY_SANITIZE
101156+ if (!(s->flags & SLAB_NO_SANITIZE)) {
101157+ memset(x, PAX_MEMORY_SANITIZE_VALUE, s->object_size);
101158+ if (s->ctor)
101159+ s->ctor(x);
101160+ }
101161+#endif
101162+
101163 redo:
101164 /*
101165 * Determine the currently cpus per cpu slab.
101166@@ -3050,6 +3058,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
101167 s->inuse = size;
101168
101169 if (((flags & (SLAB_DESTROY_BY_RCU | SLAB_POISON)) ||
101170+#ifdef CONFIG_PAX_MEMORY_SANITIZE
101171+ (!(flags & SLAB_NO_SANITIZE)) ||
101172+#endif
101173 s->ctor)) {
101174 /*
101175 * Relocate free pointer after the object if it is not
101176@@ -3304,7 +3315,7 @@ static int __init setup_slub_min_objects(char *str)
101177
101178 __setup("slub_min_objects=", setup_slub_min_objects);
101179
101180-void *__kmalloc(size_t size, gfp_t flags)
101181+void * __size_overflow(1) __kmalloc(size_t size, gfp_t flags)
101182 {
101183 struct kmem_cache *s;
101184 void *ret;
101185@@ -3342,7 +3353,7 @@ static void *kmalloc_large_node(size_t size, gfp_t flags, int node)
101186 return ptr;
101187 }
101188
101189-void *__kmalloc_node(size_t size, gfp_t flags, int node)
101190+void * __size_overflow(1) __kmalloc_node(size_t size, gfp_t flags, int node)
101191 {
101192 struct kmem_cache *s;
101193 void *ret;
101194@@ -3390,6 +3401,59 @@ static size_t __ksize(const void *object)
101195 return slab_ksize(page->slab_cache);
101196 }
101197
101198+bool is_usercopy_object(const void *ptr)
101199+{
101200+ struct page *page;
101201+ struct kmem_cache *s;
101202+
101203+ if (ZERO_OR_NULL_PTR(ptr))
101204+ return false;
101205+
101206+ if (!slab_is_available())
101207+ return false;
101208+
101209+ if (!virt_addr_valid(ptr))
101210+ return false;
101211+
101212+ page = virt_to_head_page(ptr);
101213+
101214+ if (!PageSlab(page))
101215+ return false;
101216+
101217+ s = page->slab_cache;
101218+ return s->flags & SLAB_USERCOPY;
101219+}
101220+
101221+#ifdef CONFIG_PAX_USERCOPY
101222+const char *check_heap_object(const void *ptr, unsigned long n)
101223+{
101224+ struct page *page;
101225+ struct kmem_cache *s;
101226+ unsigned long offset;
101227+
101228+ if (ZERO_OR_NULL_PTR(ptr))
101229+ return "<null>";
101230+
101231+ if (!virt_addr_valid(ptr))
101232+ return NULL;
101233+
101234+ page = virt_to_head_page(ptr);
101235+
101236+ if (!PageSlab(page))
101237+ return NULL;
101238+
101239+ s = page->slab_cache;
101240+ if (!(s->flags & SLAB_USERCOPY))
101241+ return s->name;
101242+
101243+ offset = (ptr - page_address(page)) % s->size;
101244+ if (offset <= s->object_size && n <= s->object_size - offset)
101245+ return NULL;
101246+
101247+ return s->name;
101248+}
101249+#endif
101250+
101251 size_t ksize(const void *object)
101252 {
101253 size_t size = __ksize(object);
101254@@ -3410,6 +3474,7 @@ void kfree(const void *x)
101255 if (unlikely(ZERO_OR_NULL_PTR(x)))
101256 return;
101257
101258+ VM_BUG_ON(!virt_addr_valid(x));
101259 page = virt_to_head_page(x);
101260 if (unlikely(!PageSlab(page))) {
101261 BUG_ON(!PageCompound(page));
101262@@ -3726,7 +3791,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
101263
101264 s = find_mergeable(size, align, flags, name, ctor);
101265 if (s) {
101266- s->refcount++;
101267+ atomic_inc(&s->refcount);
101268
101269 /*
101270 * Adjust the object sizes so that we clear
101271@@ -3742,7 +3807,7 @@ __kmem_cache_alias(const char *name, size_t size, size_t align,
101272 }
101273
101274 if (sysfs_slab_alias(s, name)) {
101275- s->refcount--;
101276+ atomic_dec(&s->refcount);
101277 s = NULL;
101278 }
101279 }
101280@@ -3859,7 +3924,7 @@ void *__kmalloc_node_track_caller(size_t size, gfp_t gfpflags,
101281 }
101282 #endif
101283
101284-#ifdef CONFIG_SYSFS
101285+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
101286 static int count_inuse(struct page *page)
101287 {
101288 return page->inuse;
101289@@ -4140,7 +4205,11 @@ static int list_locations(struct kmem_cache *s, char *buf,
101290 len += sprintf(buf + len, "%7ld ", l->count);
101291
101292 if (l->addr)
101293+#ifdef CONFIG_GRKERNSEC_HIDESYM
101294+ len += sprintf(buf + len, "%pS", NULL);
101295+#else
101296 len += sprintf(buf + len, "%pS", (void *)l->addr);
101297+#endif
101298 else
101299 len += sprintf(buf + len, "<not-available>");
101300
101301@@ -4238,12 +4307,12 @@ static void __init resiliency_test(void)
101302 validate_slab_cache(kmalloc_caches[9]);
101303 }
101304 #else
101305-#ifdef CONFIG_SYSFS
101306+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
101307 static void resiliency_test(void) {};
101308 #endif
101309 #endif
101310
101311-#ifdef CONFIG_SYSFS
101312+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
101313 enum slab_stat_type {
101314 SL_ALL, /* All slabs */
101315 SL_PARTIAL, /* Only partially allocated slabs */
101316@@ -4480,13 +4549,17 @@ static ssize_t ctor_show(struct kmem_cache *s, char *buf)
101317 {
101318 if (!s->ctor)
101319 return 0;
101320+#ifdef CONFIG_GRKERNSEC_HIDESYM
101321+ return sprintf(buf, "%pS\n", NULL);
101322+#else
101323 return sprintf(buf, "%pS\n", s->ctor);
101324+#endif
101325 }
101326 SLAB_ATTR_RO(ctor);
101327
101328 static ssize_t aliases_show(struct kmem_cache *s, char *buf)
101329 {
101330- return sprintf(buf, "%d\n", s->refcount < 0 ? 0 : s->refcount - 1);
101331+ return sprintf(buf, "%d\n", atomic_read(&s->refcount) < 0 ? 0 : atomic_read(&s->refcount) - 1);
101332 }
101333 SLAB_ATTR_RO(aliases);
101334
101335@@ -4574,6 +4647,22 @@ static ssize_t cache_dma_show(struct kmem_cache *s, char *buf)
101336 SLAB_ATTR_RO(cache_dma);
101337 #endif
101338
101339+#ifdef CONFIG_PAX_USERCOPY_SLABS
101340+static ssize_t usercopy_show(struct kmem_cache *s, char *buf)
101341+{
101342+ return sprintf(buf, "%d\n", !!(s->flags & SLAB_USERCOPY));
101343+}
101344+SLAB_ATTR_RO(usercopy);
101345+#endif
101346+
101347+#ifdef CONFIG_PAX_MEMORY_SANITIZE
101348+static ssize_t sanitize_show(struct kmem_cache *s, char *buf)
101349+{
101350+ return sprintf(buf, "%d\n", !(s->flags & SLAB_NO_SANITIZE));
101351+}
101352+SLAB_ATTR_RO(sanitize);
101353+#endif
101354+
101355 static ssize_t destroy_by_rcu_show(struct kmem_cache *s, char *buf)
101356 {
101357 return sprintf(buf, "%d\n", !!(s->flags & SLAB_DESTROY_BY_RCU));
101358@@ -4629,7 +4718,7 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf,
101359 * as well as cause other issues like converting a mergeable
101360 * cache into an umergeable one.
101361 */
101362- if (s->refcount > 1)
101363+ if (atomic_read(&s->refcount) > 1)
101364 return -EINVAL;
101365
101366 s->flags &= ~SLAB_TRACE;
101367@@ -4749,7 +4838,7 @@ static ssize_t failslab_show(struct kmem_cache *s, char *buf)
101368 static ssize_t failslab_store(struct kmem_cache *s, const char *buf,
101369 size_t length)
101370 {
101371- if (s->refcount > 1)
101372+ if (atomic_read(&s->refcount) > 1)
101373 return -EINVAL;
101374
101375 s->flags &= ~SLAB_FAILSLAB;
101376@@ -4916,6 +5005,12 @@ static struct attribute *slab_attrs[] = {
101377 #ifdef CONFIG_ZONE_DMA
101378 &cache_dma_attr.attr,
101379 #endif
101380+#ifdef CONFIG_PAX_USERCOPY_SLABS
101381+ &usercopy_attr.attr,
101382+#endif
101383+#ifdef CONFIG_PAX_MEMORY_SANITIZE
101384+ &sanitize_attr.attr,
101385+#endif
101386 #ifdef CONFIG_NUMA
101387 &remote_node_defrag_ratio_attr.attr,
101388 #endif
101389@@ -5157,6 +5252,7 @@ static char *create_unique_id(struct kmem_cache *s)
101390 return name;
101391 }
101392
101393+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
101394 static int sysfs_slab_add(struct kmem_cache *s)
101395 {
101396 int err;
101397@@ -5230,6 +5326,7 @@ void sysfs_slab_remove(struct kmem_cache *s)
101398 kobject_del(&s->kobj);
101399 kobject_put(&s->kobj);
101400 }
101401+#endif
101402
101403 /*
101404 * Need to buffer aliases during bootup until sysfs becomes
101405@@ -5243,6 +5340,7 @@ struct saved_alias {
101406
101407 static struct saved_alias *alias_list;
101408
101409+#if defined(CONFIG_SYSFS) && !defined(CONFIG_GRKERNSEC_PROC_ADD)
101410 static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
101411 {
101412 struct saved_alias *al;
101413@@ -5265,6 +5363,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
101414 alias_list = al;
101415 return 0;
101416 }
101417+#endif
101418
101419 static int __init slab_sysfs_init(void)
101420 {
101421diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
101422index 4cba9c2..b4f9fcc 100644
101423--- a/mm/sparse-vmemmap.c
101424+++ b/mm/sparse-vmemmap.c
101425@@ -131,7 +131,7 @@ pud_t * __meminit vmemmap_pud_populate(pgd_t *pgd, unsigned long addr, int node)
101426 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
101427 if (!p)
101428 return NULL;
101429- pud_populate(&init_mm, pud, p);
101430+ pud_populate_kernel(&init_mm, pud, p);
101431 }
101432 return pud;
101433 }
101434@@ -143,7 +143,7 @@ pgd_t * __meminit vmemmap_pgd_populate(unsigned long addr, int node)
101435 void *p = vmemmap_alloc_block(PAGE_SIZE, node);
101436 if (!p)
101437 return NULL;
101438- pgd_populate(&init_mm, pgd, p);
101439+ pgd_populate_kernel(&init_mm, pgd, p);
101440 }
101441 return pgd;
101442 }
101443diff --git a/mm/sparse.c b/mm/sparse.c
101444index d1b48b6..6e8590e 100644
101445--- a/mm/sparse.c
101446+++ b/mm/sparse.c
101447@@ -750,7 +750,7 @@ static void clear_hwpoisoned_pages(struct page *memmap, int nr_pages)
101448
101449 for (i = 0; i < PAGES_PER_SECTION; i++) {
101450 if (PageHWPoison(&memmap[i])) {
101451- atomic_long_sub(1, &num_poisoned_pages);
101452+ atomic_long_sub_unchecked(1, &num_poisoned_pages);
101453 ClearPageHWPoison(&memmap[i]);
101454 }
101455 }
101456diff --git a/mm/swap.c b/mm/swap.c
101457index cd3a5e6..40c0c8f 100644
101458--- a/mm/swap.c
101459+++ b/mm/swap.c
101460@@ -31,6 +31,7 @@
101461 #include <linux/memcontrol.h>
101462 #include <linux/gfp.h>
101463 #include <linux/uio.h>
101464+#include <linux/hugetlb.h>
101465
101466 #include "internal.h"
101467
101468@@ -77,6 +78,8 @@ static void __put_compound_page(struct page *page)
101469
101470 __page_cache_release(page);
101471 dtor = get_compound_page_dtor(page);
101472+ if (!PageHuge(page))
101473+ BUG_ON(dtor != free_compound_page);
101474 (*dtor)(page);
101475 }
101476
101477diff --git a/mm/swapfile.c b/mm/swapfile.c
101478index 63f55cc..31874e6 100644
101479--- a/mm/swapfile.c
101480+++ b/mm/swapfile.c
101481@@ -84,7 +84,7 @@ static DEFINE_MUTEX(swapon_mutex);
101482
101483 static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
101484 /* Activity counter to indicate that a swapon or swapoff has occurred */
101485-static atomic_t proc_poll_event = ATOMIC_INIT(0);
101486+static atomic_unchecked_t proc_poll_event = ATOMIC_INIT(0);
101487
101488 static inline unsigned char swap_count(unsigned char ent)
101489 {
101490@@ -1944,7 +1944,7 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
101491 spin_unlock(&swap_lock);
101492
101493 err = 0;
101494- atomic_inc(&proc_poll_event);
101495+ atomic_inc_unchecked(&proc_poll_event);
101496 wake_up_interruptible(&proc_poll_wait);
101497
101498 out_dput:
101499@@ -1961,8 +1961,8 @@ static unsigned swaps_poll(struct file *file, poll_table *wait)
101500
101501 poll_wait(file, &proc_poll_wait, wait);
101502
101503- if (seq->poll_event != atomic_read(&proc_poll_event)) {
101504- seq->poll_event = atomic_read(&proc_poll_event);
101505+ if (seq->poll_event != atomic_read_unchecked(&proc_poll_event)) {
101506+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
101507 return POLLIN | POLLRDNORM | POLLERR | POLLPRI;
101508 }
101509
101510@@ -2060,7 +2060,7 @@ static int swaps_open(struct inode *inode, struct file *file)
101511 return ret;
101512
101513 seq = file->private_data;
101514- seq->poll_event = atomic_read(&proc_poll_event);
101515+ seq->poll_event = atomic_read_unchecked(&proc_poll_event);
101516 return 0;
101517 }
101518
101519@@ -2520,7 +2520,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
101520 (frontswap_map) ? "FS" : "");
101521
101522 mutex_unlock(&swapon_mutex);
101523- atomic_inc(&proc_poll_event);
101524+ atomic_inc_unchecked(&proc_poll_event);
101525 wake_up_interruptible(&proc_poll_wait);
101526
101527 if (S_ISREG(inode->i_mode))
101528diff --git a/mm/util.c b/mm/util.c
101529index 3981ae9..28b585b 100644
101530--- a/mm/util.c
101531+++ b/mm/util.c
101532@@ -233,6 +233,12 @@ struct task_struct *task_of_stack(struct task_struct *task,
101533 void arch_pick_mmap_layout(struct mm_struct *mm)
101534 {
101535 mm->mmap_base = TASK_UNMAPPED_BASE;
101536+
101537+#ifdef CONFIG_PAX_RANDMMAP
101538+ if (mm->pax_flags & MF_PAX_RANDMMAP)
101539+ mm->mmap_base += mm->delta_mmap;
101540+#endif
101541+
101542 mm->get_unmapped_area = arch_get_unmapped_area;
101543 }
101544 #endif
101545@@ -403,6 +409,9 @@ int get_cmdline(struct task_struct *task, char *buffer, int buflen)
101546 if (!mm->arg_end)
101547 goto out_mm; /* Shh! No looking before we're done */
101548
101549+ if (gr_acl_handle_procpidmem(task))
101550+ goto out_mm;
101551+
101552 len = mm->arg_end - mm->arg_start;
101553
101554 if (len > buflen)
101555diff --git a/mm/vmalloc.c b/mm/vmalloc.c
101556index 49abccf..7bd1931 100644
101557--- a/mm/vmalloc.c
101558+++ b/mm/vmalloc.c
101559@@ -39,20 +39,65 @@ struct vfree_deferred {
101560 struct work_struct wq;
101561 };
101562 static DEFINE_PER_CPU(struct vfree_deferred, vfree_deferred);
101563+static DEFINE_PER_CPU(struct vfree_deferred, vunmap_deferred);
101564+
101565+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
101566+struct stack_deferred_llist {
101567+ struct llist_head list;
101568+ void *stack;
101569+ void *lowmem_stack;
101570+};
101571+
101572+struct stack_deferred {
101573+ struct stack_deferred_llist list;
101574+ struct work_struct wq;
101575+};
101576+
101577+static DEFINE_PER_CPU(struct stack_deferred, stack_deferred);
101578+#endif
101579
101580 static void __vunmap(const void *, int);
101581
101582-static void free_work(struct work_struct *w)
101583+static void vfree_work(struct work_struct *w)
101584 {
101585 struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
101586 struct llist_node *llnode = llist_del_all(&p->list);
101587 while (llnode) {
101588- void *p = llnode;
101589+ void *x = llnode;
101590 llnode = llist_next(llnode);
101591- __vunmap(p, 1);
101592+ __vunmap(x, 1);
101593 }
101594 }
101595
101596+static void vunmap_work(struct work_struct *w)
101597+{
101598+ struct vfree_deferred *p = container_of(w, struct vfree_deferred, wq);
101599+ struct llist_node *llnode = llist_del_all(&p->list);
101600+ while (llnode) {
101601+ void *x = llnode;
101602+ llnode = llist_next(llnode);
101603+ __vunmap(x, 0);
101604+ }
101605+}
101606+
101607+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
101608+static void unmap_work(struct work_struct *w)
101609+{
101610+ struct stack_deferred *p = container_of(w, struct stack_deferred, wq);
101611+ struct llist_node *llnode = llist_del_all(&p->list.list);
101612+ while (llnode) {
101613+ struct stack_deferred_llist *x =
101614+ llist_entry((struct llist_head *)llnode,
101615+ struct stack_deferred_llist, list);
101616+ void *stack = ACCESS_ONCE(x->stack);
101617+ void *lowmem_stack = ACCESS_ONCE(x->lowmem_stack);
101618+ llnode = llist_next(llnode);
101619+ __vunmap(stack, 0);
101620+ free_kmem_pages((unsigned long)lowmem_stack, THREAD_SIZE_ORDER);
101621+ }
101622+}
101623+#endif
101624+
101625 /*** Page table manipulation functions ***/
101626
101627 static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
101628@@ -61,8 +106,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end)
101629
101630 pte = pte_offset_kernel(pmd, addr);
101631 do {
101632- pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
101633- WARN_ON(!pte_none(ptent) && !pte_present(ptent));
101634+
101635+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
101636+ if ((unsigned long)MODULES_EXEC_VADDR <= addr && addr < (unsigned long)MODULES_EXEC_END) {
101637+ BUG_ON(!pte_exec(*pte));
101638+ set_pte_at(&init_mm, addr, pte, pfn_pte(__pa(addr) >> PAGE_SHIFT, PAGE_KERNEL_EXEC));
101639+ continue;
101640+ }
101641+#endif
101642+
101643+ {
101644+ pte_t ptent = ptep_get_and_clear(&init_mm, addr, pte);
101645+ WARN_ON(!pte_none(ptent) && !pte_present(ptent));
101646+ }
101647 } while (pte++, addr += PAGE_SIZE, addr != end);
101648 }
101649
101650@@ -122,16 +178,29 @@ static int vmap_pte_range(pmd_t *pmd, unsigned long addr,
101651 pte = pte_alloc_kernel(pmd, addr);
101652 if (!pte)
101653 return -ENOMEM;
101654+
101655+ pax_open_kernel();
101656 do {
101657 struct page *page = pages[*nr];
101658
101659- if (WARN_ON(!pte_none(*pte)))
101660+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
101661+ if (pgprot_val(prot) & _PAGE_NX)
101662+#endif
101663+
101664+ if (!pte_none(*pte)) {
101665+ pax_close_kernel();
101666+ WARN_ON(1);
101667 return -EBUSY;
101668- if (WARN_ON(!page))
101669+ }
101670+ if (!page) {
101671+ pax_close_kernel();
101672+ WARN_ON(1);
101673 return -ENOMEM;
101674+ }
101675 set_pte_at(&init_mm, addr, pte, mk_pte(page, prot));
101676 (*nr)++;
101677 } while (pte++, addr += PAGE_SIZE, addr != end);
101678+ pax_close_kernel();
101679 return 0;
101680 }
101681
101682@@ -141,7 +210,7 @@ static int vmap_pmd_range(pud_t *pud, unsigned long addr,
101683 pmd_t *pmd;
101684 unsigned long next;
101685
101686- pmd = pmd_alloc(&init_mm, pud, addr);
101687+ pmd = pmd_alloc_kernel(&init_mm, pud, addr);
101688 if (!pmd)
101689 return -ENOMEM;
101690 do {
101691@@ -158,7 +227,7 @@ static int vmap_pud_range(pgd_t *pgd, unsigned long addr,
101692 pud_t *pud;
101693 unsigned long next;
101694
101695- pud = pud_alloc(&init_mm, pgd, addr);
101696+ pud = pud_alloc_kernel(&init_mm, pgd, addr);
101697 if (!pud)
101698 return -ENOMEM;
101699 do {
101700@@ -218,6 +287,12 @@ int is_vmalloc_or_module_addr(const void *x)
101701 if (addr >= MODULES_VADDR && addr < MODULES_END)
101702 return 1;
101703 #endif
101704+
101705+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_KERNEXEC)
101706+ if (x >= (const void *)MODULES_EXEC_VADDR && x < (const void *)MODULES_EXEC_END)
101707+ return 1;
101708+#endif
101709+
101710 return is_vmalloc_addr(x);
101711 }
101712
101713@@ -238,8 +313,14 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
101714
101715 if (!pgd_none(*pgd)) {
101716 pud_t *pud = pud_offset(pgd, addr);
101717+#ifdef CONFIG_X86
101718+ if (!pud_large(*pud))
101719+#endif
101720 if (!pud_none(*pud)) {
101721 pmd_t *pmd = pmd_offset(pud, addr);
101722+#ifdef CONFIG_X86
101723+ if (!pmd_large(*pmd))
101724+#endif
101725 if (!pmd_none(*pmd)) {
101726 pte_t *ptep, pte;
101727
101728@@ -341,7 +422,7 @@ static void purge_vmap_area_lazy(void);
101729 * Allocate a region of KVA of the specified size and alignment, within the
101730 * vstart and vend.
101731 */
101732-static struct vmap_area *alloc_vmap_area(unsigned long size,
101733+static struct vmap_area * __size_overflow(1) alloc_vmap_area(unsigned long size,
101734 unsigned long align,
101735 unsigned long vstart, unsigned long vend,
101736 int node, gfp_t gfp_mask)
101737@@ -1182,13 +1263,27 @@ void __init vmalloc_init(void)
101738 for_each_possible_cpu(i) {
101739 struct vmap_block_queue *vbq;
101740 struct vfree_deferred *p;
101741+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
101742+ struct stack_deferred *p2;
101743+#endif
101744
101745 vbq = &per_cpu(vmap_block_queue, i);
101746 spin_lock_init(&vbq->lock);
101747 INIT_LIST_HEAD(&vbq->free);
101748+
101749 p = &per_cpu(vfree_deferred, i);
101750 init_llist_head(&p->list);
101751- INIT_WORK(&p->wq, free_work);
101752+ INIT_WORK(&p->wq, vfree_work);
101753+
101754+ p = &per_cpu(vunmap_deferred, i);
101755+ init_llist_head(&p->list);
101756+ INIT_WORK(&p->wq, vunmap_work);
101757+
101758+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
101759+ p2 = &per_cpu(stack_deferred, i);
101760+ init_llist_head(&p2->list.list);
101761+ INIT_WORK(&p2->wq, unmap_work);
101762+#endif
101763 }
101764
101765 /* Import existing vmlist entries. */
101766@@ -1313,6 +1408,16 @@ static struct vm_struct *__get_vm_area_node(unsigned long size,
101767 struct vm_struct *area;
101768
101769 BUG_ON(in_interrupt());
101770+
101771+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
101772+ if (flags & VM_KERNEXEC) {
101773+ if (start != VMALLOC_START || end != VMALLOC_END)
101774+ return NULL;
101775+ start = (unsigned long)MODULES_EXEC_VADDR;
101776+ end = (unsigned long)MODULES_EXEC_END;
101777+ }
101778+#endif
101779+
101780 if (flags & VM_IOREMAP)
101781 align = 1ul << clamp(fls(size), PAGE_SHIFT, IOREMAP_MAX_ORDER);
101782
101783@@ -1510,13 +1615,36 @@ EXPORT_SYMBOL(vfree);
101784 */
101785 void vunmap(const void *addr)
101786 {
101787- BUG_ON(in_interrupt());
101788- might_sleep();
101789- if (addr)
101790+ if (!addr)
101791+ return;
101792+ if (unlikely(in_interrupt())) {
101793+ struct vfree_deferred *p = this_cpu_ptr(&vunmap_deferred);
101794+ if (llist_add((struct llist_node *)addr, &p->list))
101795+ schedule_work(&p->wq);
101796+ } else {
101797+ might_sleep();
101798 __vunmap(addr, 0);
101799+ }
101800 }
101801 EXPORT_SYMBOL(vunmap);
101802
101803+#ifdef CONFIG_GRKERNSEC_KSTACKOVERFLOW
101804+void unmap_process_stacks(struct task_struct *task)
101805+{
101806+ if (unlikely(in_interrupt())) {
101807+ struct stack_deferred *p = this_cpu_ptr(&stack_deferred);
101808+ struct stack_deferred_llist *list = task->stack;
101809+ list->stack = task->stack;
101810+ list->lowmem_stack = task->lowmem_stack;
101811+ if (llist_add((struct llist_node *)&list->list, &p->list.list))
101812+ schedule_work(&p->wq);
101813+ } else {
101814+ __vunmap(task->stack, 0);
101815+ free_kmem_pages((unsigned long)task->lowmem_stack, THREAD_SIZE_ORDER);
101816+ }
101817+}
101818+#endif
101819+
101820 /**
101821 * vmap - map an array of pages into virtually contiguous space
101822 * @pages: array of page pointers
101823@@ -1537,6 +1665,11 @@ void *vmap(struct page **pages, unsigned int count,
101824 if (count > totalram_pages)
101825 return NULL;
101826
101827+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
101828+ if (!(pgprot_val(prot) & _PAGE_NX))
101829+ flags |= VM_KERNEXEC;
101830+#endif
101831+
101832 area = get_vm_area_caller((count << PAGE_SHIFT), flags,
101833 __builtin_return_address(0));
101834 if (!area)
101835@@ -1641,6 +1774,14 @@ void *__vmalloc_node_range(unsigned long size, unsigned long align,
101836 if (!size || (size >> PAGE_SHIFT) > totalram_pages)
101837 goto fail;
101838
101839+#if defined(CONFIG_X86) && defined(CONFIG_PAX_KERNEXEC)
101840+ if (!(pgprot_val(prot) & _PAGE_NX)) {
101841+ vm_flags |= VM_KERNEXEC;
101842+ start = VMALLOC_START;
101843+ end = VMALLOC_END;
101844+ }
101845+#endif
101846+
101847 area = __get_vm_area_node(size, align, VM_ALLOC | VM_UNINITIALIZED |
101848 vm_flags, start, end, node, gfp_mask, caller);
101849 if (!area)
101850@@ -1817,10 +1958,9 @@ EXPORT_SYMBOL(vzalloc_node);
101851 * For tight control over page level allocator and protection flags
101852 * use __vmalloc() instead.
101853 */
101854-
101855 void *vmalloc_exec(unsigned long size)
101856 {
101857- return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
101858+ return __vmalloc_node(size, 1, GFP_KERNEL | __GFP_HIGHMEM | __GFP_ZERO, PAGE_KERNEL_EXEC,
101859 NUMA_NO_NODE, __builtin_return_address(0));
101860 }
101861
101862@@ -2127,6 +2267,8 @@ int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr,
101863 {
101864 struct vm_struct *area;
101865
101866+ BUG_ON(vma->vm_mirror);
101867+
101868 size = PAGE_ALIGN(size);
101869
101870 if (!PAGE_ALIGNED(uaddr) || !PAGE_ALIGNED(kaddr))
101871@@ -2609,7 +2751,11 @@ static int s_show(struct seq_file *m, void *p)
101872 v->addr, v->addr + v->size, v->size);
101873
101874 if (v->caller)
101875+#ifdef CONFIG_GRKERNSEC_HIDESYM
101876+ seq_printf(m, " %pK", v->caller);
101877+#else
101878 seq_printf(m, " %pS", v->caller);
101879+#endif
101880
101881 if (v->nr_pages)
101882 seq_printf(m, " pages=%d", v->nr_pages);
101883diff --git a/mm/vmstat.c b/mm/vmstat.c
101884index 4f5cd97..9fb715a 100644
101885--- a/mm/vmstat.c
101886+++ b/mm/vmstat.c
101887@@ -27,6 +27,7 @@
101888 #include <linux/mm_inline.h>
101889 #include <linux/page_ext.h>
101890 #include <linux/page_owner.h>
101891+#include <linux/grsecurity.h>
101892
101893 #include "internal.h"
101894
101895@@ -86,7 +87,7 @@ void vm_events_fold_cpu(int cpu)
101896 *
101897 * vm_stat contains the global counters
101898 */
101899-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
101900+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
101901 EXPORT_SYMBOL(vm_stat);
101902
101903 #ifdef CONFIG_SMP
101904@@ -438,7 +439,7 @@ static int fold_diff(int *diff)
101905
101906 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
101907 if (diff[i]) {
101908- atomic_long_add(diff[i], &vm_stat[i]);
101909+ atomic_long_add_unchecked(diff[i], &vm_stat[i]);
101910 changes++;
101911 }
101912 return changes;
101913@@ -476,7 +477,7 @@ static int refresh_cpu_vm_stats(void)
101914 v = this_cpu_xchg(p->vm_stat_diff[i], 0);
101915 if (v) {
101916
101917- atomic_long_add(v, &zone->vm_stat[i]);
101918+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
101919 global_diff[i] += v;
101920 #ifdef CONFIG_NUMA
101921 /* 3 seconds idle till flush */
101922@@ -540,7 +541,7 @@ void cpu_vm_stats_fold(int cpu)
101923
101924 v = p->vm_stat_diff[i];
101925 p->vm_stat_diff[i] = 0;
101926- atomic_long_add(v, &zone->vm_stat[i]);
101927+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
101928 global_diff[i] += v;
101929 }
101930 }
101931@@ -560,8 +561,8 @@ void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset)
101932 if (pset->vm_stat_diff[i]) {
101933 int v = pset->vm_stat_diff[i];
101934 pset->vm_stat_diff[i] = 0;
101935- atomic_long_add(v, &zone->vm_stat[i]);
101936- atomic_long_add(v, &vm_stat[i]);
101937+ atomic_long_add_unchecked(v, &zone->vm_stat[i]);
101938+ atomic_long_add_unchecked(v, &vm_stat[i]);
101939 }
101940 }
101941 #endif
101942@@ -1293,10 +1294,22 @@ static void *vmstat_start(struct seq_file *m, loff_t *pos)
101943 stat_items_size += sizeof(struct vm_event_state);
101944 #endif
101945
101946- v = kmalloc(stat_items_size, GFP_KERNEL);
101947+ v = kzalloc(stat_items_size, GFP_KERNEL);
101948 m->private = v;
101949 if (!v)
101950 return ERR_PTR(-ENOMEM);
101951+
101952+#ifdef CONFIG_GRKERNSEC_PROC_ADD
101953+#if defined(CONFIG_GRKERNSEC_PROC_USER) || defined(CONFIG_GRKERNSEC_PROC_USERGROUP)
101954+ if (!uid_eq(current_uid(), GLOBAL_ROOT_UID)
101955+#ifdef CONFIG_GRKERNSEC_PROC_USERGROUP
101956+ && !in_group_p(grsec_proc_gid)
101957+#endif
101958+ )
101959+ return (unsigned long *)m->private + *pos;
101960+#endif
101961+#endif
101962+
101963 for (i = 0; i < NR_VM_ZONE_STAT_ITEMS; i++)
101964 v[i] = global_page_state(i);
101965 v += NR_VM_ZONE_STAT_ITEMS;
101966@@ -1528,10 +1541,16 @@ static int __init setup_vmstat(void)
101967 cpu_notifier_register_done();
101968 #endif
101969 #ifdef CONFIG_PROC_FS
101970- proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
101971- proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
101972- proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
101973- proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
101974+ {
101975+ mode_t gr_mode = S_IRUGO;
101976+#ifdef CONFIG_GRKERNSEC_PROC_ADD
101977+ gr_mode = S_IRUSR;
101978+#endif
101979+ proc_create("buddyinfo", gr_mode, NULL, &fragmentation_file_operations);
101980+ proc_create("pagetypeinfo", gr_mode, NULL, &pagetypeinfo_file_ops);
101981+ proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
101982+ proc_create("zoneinfo", gr_mode, NULL, &proc_zoneinfo_file_operations);
101983+ }
101984 #endif
101985 return 0;
101986 }
101987diff --git a/net/8021q/vlan.c b/net/8021q/vlan.c
101988index 64c6bed..b79a5de 100644
101989--- a/net/8021q/vlan.c
101990+++ b/net/8021q/vlan.c
101991@@ -481,7 +481,7 @@ out:
101992 return NOTIFY_DONE;
101993 }
101994
101995-static struct notifier_block vlan_notifier_block __read_mostly = {
101996+static struct notifier_block vlan_notifier_block = {
101997 .notifier_call = vlan_device_event,
101998 };
101999
102000@@ -556,8 +556,7 @@ static int vlan_ioctl_handler(struct net *net, void __user *arg)
102001 err = -EPERM;
102002 if (!ns_capable(net->user_ns, CAP_NET_ADMIN))
102003 break;
102004- if ((args.u.name_type >= 0) &&
102005- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
102006+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
102007 struct vlan_net *vn;
102008
102009 vn = net_generic(net, vlan_net_id);
102010diff --git a/net/8021q/vlan_netlink.c b/net/8021q/vlan_netlink.c
102011index c92b52f..006c052 100644
102012--- a/net/8021q/vlan_netlink.c
102013+++ b/net/8021q/vlan_netlink.c
102014@@ -245,7 +245,7 @@ static struct net *vlan_get_link_net(const struct net_device *dev)
102015 return dev_net(real_dev);
102016 }
102017
102018-struct rtnl_link_ops vlan_link_ops __read_mostly = {
102019+struct rtnl_link_ops vlan_link_ops = {
102020 .kind = "vlan",
102021 .maxtype = IFLA_VLAN_MAX,
102022 .policy = vlan_policy,
102023diff --git a/net/9p/client.c b/net/9p/client.c
102024index e86a9bea..e91f70e 100644
102025--- a/net/9p/client.c
102026+++ b/net/9p/client.c
102027@@ -596,7 +596,7 @@ static int p9_check_zc_errors(struct p9_client *c, struct p9_req_t *req,
102028 len - inline_len);
102029 } else {
102030 err = copy_from_user(ename + inline_len,
102031- uidata, len - inline_len);
102032+ (char __force_user *)uidata, len - inline_len);
102033 if (err) {
102034 err = -EFAULT;
102035 goto out_err;
102036@@ -1570,7 +1570,7 @@ p9_client_read(struct p9_fid *fid, char *data, char __user *udata, u64 offset,
102037 kernel_buf = 1;
102038 indata = data;
102039 } else
102040- indata = (__force char *)udata;
102041+ indata = (__force_kernel char *)udata;
102042 /*
102043 * response header len is 11
102044 * PDU Header(7) + IO Size (4)
102045@@ -1645,7 +1645,7 @@ p9_client_write(struct p9_fid *fid, char *data, const char __user *udata,
102046 kernel_buf = 1;
102047 odata = data;
102048 } else
102049- odata = (char *)udata;
102050+ odata = (char __force_kernel *)udata;
102051 req = p9_client_zc_rpc(clnt, P9_TWRITE, NULL, odata, 0, rsize,
102052 P9_ZC_HDR_SZ, kernel_buf, "dqd",
102053 fid->fid, offset, rsize);
102054diff --git a/net/9p/mod.c b/net/9p/mod.c
102055index 6ab36ae..6f1841b 100644
102056--- a/net/9p/mod.c
102057+++ b/net/9p/mod.c
102058@@ -84,7 +84,7 @@ static LIST_HEAD(v9fs_trans_list);
102059 void v9fs_register_trans(struct p9_trans_module *m)
102060 {
102061 spin_lock(&v9fs_trans_lock);
102062- list_add_tail(&m->list, &v9fs_trans_list);
102063+ pax_list_add_tail((struct list_head *)&m->list, &v9fs_trans_list);
102064 spin_unlock(&v9fs_trans_lock);
102065 }
102066 EXPORT_SYMBOL(v9fs_register_trans);
102067@@ -97,7 +97,7 @@ EXPORT_SYMBOL(v9fs_register_trans);
102068 void v9fs_unregister_trans(struct p9_trans_module *m)
102069 {
102070 spin_lock(&v9fs_trans_lock);
102071- list_del_init(&m->list);
102072+ pax_list_del_init((struct list_head *)&m->list);
102073 spin_unlock(&v9fs_trans_lock);
102074 }
102075 EXPORT_SYMBOL(v9fs_unregister_trans);
102076diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c
102077index 80d08f6..de63fd1 100644
102078--- a/net/9p/trans_fd.c
102079+++ b/net/9p/trans_fd.c
102080@@ -428,7 +428,7 @@ static int p9_fd_write(struct p9_client *client, void *v, int len)
102081 oldfs = get_fs();
102082 set_fs(get_ds());
102083 /* The cast to a user pointer is valid due to the set_fs() */
102084- ret = vfs_write(ts->wr, (__force void __user *)v, len, &ts->wr->f_pos);
102085+ ret = vfs_write(ts->wr, (void __force_user *)v, len, &ts->wr->f_pos);
102086 set_fs(oldfs);
102087
102088 if (ret <= 0 && ret != -ERESTARTSYS && ret != -EAGAIN)
102089diff --git a/net/appletalk/atalk_proc.c b/net/appletalk/atalk_proc.c
102090index af46bc4..f9adfcd 100644
102091--- a/net/appletalk/atalk_proc.c
102092+++ b/net/appletalk/atalk_proc.c
102093@@ -256,7 +256,7 @@ int __init atalk_proc_init(void)
102094 struct proc_dir_entry *p;
102095 int rc = -ENOMEM;
102096
102097- atalk_proc_dir = proc_mkdir("atalk", init_net.proc_net);
102098+ atalk_proc_dir = proc_mkdir_restrict("atalk", init_net.proc_net);
102099 if (!atalk_proc_dir)
102100 goto out;
102101
102102diff --git a/net/atm/atm_misc.c b/net/atm/atm_misc.c
102103index 876fbe8..8bbea9f 100644
102104--- a/net/atm/atm_misc.c
102105+++ b/net/atm/atm_misc.c
102106@@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int truesize)
102107 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
102108 return 1;
102109 atm_return(vcc, truesize);
102110- atomic_inc(&vcc->stats->rx_drop);
102111+ atomic_inc_unchecked(&vcc->stats->rx_drop);
102112 return 0;
102113 }
102114 EXPORT_SYMBOL(atm_charge);
102115@@ -39,7 +39,7 @@ struct sk_buff *atm_alloc_charge(struct atm_vcc *vcc, int pdu_size,
102116 }
102117 }
102118 atm_return(vcc, guess);
102119- atomic_inc(&vcc->stats->rx_drop);
102120+ atomic_inc_unchecked(&vcc->stats->rx_drop);
102121 return NULL;
102122 }
102123 EXPORT_SYMBOL(atm_alloc_charge);
102124@@ -86,7 +86,7 @@ EXPORT_SYMBOL(atm_pcr_goal);
102125
102126 void sonet_copy_stats(struct k_sonet_stats *from, struct sonet_stats *to)
102127 {
102128-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
102129+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
102130 __SONET_ITEMS
102131 #undef __HANDLE_ITEM
102132 }
102133@@ -94,7 +94,7 @@ EXPORT_SYMBOL(sonet_copy_stats);
102134
102135 void sonet_subtract_stats(struct k_sonet_stats *from, struct sonet_stats *to)
102136 {
102137-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
102138+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i,&from->i)
102139 __SONET_ITEMS
102140 #undef __HANDLE_ITEM
102141 }
102142diff --git a/net/atm/lec.c b/net/atm/lec.c
102143index 4b98f89..5a2f6cb 100644
102144--- a/net/atm/lec.c
102145+++ b/net/atm/lec.c
102146@@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
102147 }
102148
102149 static struct lane2_ops lane2_ops = {
102150- lane2_resolve, /* resolve, spec 3.1.3 */
102151- lane2_associate_req, /* associate_req, spec 3.1.4 */
102152- NULL /* associate indicator, spec 3.1.5 */
102153+ .resolve = lane2_resolve,
102154+ .associate_req = lane2_associate_req,
102155+ .associate_indicator = NULL
102156 };
102157
102158 static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
102159diff --git a/net/atm/lec.h b/net/atm/lec.h
102160index 4149db1..f2ab682 100644
102161--- a/net/atm/lec.h
102162+++ b/net/atm/lec.h
102163@@ -48,7 +48,7 @@ struct lane2_ops {
102164 const u8 *tlvs, u32 sizeoftlvs);
102165 void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
102166 const u8 *tlvs, u32 sizeoftlvs);
102167-};
102168+} __no_const;
102169
102170 /*
102171 * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
102172diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c
102173index d1b2d9a..d549f7f 100644
102174--- a/net/atm/mpoa_caches.c
102175+++ b/net/atm/mpoa_caches.c
102176@@ -535,30 +535,30 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
102177
102178
102179 static struct in_cache_ops ingress_ops = {
102180- in_cache_add_entry, /* add_entry */
102181- in_cache_get, /* get */
102182- in_cache_get_with_mask, /* get_with_mask */
102183- in_cache_get_by_vcc, /* get_by_vcc */
102184- in_cache_put, /* put */
102185- in_cache_remove_entry, /* remove_entry */
102186- cache_hit, /* cache_hit */
102187- clear_count_and_expired, /* clear_count */
102188- check_resolving_entries, /* check_resolving */
102189- refresh_entries, /* refresh */
102190- in_destroy_cache /* destroy_cache */
102191+ .add_entry = in_cache_add_entry,
102192+ .get = in_cache_get,
102193+ .get_with_mask = in_cache_get_with_mask,
102194+ .get_by_vcc = in_cache_get_by_vcc,
102195+ .put = in_cache_put,
102196+ .remove_entry = in_cache_remove_entry,
102197+ .cache_hit = cache_hit,
102198+ .clear_count = clear_count_and_expired,
102199+ .check_resolving = check_resolving_entries,
102200+ .refresh = refresh_entries,
102201+ .destroy_cache = in_destroy_cache
102202 };
102203
102204 static struct eg_cache_ops egress_ops = {
102205- eg_cache_add_entry, /* add_entry */
102206- eg_cache_get_by_cache_id, /* get_by_cache_id */
102207- eg_cache_get_by_tag, /* get_by_tag */
102208- eg_cache_get_by_vcc, /* get_by_vcc */
102209- eg_cache_get_by_src_ip, /* get_by_src_ip */
102210- eg_cache_put, /* put */
102211- eg_cache_remove_entry, /* remove_entry */
102212- update_eg_cache_entry, /* update */
102213- clear_expired, /* clear_expired */
102214- eg_destroy_cache /* destroy_cache */
102215+ .add_entry = eg_cache_add_entry,
102216+ .get_by_cache_id = eg_cache_get_by_cache_id,
102217+ .get_by_tag = eg_cache_get_by_tag,
102218+ .get_by_vcc = eg_cache_get_by_vcc,
102219+ .get_by_src_ip = eg_cache_get_by_src_ip,
102220+ .put = eg_cache_put,
102221+ .remove_entry = eg_cache_remove_entry,
102222+ .update = update_eg_cache_entry,
102223+ .clear_expired = clear_expired,
102224+ .destroy_cache = eg_destroy_cache
102225 };
102226
102227
102228diff --git a/net/atm/proc.c b/net/atm/proc.c
102229index bbb6461..cf04016 100644
102230--- a/net/atm/proc.c
102231+++ b/net/atm/proc.c
102232@@ -45,9 +45,9 @@ static void add_stats(struct seq_file *seq, const char *aal,
102233 const struct k_atm_aal_stats *stats)
102234 {
102235 seq_printf(seq, "%s ( %d %d %d %d %d )", aal,
102236- atomic_read(&stats->tx), atomic_read(&stats->tx_err),
102237- atomic_read(&stats->rx), atomic_read(&stats->rx_err),
102238- atomic_read(&stats->rx_drop));
102239+ atomic_read_unchecked(&stats->tx),atomic_read_unchecked(&stats->tx_err),
102240+ atomic_read_unchecked(&stats->rx),atomic_read_unchecked(&stats->rx_err),
102241+ atomic_read_unchecked(&stats->rx_drop));
102242 }
102243
102244 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
102245diff --git a/net/atm/resources.c b/net/atm/resources.c
102246index 0447d5d..3cf4728 100644
102247--- a/net/atm/resources.c
102248+++ b/net/atm/resources.c
102249@@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
102250 static void copy_aal_stats(struct k_atm_aal_stats *from,
102251 struct atm_aal_stats *to)
102252 {
102253-#define __HANDLE_ITEM(i) to->i = atomic_read(&from->i)
102254+#define __HANDLE_ITEM(i) to->i = atomic_read_unchecked(&from->i)
102255 __AAL_STAT_ITEMS
102256 #undef __HANDLE_ITEM
102257 }
102258@@ -168,7 +168,7 @@ static void copy_aal_stats(struct k_atm_aal_stats *from,
102259 static void subtract_aal_stats(struct k_atm_aal_stats *from,
102260 struct atm_aal_stats *to)
102261 {
102262-#define __HANDLE_ITEM(i) atomic_sub(to->i, &from->i)
102263+#define __HANDLE_ITEM(i) atomic_sub_unchecked(to->i, &from->i)
102264 __AAL_STAT_ITEMS
102265 #undef __HANDLE_ITEM
102266 }
102267diff --git a/net/ax25/sysctl_net_ax25.c b/net/ax25/sysctl_net_ax25.c
102268index 919a5ce..cc6b444 100644
102269--- a/net/ax25/sysctl_net_ax25.c
102270+++ b/net/ax25/sysctl_net_ax25.c
102271@@ -152,7 +152,7 @@ int ax25_register_dev_sysctl(ax25_dev *ax25_dev)
102272 {
102273 char path[sizeof("net/ax25/") + IFNAMSIZ];
102274 int k;
102275- struct ctl_table *table;
102276+ ctl_table_no_const *table;
102277
102278 table = kmemdup(ax25_param_table, sizeof(ax25_param_table), GFP_KERNEL);
102279 if (!table)
102280diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
102281index 00e00e0..710fcd2 100644
102282--- a/net/batman-adv/bat_iv_ogm.c
102283+++ b/net/batman-adv/bat_iv_ogm.c
102284@@ -312,7 +312,7 @@ static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface)
102285
102286 /* randomize initial seqno to avoid collision */
102287 get_random_bytes(&random_seqno, sizeof(random_seqno));
102288- atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno);
102289+ atomic_set_unchecked(&hard_iface->bat_iv.ogm_seqno, random_seqno);
102290
102291 hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN;
102292 ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC);
102293@@ -917,9 +917,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface)
102294 batadv_ogm_packet->tvlv_len = htons(tvlv_len);
102295
102296 /* change sequence number to network order */
102297- seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno);
102298+ seqno = (uint32_t)atomic_read_unchecked(&hard_iface->bat_iv.ogm_seqno);
102299 batadv_ogm_packet->seqno = htonl(seqno);
102300- atomic_inc(&hard_iface->bat_iv.ogm_seqno);
102301+ atomic_inc_unchecked(&hard_iface->bat_iv.ogm_seqno);
102302
102303 batadv_iv_ogm_slide_own_bcast_window(hard_iface);
102304
102305@@ -1596,7 +1596,7 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset,
102306 return;
102307
102308 /* could be changed by schedule_own_packet() */
102309- if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno);
102310+ if_incoming_seqno = atomic_read_unchecked(&if_incoming->bat_iv.ogm_seqno);
102311
102312 if (ogm_packet->flags & BATADV_DIRECTLINK)
102313 has_directlink_flag = true;
102314diff --git a/net/batman-adv/fragmentation.c b/net/batman-adv/fragmentation.c
102315index 3d1dcaa..4699f4e 100644
102316--- a/net/batman-adv/fragmentation.c
102317+++ b/net/batman-adv/fragmentation.c
102318@@ -449,7 +449,7 @@ bool batadv_frag_send_packet(struct sk_buff *skb,
102319 frag_header.packet_type = BATADV_UNICAST_FRAG;
102320 frag_header.version = BATADV_COMPAT_VERSION;
102321 frag_header.ttl = BATADV_TTL;
102322- frag_header.seqno = htons(atomic_inc_return(&bat_priv->frag_seqno));
102323+ frag_header.seqno = htons(atomic_inc_return_unchecked(&bat_priv->frag_seqno));
102324 frag_header.reserved = 0;
102325 frag_header.no = 0;
102326 frag_header.total_size = htons(skb->len);
102327diff --git a/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
102328index 5ec31d7..e371631 100644
102329--- a/net/batman-adv/soft-interface.c
102330+++ b/net/batman-adv/soft-interface.c
102331@@ -295,7 +295,7 @@ send:
102332 primary_if->net_dev->dev_addr);
102333
102334 /* set broadcast sequence number */
102335- seqno = atomic_inc_return(&bat_priv->bcast_seqno);
102336+ seqno = atomic_inc_return_unchecked(&bat_priv->bcast_seqno);
102337 bcast_packet->seqno = htonl(seqno);
102338
102339 batadv_add_bcast_packet_to_list(bat_priv, skb, brd_delay);
102340@@ -760,7 +760,7 @@ static int batadv_softif_init_late(struct net_device *dev)
102341 atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN);
102342
102343 atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
102344- atomic_set(&bat_priv->bcast_seqno, 1);
102345+ atomic_set_unchecked(&bat_priv->bcast_seqno, 1);
102346 atomic_set(&bat_priv->tt.vn, 0);
102347 atomic_set(&bat_priv->tt.local_changes, 0);
102348 atomic_set(&bat_priv->tt.ogm_append_cnt, 0);
102349@@ -774,7 +774,7 @@ static int batadv_softif_init_late(struct net_device *dev)
102350
102351 /* randomize initial seqno to avoid collision */
102352 get_random_bytes(&random_seqno, sizeof(random_seqno));
102353- atomic_set(&bat_priv->frag_seqno, random_seqno);
102354+ atomic_set_unchecked(&bat_priv->frag_seqno, random_seqno);
102355
102356 bat_priv->primary_if = NULL;
102357 bat_priv->num_ifaces = 0;
102358@@ -982,7 +982,7 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
102359 return 0;
102360 }
102361
102362-struct rtnl_link_ops batadv_link_ops __read_mostly = {
102363+struct rtnl_link_ops batadv_link_ops = {
102364 .kind = "batadv",
102365 .priv_size = sizeof(struct batadv_priv),
102366 .setup = batadv_softif_init_early,
102367diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
102368index 9398c3f..0e79657 100644
102369--- a/net/batman-adv/types.h
102370+++ b/net/batman-adv/types.h
102371@@ -67,7 +67,7 @@ enum batadv_dhcp_recipient {
102372 struct batadv_hard_iface_bat_iv {
102373 unsigned char *ogm_buff;
102374 int ogm_buff_len;
102375- atomic_t ogm_seqno;
102376+ atomic_unchecked_t ogm_seqno;
102377 };
102378
102379 /**
102380@@ -766,7 +766,7 @@ struct batadv_priv {
102381 atomic_t bonding;
102382 atomic_t fragmentation;
102383 atomic_t packet_size_max;
102384- atomic_t frag_seqno;
102385+ atomic_unchecked_t frag_seqno;
102386 #ifdef CONFIG_BATMAN_ADV_BLA
102387 atomic_t bridge_loop_avoidance;
102388 #endif
102389@@ -785,7 +785,7 @@ struct batadv_priv {
102390 #endif
102391 uint32_t isolation_mark;
102392 uint32_t isolation_mark_mask;
102393- atomic_t bcast_seqno;
102394+ atomic_unchecked_t bcast_seqno;
102395 atomic_t bcast_queue_left;
102396 atomic_t batman_queue_left;
102397 char num_ifaces;
102398diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
102399index 1d65c5b..43e55fd 100644
102400--- a/net/bluetooth/hci_sock.c
102401+++ b/net/bluetooth/hci_sock.c
102402@@ -1042,7 +1042,7 @@ static int hci_sock_setsockopt(struct socket *sock, int level, int optname,
102403 uf.event_mask[1] = *((u32 *) f->event_mask + 1);
102404 }
102405
102406- len = min_t(unsigned int, len, sizeof(uf));
102407+ len = min((size_t)len, sizeof(uf));
102408 if (copy_from_user(&uf, optval, len)) {
102409 err = -EFAULT;
102410 break;
102411diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
102412index 6ba33f9..4afc26f 100644
102413--- a/net/bluetooth/l2cap_core.c
102414+++ b/net/bluetooth/l2cap_core.c
102415@@ -3534,8 +3534,10 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
102416 break;
102417
102418 case L2CAP_CONF_RFC:
102419- if (olen == sizeof(rfc))
102420- memcpy(&rfc, (void *)val, olen);
102421+ if (olen != sizeof(rfc))
102422+ break;
102423+
102424+ memcpy(&rfc, (void *)val, olen);
102425
102426 if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) &&
102427 rfc.mode != chan->mode)
102428diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
102429index 60694f0..32623ed 100644
102430--- a/net/bluetooth/l2cap_sock.c
102431+++ b/net/bluetooth/l2cap_sock.c
102432@@ -633,7 +633,8 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
102433 struct sock *sk = sock->sk;
102434 struct l2cap_chan *chan = l2cap_pi(sk)->chan;
102435 struct l2cap_options opts;
102436- int len, err = 0;
102437+ int err = 0;
102438+ size_t len = optlen;
102439 u32 opt;
102440
102441 BT_DBG("sk %p", sk);
102442@@ -660,7 +661,7 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
102443 opts.max_tx = chan->max_tx;
102444 opts.txwin_size = chan->tx_win;
102445
102446- len = min_t(unsigned int, sizeof(opts), optlen);
102447+ len = min(sizeof(opts), len);
102448 if (copy_from_user((char *) &opts, optval, len)) {
102449 err = -EFAULT;
102450 break;
102451@@ -747,7 +748,8 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
102452 struct bt_security sec;
102453 struct bt_power pwr;
102454 struct l2cap_conn *conn;
102455- int len, err = 0;
102456+ int err = 0;
102457+ size_t len = optlen;
102458 u32 opt;
102459
102460 BT_DBG("sk %p", sk);
102461@@ -771,7 +773,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
102462
102463 sec.level = BT_SECURITY_LOW;
102464
102465- len = min_t(unsigned int, sizeof(sec), optlen);
102466+ len = min(sizeof(sec), len);
102467 if (copy_from_user((char *) &sec, optval, len)) {
102468 err = -EFAULT;
102469 break;
102470@@ -867,7 +869,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
102471
102472 pwr.force_active = BT_POWER_FORCE_ACTIVE_ON;
102473
102474- len = min_t(unsigned int, sizeof(pwr), optlen);
102475+ len = min(sizeof(pwr), len);
102476 if (copy_from_user((char *) &pwr, optval, len)) {
102477 err = -EFAULT;
102478 break;
102479diff --git a/net/bluetooth/rfcomm/sock.c b/net/bluetooth/rfcomm/sock.c
102480index 3c6d2c8..6afc970 100644
102481--- a/net/bluetooth/rfcomm/sock.c
102482+++ b/net/bluetooth/rfcomm/sock.c
102483@@ -686,7 +686,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
102484 struct sock *sk = sock->sk;
102485 struct bt_security sec;
102486 int err = 0;
102487- size_t len;
102488+ size_t len = optlen;
102489 u32 opt;
102490
102491 BT_DBG("sk %p", sk);
102492@@ -708,7 +708,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname, c
102493
102494 sec.level = BT_SECURITY_LOW;
102495
102496- len = min_t(unsigned int, sizeof(sec), optlen);
102497+ len = min(sizeof(sec), len);
102498 if (copy_from_user((char *) &sec, optval, len)) {
102499 err = -EFAULT;
102500 break;
102501diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
102502index 8e385a0..a5bdd8e 100644
102503--- a/net/bluetooth/rfcomm/tty.c
102504+++ b/net/bluetooth/rfcomm/tty.c
102505@@ -752,7 +752,7 @@ static int rfcomm_tty_open(struct tty_struct *tty, struct file *filp)
102506 BT_DBG("tty %p id %d", tty, tty->index);
102507
102508 BT_DBG("dev %p dst %pMR channel %d opened %d", dev, &dev->dst,
102509- dev->channel, dev->port.count);
102510+ dev->channel, atomic_read(&dev->port.count));
102511
102512 err = tty_port_open(&dev->port, tty, filp);
102513 if (err)
102514@@ -775,7 +775,7 @@ static void rfcomm_tty_close(struct tty_struct *tty, struct file *filp)
102515 struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data;
102516
102517 BT_DBG("tty %p dev %p dlc %p opened %d", tty, dev, dev->dlc,
102518- dev->port.count);
102519+ atomic_read(&dev->port.count));
102520
102521 tty_port_close(&dev->port, tty, filp);
102522 }
102523diff --git a/net/bridge/br_netlink.c b/net/bridge/br_netlink.c
102524index 4fbcea0..69a6786 100644
102525--- a/net/bridge/br_netlink.c
102526+++ b/net/bridge/br_netlink.c
102527@@ -726,7 +726,7 @@ static struct rtnl_af_ops br_af_ops __read_mostly = {
102528 .get_link_af_size = br_get_link_af_size,
102529 };
102530
102531-struct rtnl_link_ops br_link_ops __read_mostly = {
102532+struct rtnl_link_ops br_link_ops = {
102533 .kind = "bridge",
102534 .priv_size = sizeof(struct net_bridge),
102535 .setup = br_dev_setup,
102536diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
102537index 91180a7..1301daa 100644
102538--- a/net/bridge/netfilter/ebtables.c
102539+++ b/net/bridge/netfilter/ebtables.c
102540@@ -1533,7 +1533,7 @@ static int do_ebt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
102541 tmp.valid_hooks = t->table->valid_hooks;
102542 }
102543 mutex_unlock(&ebt_mutex);
102544- if (copy_to_user(user, &tmp, *len) != 0) {
102545+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
102546 BUGPRINT("c2u Didn't work\n");
102547 ret = -EFAULT;
102548 break;
102549@@ -2339,7 +2339,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
102550 goto out;
102551 tmp.valid_hooks = t->valid_hooks;
102552
102553- if (copy_to_user(user, &tmp, *len) != 0) {
102554+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
102555 ret = -EFAULT;
102556 break;
102557 }
102558@@ -2350,7 +2350,7 @@ static int compat_do_ebt_get_ctl(struct sock *sk, int cmd,
102559 tmp.entries_size = t->table->entries_size;
102560 tmp.valid_hooks = t->table->valid_hooks;
102561
102562- if (copy_to_user(user, &tmp, *len) != 0) {
102563+ if (*len > sizeof(tmp) || copy_to_user(user, &tmp, *len) != 0) {
102564 ret = -EFAULT;
102565 break;
102566 }
102567diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
102568index f5afda1..dcf770a 100644
102569--- a/net/caif/cfctrl.c
102570+++ b/net/caif/cfctrl.c
102571@@ -10,6 +10,7 @@
102572 #include <linux/spinlock.h>
102573 #include <linux/slab.h>
102574 #include <linux/pkt_sched.h>
102575+#include <linux/sched.h>
102576 #include <net/caif/caif_layer.h>
102577 #include <net/caif/cfpkt.h>
102578 #include <net/caif/cfctrl.h>
102579@@ -43,8 +44,8 @@ struct cflayer *cfctrl_create(void)
102580 memset(&dev_info, 0, sizeof(dev_info));
102581 dev_info.id = 0xff;
102582 cfsrvl_init(&this->serv, 0, &dev_info, false);
102583- atomic_set(&this->req_seq_no, 1);
102584- atomic_set(&this->rsp_seq_no, 1);
102585+ atomic_set_unchecked(&this->req_seq_no, 1);
102586+ atomic_set_unchecked(&this->rsp_seq_no, 1);
102587 this->serv.layer.receive = cfctrl_recv;
102588 sprintf(this->serv.layer.name, "ctrl");
102589 this->serv.layer.ctrlcmd = cfctrl_ctrlcmd;
102590@@ -130,8 +131,8 @@ static void cfctrl_insert_req(struct cfctrl *ctrl,
102591 struct cfctrl_request_info *req)
102592 {
102593 spin_lock_bh(&ctrl->info_list_lock);
102594- atomic_inc(&ctrl->req_seq_no);
102595- req->sequence_no = atomic_read(&ctrl->req_seq_no);
102596+ atomic_inc_unchecked(&ctrl->req_seq_no);
102597+ req->sequence_no = atomic_read_unchecked(&ctrl->req_seq_no);
102598 list_add_tail(&req->list, &ctrl->list);
102599 spin_unlock_bh(&ctrl->info_list_lock);
102600 }
102601@@ -149,7 +150,7 @@ static struct cfctrl_request_info *cfctrl_remove_req(struct cfctrl *ctrl,
102602 if (p != first)
102603 pr_warn("Requests are not received in order\n");
102604
102605- atomic_set(&ctrl->rsp_seq_no,
102606+ atomic_set_unchecked(&ctrl->rsp_seq_no,
102607 p->sequence_no);
102608 list_del(&p->list);
102609 goto out;
102610diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c
102611index 67a4a36..8d28068 100644
102612--- a/net/caif/chnl_net.c
102613+++ b/net/caif/chnl_net.c
102614@@ -515,7 +515,7 @@ static const struct nla_policy ipcaif_policy[IFLA_CAIF_MAX + 1] = {
102615 };
102616
102617
102618-static struct rtnl_link_ops ipcaif_link_ops __read_mostly = {
102619+static struct rtnl_link_ops ipcaif_link_ops = {
102620 .kind = "caif",
102621 .priv_size = sizeof(struct chnl_net),
102622 .setup = ipcaif_net_setup,
102623diff --git a/net/can/af_can.c b/net/can/af_can.c
102624index 32d710e..93bcf05 100644
102625--- a/net/can/af_can.c
102626+++ b/net/can/af_can.c
102627@@ -884,7 +884,7 @@ static const struct net_proto_family can_family_ops = {
102628 };
102629
102630 /* notifier block for netdevice event */
102631-static struct notifier_block can_netdev_notifier __read_mostly = {
102632+static struct notifier_block can_netdev_notifier = {
102633 .notifier_call = can_notifier,
102634 };
102635
102636diff --git a/net/can/bcm.c b/net/can/bcm.c
102637index ee9ffd9..dfdf3d4 100644
102638--- a/net/can/bcm.c
102639+++ b/net/can/bcm.c
102640@@ -1619,7 +1619,7 @@ static int __init bcm_module_init(void)
102641 }
102642
102643 /* create /proc/net/can-bcm directory */
102644- proc_dir = proc_mkdir("can-bcm", init_net.proc_net);
102645+ proc_dir = proc_mkdir_restrict("can-bcm", init_net.proc_net);
102646 return 0;
102647 }
102648
102649diff --git a/net/can/gw.c b/net/can/gw.c
102650index a6f448e..5902171 100644
102651--- a/net/can/gw.c
102652+++ b/net/can/gw.c
102653@@ -80,7 +80,6 @@ MODULE_PARM_DESC(max_hops,
102654 "default: " __stringify(CGW_DEFAULT_HOPS) ")");
102655
102656 static HLIST_HEAD(cgw_list);
102657-static struct notifier_block notifier;
102658
102659 static struct kmem_cache *cgw_cache __read_mostly;
102660
102661@@ -948,6 +947,10 @@ static int cgw_remove_job(struct sk_buff *skb, struct nlmsghdr *nlh)
102662 return err;
102663 }
102664
102665+static struct notifier_block notifier = {
102666+ .notifier_call = cgw_notifier
102667+};
102668+
102669 static __init int cgw_module_init(void)
102670 {
102671 /* sanitize given module parameter */
102672@@ -963,7 +966,6 @@ static __init int cgw_module_init(void)
102673 return -ENOMEM;
102674
102675 /* set notifier */
102676- notifier.notifier_call = cgw_notifier;
102677 register_netdevice_notifier(&notifier);
102678
102679 if (__rtnl_register(PF_CAN, RTM_GETROUTE, NULL, cgw_dump_jobs, NULL)) {
102680diff --git a/net/can/proc.c b/net/can/proc.c
102681index 1a19b98..df2b4ec 100644
102682--- a/net/can/proc.c
102683+++ b/net/can/proc.c
102684@@ -514,7 +514,7 @@ static void can_remove_proc_readentry(const char *name)
102685 void can_init_proc(void)
102686 {
102687 /* create /proc/net/can directory */
102688- can_dir = proc_mkdir("can", init_net.proc_net);
102689+ can_dir = proc_mkdir_restrict("can", init_net.proc_net);
102690
102691 if (!can_dir) {
102692 printk(KERN_INFO "can: failed to create /proc/net/can . "
102693diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c
102694index a9f4ae4..ee19b92 100644
102695--- a/net/ceph/messenger.c
102696+++ b/net/ceph/messenger.c
102697@@ -188,7 +188,7 @@ static void con_fault(struct ceph_connection *con);
102698 #define MAX_ADDR_STR_LEN 64 /* 54 is enough */
102699
102700 static char addr_str[ADDR_STR_COUNT][MAX_ADDR_STR_LEN];
102701-static atomic_t addr_str_seq = ATOMIC_INIT(0);
102702+static atomic_unchecked_t addr_str_seq = ATOMIC_INIT(0);
102703
102704 static struct page *zero_page; /* used in certain error cases */
102705
102706@@ -199,7 +199,7 @@ const char *ceph_pr_addr(const struct sockaddr_storage *ss)
102707 struct sockaddr_in *in4 = (struct sockaddr_in *) ss;
102708 struct sockaddr_in6 *in6 = (struct sockaddr_in6 *) ss;
102709
102710- i = atomic_inc_return(&addr_str_seq) & ADDR_STR_COUNT_MASK;
102711+ i = atomic_inc_return_unchecked(&addr_str_seq) & ADDR_STR_COUNT_MASK;
102712 s = addr_str[i];
102713
102714 switch (ss->ss_family) {
102715diff --git a/net/compat.c b/net/compat.c
102716index f7bd286..76ea56a 100644
102717--- a/net/compat.c
102718+++ b/net/compat.c
102719@@ -100,20 +100,20 @@ ssize_t get_compat_msghdr(struct msghdr *kmsg,
102720
102721 #define CMSG_COMPAT_FIRSTHDR(msg) \
102722 (((msg)->msg_controllen) >= sizeof(struct compat_cmsghdr) ? \
102723- (struct compat_cmsghdr __user *)((msg)->msg_control) : \
102724+ (struct compat_cmsghdr __force_user *)((msg)->msg_control) : \
102725 (struct compat_cmsghdr __user *)NULL)
102726
102727 #define CMSG_COMPAT_OK(ucmlen, ucmsg, mhdr) \
102728 ((ucmlen) >= sizeof(struct compat_cmsghdr) && \
102729 (ucmlen) <= (unsigned long) \
102730 ((mhdr)->msg_controllen - \
102731- ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
102732+ ((char __force_kernel *)(ucmsg) - (char *)(mhdr)->msg_control)))
102733
102734 static inline struct compat_cmsghdr __user *cmsg_compat_nxthdr(struct msghdr *msg,
102735 struct compat_cmsghdr __user *cmsg, int cmsg_len)
102736 {
102737 char __user *ptr = (char __user *)cmsg + CMSG_COMPAT_ALIGN(cmsg_len);
102738- if ((unsigned long)(ptr + 1 - (char __user *)msg->msg_control) >
102739+ if ((unsigned long)(ptr + 1 - (char __force_user *)msg->msg_control) >
102740 msg->msg_controllen)
102741 return NULL;
102742 return (struct compat_cmsghdr __user *)ptr;
102743@@ -203,7 +203,7 @@ Efault:
102744
102745 int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *data)
102746 {
102747- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
102748+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
102749 struct compat_cmsghdr cmhdr;
102750 struct compat_timeval ctv;
102751 struct compat_timespec cts[3];
102752@@ -259,7 +259,7 @@ int put_cmsg_compat(struct msghdr *kmsg, int level, int type, int len, void *dat
102753
102754 void scm_detach_fds_compat(struct msghdr *kmsg, struct scm_cookie *scm)
102755 {
102756- struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __user *) kmsg->msg_control;
102757+ struct compat_cmsghdr __user *cm = (struct compat_cmsghdr __force_user *) kmsg->msg_control;
102758 int fdmax = (kmsg->msg_controllen - sizeof(struct compat_cmsghdr)) / sizeof(int);
102759 int fdnum = scm->fp->count;
102760 struct file **fp = scm->fp->fp;
102761@@ -347,7 +347,7 @@ static int do_set_sock_timeout(struct socket *sock, int level,
102762 return -EFAULT;
102763 old_fs = get_fs();
102764 set_fs(KERNEL_DS);
102765- err = sock_setsockopt(sock, level, optname, (char *)&ktime, sizeof(ktime));
102766+ err = sock_setsockopt(sock, level, optname, (char __force_user *)&ktime, sizeof(ktime));
102767 set_fs(old_fs);
102768
102769 return err;
102770@@ -408,7 +408,7 @@ static int do_get_sock_timeout(struct socket *sock, int level, int optname,
102771 len = sizeof(ktime);
102772 old_fs = get_fs();
102773 set_fs(KERNEL_DS);
102774- err = sock_getsockopt(sock, level, optname, (char *) &ktime, &len);
102775+ err = sock_getsockopt(sock, level, optname, (char __force_user *) &ktime, (int __force_user *)&len);
102776 set_fs(old_fs);
102777
102778 if (!err) {
102779@@ -551,7 +551,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
102780 case MCAST_JOIN_GROUP:
102781 case MCAST_LEAVE_GROUP:
102782 {
102783- struct compat_group_req __user *gr32 = (void *)optval;
102784+ struct compat_group_req __user *gr32 = (void __user *)optval;
102785 struct group_req __user *kgr =
102786 compat_alloc_user_space(sizeof(struct group_req));
102787 u32 interface;
102788@@ -572,7 +572,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
102789 case MCAST_BLOCK_SOURCE:
102790 case MCAST_UNBLOCK_SOURCE:
102791 {
102792- struct compat_group_source_req __user *gsr32 = (void *)optval;
102793+ struct compat_group_source_req __user *gsr32 = (void __user *)optval;
102794 struct group_source_req __user *kgsr = compat_alloc_user_space(
102795 sizeof(struct group_source_req));
102796 u32 interface;
102797@@ -593,7 +593,7 @@ int compat_mc_setsockopt(struct sock *sock, int level, int optname,
102798 }
102799 case MCAST_MSFILTER:
102800 {
102801- struct compat_group_filter __user *gf32 = (void *)optval;
102802+ struct compat_group_filter __user *gf32 = (void __user *)optval;
102803 struct group_filter __user *kgf;
102804 u32 interface, fmode, numsrc;
102805
102806@@ -631,7 +631,7 @@ int compat_mc_getsockopt(struct sock *sock, int level, int optname,
102807 char __user *optval, int __user *optlen,
102808 int (*getsockopt)(struct sock *, int, int, char __user *, int __user *))
102809 {
102810- struct compat_group_filter __user *gf32 = (void *)optval;
102811+ struct compat_group_filter __user *gf32 = (void __user *)optval;
102812 struct group_filter __user *kgf;
102813 int __user *koptlen;
102814 u32 interface, fmode, numsrc;
102815@@ -775,7 +775,7 @@ COMPAT_SYSCALL_DEFINE2(socketcall, int, call, u32 __user *, args)
102816
102817 if (call < SYS_SOCKET || call > SYS_SENDMMSG)
102818 return -EINVAL;
102819- if (copy_from_user(a, args, nas[call]))
102820+ if (nas[call] > sizeof a || copy_from_user(a, args, nas[call]))
102821 return -EFAULT;
102822 a0 = a[0];
102823 a1 = a[1];
102824diff --git a/net/core/datagram.c b/net/core/datagram.c
102825index df493d6..1145766 100644
102826--- a/net/core/datagram.c
102827+++ b/net/core/datagram.c
102828@@ -302,7 +302,7 @@ int skb_kill_datagram(struct sock *sk, struct sk_buff *skb, unsigned int flags)
102829 }
102830
102831 kfree_skb(skb);
102832- atomic_inc(&sk->sk_drops);
102833+ atomic_inc_unchecked(&sk->sk_drops);
102834 sk_mem_reclaim_partial(sk);
102835
102836 return err;
102837diff --git a/net/core/dev.c b/net/core/dev.c
102838index 22a53ac..1d19af7 100644
102839--- a/net/core/dev.c
102840+++ b/net/core/dev.c
102841@@ -1681,14 +1681,14 @@ int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb)
102842 {
102843 if (skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY) {
102844 if (skb_copy_ubufs(skb, GFP_ATOMIC)) {
102845- atomic_long_inc(&dev->rx_dropped);
102846+ atomic_long_inc_unchecked(&dev->rx_dropped);
102847 kfree_skb(skb);
102848 return NET_RX_DROP;
102849 }
102850 }
102851
102852 if (unlikely(!is_skb_forwardable(dev, skb))) {
102853- atomic_long_inc(&dev->rx_dropped);
102854+ atomic_long_inc_unchecked(&dev->rx_dropped);
102855 kfree_skb(skb);
102856 return NET_RX_DROP;
102857 }
102858@@ -2987,7 +2987,7 @@ recursion_alert:
102859 drop:
102860 rcu_read_unlock_bh();
102861
102862- atomic_long_inc(&dev->tx_dropped);
102863+ atomic_long_inc_unchecked(&dev->tx_dropped);
102864 kfree_skb_list(skb);
102865 return rc;
102866 out:
102867@@ -3336,7 +3336,7 @@ enqueue:
102868
102869 local_irq_restore(flags);
102870
102871- atomic_long_inc(&skb->dev->rx_dropped);
102872+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
102873 kfree_skb(skb);
102874 return NET_RX_DROP;
102875 }
102876@@ -3413,7 +3413,7 @@ int netif_rx_ni(struct sk_buff *skb)
102877 }
102878 EXPORT_SYMBOL(netif_rx_ni);
102879
102880-static void net_tx_action(struct softirq_action *h)
102881+static __latent_entropy void net_tx_action(void)
102882 {
102883 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
102884
102885@@ -3751,7 +3751,7 @@ ncls:
102886 ret = pt_prev->func(skb, skb->dev, pt_prev, orig_dev);
102887 } else {
102888 drop:
102889- atomic_long_inc(&skb->dev->rx_dropped);
102890+ atomic_long_inc_unchecked(&skb->dev->rx_dropped);
102891 kfree_skb(skb);
102892 /* Jamal, now you will not able to escape explaining
102893 * me how you were going to use this. :-)
102894@@ -4640,7 +4640,7 @@ out_unlock:
102895 return work;
102896 }
102897
102898-static void net_rx_action(struct softirq_action *h)
102899+static __latent_entropy void net_rx_action(void)
102900 {
102901 struct softnet_data *sd = this_cpu_ptr(&softnet_data);
102902 unsigned long time_limit = jiffies + 2;
102903@@ -6676,8 +6676,8 @@ struct rtnl_link_stats64 *dev_get_stats(struct net_device *dev,
102904 } else {
102905 netdev_stats_to_stats64(storage, &dev->stats);
102906 }
102907- storage->rx_dropped += atomic_long_read(&dev->rx_dropped);
102908- storage->tx_dropped += atomic_long_read(&dev->tx_dropped);
102909+ storage->rx_dropped += atomic_long_read_unchecked(&dev->rx_dropped);
102910+ storage->tx_dropped += atomic_long_read_unchecked(&dev->tx_dropped);
102911 return storage;
102912 }
102913 EXPORT_SYMBOL(dev_get_stats);
102914diff --git a/net/core/dev_ioctl.c b/net/core/dev_ioctl.c
102915index b94b1d2..da3ed7c 100644
102916--- a/net/core/dev_ioctl.c
102917+++ b/net/core/dev_ioctl.c
102918@@ -368,8 +368,13 @@ void dev_load(struct net *net, const char *name)
102919 no_module = !dev;
102920 if (no_module && capable(CAP_NET_ADMIN))
102921 no_module = request_module("netdev-%s", name);
102922- if (no_module && capable(CAP_SYS_MODULE))
102923+ if (no_module && capable(CAP_SYS_MODULE)) {
102924+#ifdef CONFIG_GRKERNSEC_MODHARDEN
102925+ ___request_module(true, "grsec_modharden_netdev", "%s", name);
102926+#else
102927 request_module("%s", name);
102928+#endif
102929+ }
102930 }
102931 EXPORT_SYMBOL(dev_load);
102932
102933diff --git a/net/core/filter.c b/net/core/filter.c
102934index f6bdc2b..76eba8e 100644
102935--- a/net/core/filter.c
102936+++ b/net/core/filter.c
102937@@ -533,7 +533,11 @@ do_pass:
102938
102939 /* Unknown instruction. */
102940 default:
102941- goto err;
102942+ WARN(1, KERN_ALERT "Unknown sock filter code:%u jt:%u tf:%u k:%u\n",
102943+ fp->code, fp->jt, fp->jf, fp->k);
102944+ kfree(addrs);
102945+ BUG();
102946+ return -EINVAL;
102947 }
102948
102949 insn++;
102950@@ -577,7 +581,7 @@ static int check_load_and_stores(const struct sock_filter *filter, int flen)
102951 u16 *masks, memvalid = 0; /* One bit per cell, 16 cells */
102952 int pc, ret = 0;
102953
102954- BUILD_BUG_ON(BPF_MEMWORDS > 16);
102955+ BUILD_BUG_ON(BPF_MEMWORDS != 16);
102956
102957 masks = kmalloc_array(flen, sizeof(*masks), GFP_KERNEL);
102958 if (!masks)
102959@@ -992,7 +996,7 @@ int bpf_prog_create(struct bpf_prog **pfp, struct sock_fprog_kern *fprog)
102960 if (!fp)
102961 return -ENOMEM;
102962
102963- memcpy(fp->insns, fprog->filter, fsize);
102964+ memcpy(fp->insns, (void __force_kernel *)fprog->filter, fsize);
102965
102966 fp->len = fprog->len;
102967 /* Since unattached filters are not copied back to user
102968diff --git a/net/core/flow.c b/net/core/flow.c
102969index 1033725..340f65d 100644
102970--- a/net/core/flow.c
102971+++ b/net/core/flow.c
102972@@ -65,7 +65,7 @@ static void flow_cache_new_hashrnd(unsigned long arg)
102973 static int flow_entry_valid(struct flow_cache_entry *fle,
102974 struct netns_xfrm *xfrm)
102975 {
102976- if (atomic_read(&xfrm->flow_cache_genid) != fle->genid)
102977+ if (atomic_read_unchecked(&xfrm->flow_cache_genid) != fle->genid)
102978 return 0;
102979 if (fle->object && !fle->object->ops->check(fle->object))
102980 return 0;
102981@@ -242,7 +242,7 @@ flow_cache_lookup(struct net *net, const struct flowi *key, u16 family, u8 dir,
102982 hlist_add_head(&fle->u.hlist, &fcp->hash_table[hash]);
102983 fcp->hash_count++;
102984 }
102985- } else if (likely(fle->genid == atomic_read(&net->xfrm.flow_cache_genid))) {
102986+ } else if (likely(fle->genid == atomic_read_unchecked(&net->xfrm.flow_cache_genid))) {
102987 flo = fle->object;
102988 if (!flo)
102989 goto ret_object;
102990@@ -263,7 +263,7 @@ nocache:
102991 }
102992 flo = resolver(net, key, family, dir, flo, ctx);
102993 if (fle) {
102994- fle->genid = atomic_read(&net->xfrm.flow_cache_genid);
102995+ fle->genid = atomic_read_unchecked(&net->xfrm.flow_cache_genid);
102996 if (!IS_ERR(flo))
102997 fle->object = flo;
102998 else
102999diff --git a/net/core/neighbour.c b/net/core/neighbour.c
103000index 70fe9e1..926784c 100644
103001--- a/net/core/neighbour.c
103002+++ b/net/core/neighbour.c
103003@@ -2806,7 +2806,7 @@ static int proc_unres_qlen(struct ctl_table *ctl, int write,
103004 void __user *buffer, size_t *lenp, loff_t *ppos)
103005 {
103006 int size, ret;
103007- struct ctl_table tmp = *ctl;
103008+ ctl_table_no_const tmp = *ctl;
103009
103010 tmp.extra1 = &zero;
103011 tmp.extra2 = &unres_qlen_max;
103012@@ -2868,7 +2868,7 @@ static int neigh_proc_dointvec_zero_intmax(struct ctl_table *ctl, int write,
103013 void __user *buffer,
103014 size_t *lenp, loff_t *ppos)
103015 {
103016- struct ctl_table tmp = *ctl;
103017+ ctl_table_no_const tmp = *ctl;
103018 int ret;
103019
103020 tmp.extra1 = &zero;
103021diff --git a/net/core/net-procfs.c b/net/core/net-procfs.c
103022index 2bf8329..2eb1423 100644
103023--- a/net/core/net-procfs.c
103024+++ b/net/core/net-procfs.c
103025@@ -79,7 +79,13 @@ static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev)
103026 struct rtnl_link_stats64 temp;
103027 const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp);
103028
103029- seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
103030+ if (gr_proc_is_restricted())
103031+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
103032+ "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
103033+ dev->name, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL,
103034+ 0ULL, 0ULL, 0ULL, 0ULL, 0ULL, 0ULL);
103035+ else
103036+ seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
103037 "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
103038 dev->name, stats->rx_bytes, stats->rx_packets,
103039 stats->rx_errors,
103040@@ -166,7 +172,7 @@ static int softnet_seq_show(struct seq_file *seq, void *v)
103041 return 0;
103042 }
103043
103044-static const struct seq_operations dev_seq_ops = {
103045+const struct seq_operations dev_seq_ops = {
103046 .start = dev_seq_start,
103047 .next = dev_seq_next,
103048 .stop = dev_seq_stop,
103049@@ -196,7 +202,7 @@ static const struct seq_operations softnet_seq_ops = {
103050
103051 static int softnet_seq_open(struct inode *inode, struct file *file)
103052 {
103053- return seq_open(file, &softnet_seq_ops);
103054+ return seq_open_restrict(file, &softnet_seq_ops);
103055 }
103056
103057 static const struct file_operations softnet_seq_fops = {
103058@@ -283,8 +289,13 @@ static int ptype_seq_show(struct seq_file *seq, void *v)
103059 else
103060 seq_printf(seq, "%04x", ntohs(pt->type));
103061
103062+#ifdef CONFIG_GRKERNSEC_HIDESYM
103063+ seq_printf(seq, " %-8s %pf\n",
103064+ pt->dev ? pt->dev->name : "", NULL);
103065+#else
103066 seq_printf(seq, " %-8s %pf\n",
103067 pt->dev ? pt->dev->name : "", pt->func);
103068+#endif
103069 }
103070
103071 return 0;
103072diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
103073index f2aa73b..0d1a1ea 100644
103074--- a/net/core/net-sysfs.c
103075+++ b/net/core/net-sysfs.c
103076@@ -279,7 +279,7 @@ static ssize_t carrier_changes_show(struct device *dev,
103077 {
103078 struct net_device *netdev = to_net_dev(dev);
103079 return sprintf(buf, fmt_dec,
103080- atomic_read(&netdev->carrier_changes));
103081+ atomic_read_unchecked(&netdev->carrier_changes));
103082 }
103083 static DEVICE_ATTR_RO(carrier_changes);
103084
103085diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
103086index 70d3450..eb7c528 100644
103087--- a/net/core/net_namespace.c
103088+++ b/net/core/net_namespace.c
103089@@ -663,7 +663,7 @@ static int __register_pernet_operations(struct list_head *list,
103090 int error;
103091 LIST_HEAD(net_exit_list);
103092
103093- list_add_tail(&ops->list, list);
103094+ pax_list_add_tail((struct list_head *)&ops->list, list);
103095 if (ops->init || (ops->id && ops->size)) {
103096 for_each_net(net) {
103097 error = ops_init(ops, net);
103098@@ -676,7 +676,7 @@ static int __register_pernet_operations(struct list_head *list,
103099
103100 out_undo:
103101 /* If I have an error cleanup all namespaces I initialized */
103102- list_del(&ops->list);
103103+ pax_list_del((struct list_head *)&ops->list);
103104 ops_exit_list(ops, &net_exit_list);
103105 ops_free_list(ops, &net_exit_list);
103106 return error;
103107@@ -687,7 +687,7 @@ static void __unregister_pernet_operations(struct pernet_operations *ops)
103108 struct net *net;
103109 LIST_HEAD(net_exit_list);
103110
103111- list_del(&ops->list);
103112+ pax_list_del((struct list_head *)&ops->list);
103113 for_each_net(net)
103114 list_add_tail(&net->exit_list, &net_exit_list);
103115 ops_exit_list(ops, &net_exit_list);
103116@@ -821,7 +821,7 @@ int register_pernet_device(struct pernet_operations *ops)
103117 mutex_lock(&net_mutex);
103118 error = register_pernet_operations(&pernet_list, ops);
103119 if (!error && (first_device == &pernet_list))
103120- first_device = &ops->list;
103121+ first_device = (struct list_head *)&ops->list;
103122 mutex_unlock(&net_mutex);
103123 return error;
103124 }
103125diff --git a/net/core/netpoll.c b/net/core/netpoll.c
103126index c126a87..10ad89d 100644
103127--- a/net/core/netpoll.c
103128+++ b/net/core/netpoll.c
103129@@ -377,7 +377,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
103130 struct udphdr *udph;
103131 struct iphdr *iph;
103132 struct ethhdr *eth;
103133- static atomic_t ip_ident;
103134+ static atomic_unchecked_t ip_ident;
103135 struct ipv6hdr *ip6h;
103136
103137 udp_len = len + sizeof(*udph);
103138@@ -448,7 +448,7 @@ void netpoll_send_udp(struct netpoll *np, const char *msg, int len)
103139 put_unaligned(0x45, (unsigned char *)iph);
103140 iph->tos = 0;
103141 put_unaligned(htons(ip_len), &(iph->tot_len));
103142- iph->id = htons(atomic_inc_return(&ip_ident));
103143+ iph->id = htons(atomic_inc_return_unchecked(&ip_ident));
103144 iph->frag_off = 0;
103145 iph->ttl = 64;
103146 iph->protocol = IPPROTO_UDP;
103147diff --git a/net/core/pktgen.c b/net/core/pktgen.c
103148index 508155b..fad080f 100644
103149--- a/net/core/pktgen.c
103150+++ b/net/core/pktgen.c
103151@@ -3755,7 +3755,7 @@ static int __net_init pg_net_init(struct net *net)
103152 pn->net = net;
103153 INIT_LIST_HEAD(&pn->pktgen_threads);
103154 pn->pktgen_exiting = false;
103155- pn->proc_dir = proc_mkdir(PG_PROC_DIR, pn->net->proc_net);
103156+ pn->proc_dir = proc_mkdir_restrict(PG_PROC_DIR, pn->net->proc_net);
103157 if (!pn->proc_dir) {
103158 pr_warn("cannot create /proc/net/%s\n", PG_PROC_DIR);
103159 return -ENODEV;
103160diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
103161index 7ebed55..378bf34 100644
103162--- a/net/core/rtnetlink.c
103163+++ b/net/core/rtnetlink.c
103164@@ -61,7 +61,7 @@ struct rtnl_link {
103165 rtnl_doit_func doit;
103166 rtnl_dumpit_func dumpit;
103167 rtnl_calcit_func calcit;
103168-};
103169+} __no_const;
103170
103171 static DEFINE_MUTEX(rtnl_mutex);
103172
103173@@ -307,10 +307,13 @@ int __rtnl_link_register(struct rtnl_link_ops *ops)
103174 * to use the ops for creating device. So do not
103175 * fill up dellink as well. That disables rtnl_dellink.
103176 */
103177- if (ops->setup && !ops->dellink)
103178- ops->dellink = unregister_netdevice_queue;
103179+ if (ops->setup && !ops->dellink) {
103180+ pax_open_kernel();
103181+ *(void **)&ops->dellink = unregister_netdevice_queue;
103182+ pax_close_kernel();
103183+ }
103184
103185- list_add_tail(&ops->list, &link_ops);
103186+ pax_list_add_tail((struct list_head *)&ops->list, &link_ops);
103187 return 0;
103188 }
103189 EXPORT_SYMBOL_GPL(__rtnl_link_register);
103190@@ -357,7 +360,7 @@ void __rtnl_link_unregister(struct rtnl_link_ops *ops)
103191 for_each_net(net) {
103192 __rtnl_kill_links(net, ops);
103193 }
103194- list_del(&ops->list);
103195+ pax_list_del((struct list_head *)&ops->list);
103196 }
103197 EXPORT_SYMBOL_GPL(__rtnl_link_unregister);
103198
103199@@ -1047,7 +1050,7 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, struct net_device *dev,
103200 (dev->ifalias &&
103201 nla_put_string(skb, IFLA_IFALIAS, dev->ifalias)) ||
103202 nla_put_u32(skb, IFLA_CARRIER_CHANGES,
103203- atomic_read(&dev->carrier_changes)))
103204+ atomic_read_unchecked(&dev->carrier_changes)))
103205 goto nla_put_failure;
103206
103207 if (1) {
103208diff --git a/net/core/scm.c b/net/core/scm.c
103209index 3b6899b..cf36238 100644
103210--- a/net/core/scm.c
103211+++ b/net/core/scm.c
103212@@ -209,7 +209,7 @@ EXPORT_SYMBOL(__scm_send);
103213 int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
103214 {
103215 struct cmsghdr __user *cm
103216- = (__force struct cmsghdr __user *)msg->msg_control;
103217+ = (struct cmsghdr __force_user *)msg->msg_control;
103218 struct cmsghdr cmhdr;
103219 int cmlen = CMSG_LEN(len);
103220 int err;
103221@@ -232,7 +232,7 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
103222 err = -EFAULT;
103223 if (copy_to_user(cm, &cmhdr, sizeof cmhdr))
103224 goto out;
103225- if (copy_to_user(CMSG_DATA(cm), data, cmlen - sizeof(struct cmsghdr)))
103226+ if (copy_to_user((void __force_user *)CMSG_DATA((void __force_kernel *)cm), data, cmlen - sizeof(struct cmsghdr)))
103227 goto out;
103228 cmlen = CMSG_SPACE(len);
103229 if (msg->msg_controllen < cmlen)
103230@@ -248,7 +248,7 @@ EXPORT_SYMBOL(put_cmsg);
103231 void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
103232 {
103233 struct cmsghdr __user *cm
103234- = (__force struct cmsghdr __user*)msg->msg_control;
103235+ = (struct cmsghdr __force_user *)msg->msg_control;
103236
103237 int fdmax = 0;
103238 int fdnum = scm->fp->count;
103239@@ -268,7 +268,7 @@ void scm_detach_fds(struct msghdr *msg, struct scm_cookie *scm)
103240 if (fdnum < fdmax)
103241 fdmax = fdnum;
103242
103243- for (i=0, cmfptr=(__force int __user *)CMSG_DATA(cm); i<fdmax;
103244+ for (i=0, cmfptr=(int __force_user *)CMSG_DATA((void __force_kernel *)cm); i<fdmax;
103245 i++, cmfptr++)
103246 {
103247 struct socket *sock;
103248diff --git a/net/core/skbuff.c b/net/core/skbuff.c
103249index e9f9a15..6eb024e 100644
103250--- a/net/core/skbuff.c
103251+++ b/net/core/skbuff.c
103252@@ -2139,7 +2139,7 @@ EXPORT_SYMBOL(__skb_checksum);
103253 __wsum skb_checksum(const struct sk_buff *skb, int offset,
103254 int len, __wsum csum)
103255 {
103256- const struct skb_checksum_ops ops = {
103257+ static const struct skb_checksum_ops ops = {
103258 .update = csum_partial_ext,
103259 .combine = csum_block_add_ext,
103260 };
103261@@ -3379,12 +3379,14 @@ void __init skb_init(void)
103262 skbuff_head_cache = kmem_cache_create("skbuff_head_cache",
103263 sizeof(struct sk_buff),
103264 0,
103265- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
103266+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
103267+ SLAB_NO_SANITIZE,
103268 NULL);
103269 skbuff_fclone_cache = kmem_cache_create("skbuff_fclone_cache",
103270 sizeof(struct sk_buff_fclones),
103271 0,
103272- SLAB_HWCACHE_ALIGN|SLAB_PANIC,
103273+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|
103274+ SLAB_NO_SANITIZE,
103275 NULL);
103276 }
103277
103278diff --git a/net/core/sock.c b/net/core/sock.c
103279index 71e3e5f..ab90920 100644
103280--- a/net/core/sock.c
103281+++ b/net/core/sock.c
103282@@ -443,7 +443,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
103283 struct sk_buff_head *list = &sk->sk_receive_queue;
103284
103285 if (atomic_read(&sk->sk_rmem_alloc) >= sk->sk_rcvbuf) {
103286- atomic_inc(&sk->sk_drops);
103287+ atomic_inc_unchecked(&sk->sk_drops);
103288 trace_sock_rcvqueue_full(sk, skb);
103289 return -ENOMEM;
103290 }
103291@@ -453,7 +453,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
103292 return err;
103293
103294 if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
103295- atomic_inc(&sk->sk_drops);
103296+ atomic_inc_unchecked(&sk->sk_drops);
103297 return -ENOBUFS;
103298 }
103299
103300@@ -466,7 +466,7 @@ int sock_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
103301 skb_dst_force(skb);
103302
103303 spin_lock_irqsave(&list->lock, flags);
103304- skb->dropcount = atomic_read(&sk->sk_drops);
103305+ skb->dropcount = atomic_read_unchecked(&sk->sk_drops);
103306 __skb_queue_tail(list, skb);
103307 spin_unlock_irqrestore(&list->lock, flags);
103308
103309@@ -486,7 +486,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
103310 skb->dev = NULL;
103311
103312 if (sk_rcvqueues_full(sk, sk->sk_rcvbuf)) {
103313- atomic_inc(&sk->sk_drops);
103314+ atomic_inc_unchecked(&sk->sk_drops);
103315 goto discard_and_relse;
103316 }
103317 if (nested)
103318@@ -504,7 +504,7 @@ int sk_receive_skb(struct sock *sk, struct sk_buff *skb, const int nested)
103319 mutex_release(&sk->sk_lock.dep_map, 1, _RET_IP_);
103320 } else if (sk_add_backlog(sk, skb, sk->sk_rcvbuf)) {
103321 bh_unlock_sock(sk);
103322- atomic_inc(&sk->sk_drops);
103323+ atomic_inc_unchecked(&sk->sk_drops);
103324 goto discard_and_relse;
103325 }
103326
103327@@ -910,6 +910,7 @@ set_rcvbuf:
103328 }
103329 break;
103330
103331+#ifndef GRKERNSEC_BPF_HARDEN
103332 case SO_ATTACH_BPF:
103333 ret = -EINVAL;
103334 if (optlen == sizeof(u32)) {
103335@@ -922,7 +923,7 @@ set_rcvbuf:
103336 ret = sk_attach_bpf(ufd, sk);
103337 }
103338 break;
103339-
103340+#endif
103341 case SO_DETACH_FILTER:
103342 ret = sk_detach_filter(sk);
103343 break;
103344@@ -1026,12 +1027,12 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
103345 struct timeval tm;
103346 } v;
103347
103348- int lv = sizeof(int);
103349- int len;
103350+ unsigned int lv = sizeof(int);
103351+ unsigned int len;
103352
103353 if (get_user(len, optlen))
103354 return -EFAULT;
103355- if (len < 0)
103356+ if (len > INT_MAX)
103357 return -EINVAL;
103358
103359 memset(&v, 0, sizeof(v));
103360@@ -1169,11 +1170,11 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
103361
103362 case SO_PEERNAME:
103363 {
103364- char address[128];
103365+ char address[_K_SS_MAXSIZE];
103366
103367 if (sock->ops->getname(sock, (struct sockaddr *)address, &lv, 2))
103368 return -ENOTCONN;
103369- if (lv < len)
103370+ if (lv < len || sizeof address < len)
103371 return -EINVAL;
103372 if (copy_to_user(optval, address, len))
103373 return -EFAULT;
103374@@ -1258,7 +1259,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
103375
103376 if (len > lv)
103377 len = lv;
103378- if (copy_to_user(optval, &v, len))
103379+ if (len > sizeof(v) || copy_to_user(optval, &v, len))
103380 return -EFAULT;
103381 lenout:
103382 if (put_user(len, optlen))
103383@@ -2375,7 +2376,7 @@ void sock_init_data(struct socket *sock, struct sock *sk)
103384 */
103385 smp_wmb();
103386 atomic_set(&sk->sk_refcnt, 1);
103387- atomic_set(&sk->sk_drops, 0);
103388+ atomic_set_unchecked(&sk->sk_drops, 0);
103389 }
103390 EXPORT_SYMBOL(sock_init_data);
103391
103392@@ -2503,6 +2504,7 @@ void sock_enable_timestamp(struct sock *sk, int flag)
103393 int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
103394 int level, int type)
103395 {
103396+ struct sock_extended_err ee;
103397 struct sock_exterr_skb *serr;
103398 struct sk_buff *skb;
103399 int copied, err;
103400@@ -2524,7 +2526,8 @@ int sock_recv_errqueue(struct sock *sk, struct msghdr *msg, int len,
103401 sock_recv_timestamp(msg, sk, skb);
103402
103403 serr = SKB_EXT_ERR(skb);
103404- put_cmsg(msg, level, type, sizeof(serr->ee), &serr->ee);
103405+ ee = serr->ee;
103406+ put_cmsg(msg, level, type, sizeof ee, &ee);
103407
103408 msg->msg_flags |= MSG_ERRQUEUE;
103409 err = copied;
103410diff --git a/net/core/sock_diag.c b/net/core/sock_diag.c
103411index ad704c7..ca48aff 100644
103412--- a/net/core/sock_diag.c
103413+++ b/net/core/sock_diag.c
103414@@ -9,26 +9,33 @@
103415 #include <linux/inet_diag.h>
103416 #include <linux/sock_diag.h>
103417
103418-static const struct sock_diag_handler *sock_diag_handlers[AF_MAX];
103419+static const struct sock_diag_handler *sock_diag_handlers[AF_MAX] __read_only;
103420 static int (*inet_rcv_compat)(struct sk_buff *skb, struct nlmsghdr *nlh);
103421 static DEFINE_MUTEX(sock_diag_table_mutex);
103422
103423 int sock_diag_check_cookie(void *sk, __u32 *cookie)
103424 {
103425+#ifndef CONFIG_GRKERNSEC_HIDESYM
103426 if ((cookie[0] != INET_DIAG_NOCOOKIE ||
103427 cookie[1] != INET_DIAG_NOCOOKIE) &&
103428 ((u32)(unsigned long)sk != cookie[0] ||
103429 (u32)((((unsigned long)sk) >> 31) >> 1) != cookie[1]))
103430 return -ESTALE;
103431 else
103432+#endif
103433 return 0;
103434 }
103435 EXPORT_SYMBOL_GPL(sock_diag_check_cookie);
103436
103437 void sock_diag_save_cookie(void *sk, __u32 *cookie)
103438 {
103439+#ifdef CONFIG_GRKERNSEC_HIDESYM
103440+ cookie[0] = 0;
103441+ cookie[1] = 0;
103442+#else
103443 cookie[0] = (u32)(unsigned long)sk;
103444 cookie[1] = (u32)(((unsigned long)sk >> 31) >> 1);
103445+#endif
103446 }
103447 EXPORT_SYMBOL_GPL(sock_diag_save_cookie);
103448
103449@@ -110,8 +117,11 @@ int sock_diag_register(const struct sock_diag_handler *hndl)
103450 mutex_lock(&sock_diag_table_mutex);
103451 if (sock_diag_handlers[hndl->family])
103452 err = -EBUSY;
103453- else
103454+ else {
103455+ pax_open_kernel();
103456 sock_diag_handlers[hndl->family] = hndl;
103457+ pax_close_kernel();
103458+ }
103459 mutex_unlock(&sock_diag_table_mutex);
103460
103461 return err;
103462@@ -127,7 +137,9 @@ void sock_diag_unregister(const struct sock_diag_handler *hnld)
103463
103464 mutex_lock(&sock_diag_table_mutex);
103465 BUG_ON(sock_diag_handlers[family] != hnld);
103466+ pax_open_kernel();
103467 sock_diag_handlers[family] = NULL;
103468+ pax_close_kernel();
103469 mutex_unlock(&sock_diag_table_mutex);
103470 }
103471 EXPORT_SYMBOL_GPL(sock_diag_unregister);
103472diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c
103473index 8ce351f..2c388f7 100644
103474--- a/net/core/sysctl_net_core.c
103475+++ b/net/core/sysctl_net_core.c
103476@@ -36,7 +36,7 @@ static int rps_sock_flow_sysctl(struct ctl_table *table, int write,
103477 {
103478 unsigned int orig_size, size;
103479 int ret, i;
103480- struct ctl_table tmp = {
103481+ ctl_table_no_const tmp = {
103482 .data = &size,
103483 .maxlen = sizeof(size),
103484 .mode = table->mode
103485@@ -204,7 +204,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
103486 void __user *buffer, size_t *lenp, loff_t *ppos)
103487 {
103488 char id[IFNAMSIZ];
103489- struct ctl_table tbl = {
103490+ ctl_table_no_const tbl = {
103491 .data = id,
103492 .maxlen = IFNAMSIZ,
103493 };
103494@@ -222,7 +222,7 @@ static int set_default_qdisc(struct ctl_table *table, int write,
103495 static int proc_do_rss_key(struct ctl_table *table, int write,
103496 void __user *buffer, size_t *lenp, loff_t *ppos)
103497 {
103498- struct ctl_table fake_table;
103499+ ctl_table_no_const fake_table;
103500 char buf[NETDEV_RSS_KEY_LEN * 3];
103501
103502 snprintf(buf, sizeof(buf), "%*phC", NETDEV_RSS_KEY_LEN, netdev_rss_key);
103503@@ -286,7 +286,7 @@ static struct ctl_table net_core_table[] = {
103504 .mode = 0444,
103505 .proc_handler = proc_do_rss_key,
103506 },
103507-#ifdef CONFIG_BPF_JIT
103508+#if defined(CONFIG_BPF_JIT) && !defined(CONFIG_GRKERNSEC_BPF_HARDEN)
103509 {
103510 .procname = "bpf_jit_enable",
103511 .data = &bpf_jit_enable,
103512@@ -411,13 +411,12 @@ static struct ctl_table netns_core_table[] = {
103513
103514 static __net_init int sysctl_core_net_init(struct net *net)
103515 {
103516- struct ctl_table *tbl;
103517+ ctl_table_no_const *tbl = NULL;
103518
103519 net->core.sysctl_somaxconn = SOMAXCONN;
103520
103521- tbl = netns_core_table;
103522 if (!net_eq(net, &init_net)) {
103523- tbl = kmemdup(tbl, sizeof(netns_core_table), GFP_KERNEL);
103524+ tbl = kmemdup(netns_core_table, sizeof(netns_core_table), GFP_KERNEL);
103525 if (tbl == NULL)
103526 goto err_dup;
103527
103528@@ -427,17 +426,16 @@ static __net_init int sysctl_core_net_init(struct net *net)
103529 if (net->user_ns != &init_user_ns) {
103530 tbl[0].procname = NULL;
103531 }
103532- }
103533-
103534- net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
103535+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", tbl);
103536+ } else
103537+ net->core.sysctl_hdr = register_net_sysctl(net, "net/core", netns_core_table);
103538 if (net->core.sysctl_hdr == NULL)
103539 goto err_reg;
103540
103541 return 0;
103542
103543 err_reg:
103544- if (tbl != netns_core_table)
103545- kfree(tbl);
103546+ kfree(tbl);
103547 err_dup:
103548 return -ENOMEM;
103549 }
103550@@ -452,7 +450,7 @@ static __net_exit void sysctl_core_net_exit(struct net *net)
103551 kfree(tbl);
103552 }
103553
103554-static __net_initdata struct pernet_operations sysctl_core_ops = {
103555+static __net_initconst struct pernet_operations sysctl_core_ops = {
103556 .init = sysctl_core_net_init,
103557 .exit = sysctl_core_net_exit,
103558 };
103559diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c
103560index 8102286..a0c2755 100644
103561--- a/net/decnet/af_decnet.c
103562+++ b/net/decnet/af_decnet.c
103563@@ -466,6 +466,7 @@ static struct proto dn_proto = {
103564 .sysctl_rmem = sysctl_decnet_rmem,
103565 .max_header = DN_MAX_NSP_DATA_HEADER + 64,
103566 .obj_size = sizeof(struct dn_sock),
103567+ .slab_flags = SLAB_USERCOPY,
103568 };
103569
103570 static struct sock *dn_alloc_sock(struct net *net, struct socket *sock, gfp_t gfp)
103571diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c
103572index b2c26b0..41f803e 100644
103573--- a/net/decnet/dn_dev.c
103574+++ b/net/decnet/dn_dev.c
103575@@ -201,7 +201,7 @@ static struct dn_dev_sysctl_table {
103576 .extra1 = &min_t3,
103577 .extra2 = &max_t3
103578 },
103579- {0}
103580+ { }
103581 },
103582 };
103583
103584diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c
103585index 5325b54..a0d4d69 100644
103586--- a/net/decnet/sysctl_net_decnet.c
103587+++ b/net/decnet/sysctl_net_decnet.c
103588@@ -174,7 +174,7 @@ static int dn_node_address_handler(struct ctl_table *table, int write,
103589
103590 if (len > *lenp) len = *lenp;
103591
103592- if (copy_to_user(buffer, addr, len))
103593+ if (len > sizeof addr || copy_to_user(buffer, addr, len))
103594 return -EFAULT;
103595
103596 *lenp = len;
103597@@ -237,7 +237,7 @@ static int dn_def_dev_handler(struct ctl_table *table, int write,
103598
103599 if (len > *lenp) len = *lenp;
103600
103601- if (copy_to_user(buffer, devname, len))
103602+ if (len > sizeof devname || copy_to_user(buffer, devname, len))
103603 return -EFAULT;
103604
103605 *lenp = len;
103606diff --git a/net/hsr/hsr_netlink.c b/net/hsr/hsr_netlink.c
103607index a2c7e4c..3dc9f67 100644
103608--- a/net/hsr/hsr_netlink.c
103609+++ b/net/hsr/hsr_netlink.c
103610@@ -102,7 +102,7 @@ nla_put_failure:
103611 return -EMSGSIZE;
103612 }
103613
103614-static struct rtnl_link_ops hsr_link_ops __read_mostly = {
103615+static struct rtnl_link_ops hsr_link_ops = {
103616 .kind = "hsr",
103617 .maxtype = IFLA_HSR_MAX,
103618 .policy = hsr_policy,
103619diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c
103620index 055fbb7..c0dbe60 100644
103621--- a/net/ieee802154/6lowpan/core.c
103622+++ b/net/ieee802154/6lowpan/core.c
103623@@ -217,7 +217,7 @@ static void lowpan_dellink(struct net_device *dev, struct list_head *head)
103624 dev_put(real_dev);
103625 }
103626
103627-static struct rtnl_link_ops lowpan_link_ops __read_mostly = {
103628+static struct rtnl_link_ops lowpan_link_ops = {
103629 .kind = "lowpan",
103630 .priv_size = sizeof(struct lowpan_dev_info),
103631 .setup = lowpan_setup,
103632diff --git a/net/ieee802154/6lowpan/reassembly.c b/net/ieee802154/6lowpan/reassembly.c
103633index f46e4d1..30231f1 100644
103634--- a/net/ieee802154/6lowpan/reassembly.c
103635+++ b/net/ieee802154/6lowpan/reassembly.c
103636@@ -435,14 +435,13 @@ static struct ctl_table lowpan_frags_ctl_table[] = {
103637
103638 static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
103639 {
103640- struct ctl_table *table;
103641+ ctl_table_no_const *table = NULL;
103642 struct ctl_table_header *hdr;
103643 struct netns_ieee802154_lowpan *ieee802154_lowpan =
103644 net_ieee802154_lowpan(net);
103645
103646- table = lowpan_frags_ns_ctl_table;
103647 if (!net_eq(net, &init_net)) {
103648- table = kmemdup(table, sizeof(lowpan_frags_ns_ctl_table),
103649+ table = kmemdup(lowpan_frags_ns_ctl_table, sizeof(lowpan_frags_ns_ctl_table),
103650 GFP_KERNEL);
103651 if (table == NULL)
103652 goto err_alloc;
103653@@ -457,9 +456,9 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
103654 /* Don't export sysctls to unprivileged users */
103655 if (net->user_ns != &init_user_ns)
103656 table[0].procname = NULL;
103657- }
103658-
103659- hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
103660+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", table);
103661+ } else
103662+ hdr = register_net_sysctl(net, "net/ieee802154/6lowpan", lowpan_frags_ns_ctl_table);
103663 if (hdr == NULL)
103664 goto err_reg;
103665
103666@@ -467,8 +466,7 @@ static int __net_init lowpan_frags_ns_sysctl_register(struct net *net)
103667 return 0;
103668
103669 err_reg:
103670- if (!net_eq(net, &init_net))
103671- kfree(table);
103672+ kfree(table);
103673 err_alloc:
103674 return -ENOMEM;
103675 }
103676diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
103677index d2e49ba..f78e8aa 100644
103678--- a/net/ipv4/af_inet.c
103679+++ b/net/ipv4/af_inet.c
103680@@ -1390,7 +1390,7 @@ int inet_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len)
103681 return ip_recv_error(sk, msg, len, addr_len);
103682 #if IS_ENABLED(CONFIG_IPV6)
103683 if (sk->sk_family == AF_INET6)
103684- return pingv6_ops.ipv6_recv_error(sk, msg, len, addr_len);
103685+ return pingv6_ops->ipv6_recv_error(sk, msg, len, addr_len);
103686 #endif
103687 return -EINVAL;
103688 }
103689diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
103690index 3a8985c..9d2a870 100644
103691--- a/net/ipv4/devinet.c
103692+++ b/net/ipv4/devinet.c
103693@@ -69,7 +69,8 @@
103694
103695 static struct ipv4_devconf ipv4_devconf = {
103696 .data = {
103697- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
103698+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
103699+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
103700 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
103701 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
103702 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
103703@@ -80,7 +81,8 @@ static struct ipv4_devconf ipv4_devconf = {
103704
103705 static struct ipv4_devconf ipv4_devconf_dflt = {
103706 .data = {
103707- [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 1,
103708+ [IPV4_DEVCONF_ACCEPT_REDIRECTS - 1] = 0,
103709+ [IPV4_DEVCONF_RP_FILTER - 1] = 1,
103710 [IPV4_DEVCONF_SEND_REDIRECTS - 1] = 1,
103711 [IPV4_DEVCONF_SECURE_REDIRECTS - 1] = 1,
103712 [IPV4_DEVCONF_SHARED_MEDIA - 1] = 1,
103713@@ -1549,7 +1551,7 @@ static int inet_dump_ifaddr(struct sk_buff *skb, struct netlink_callback *cb)
103714 idx = 0;
103715 head = &net->dev_index_head[h];
103716 rcu_read_lock();
103717- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
103718+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
103719 net->dev_base_seq;
103720 hlist_for_each_entry_rcu(dev, head, index_hlist) {
103721 if (idx < s_idx)
103722@@ -1868,7 +1870,7 @@ static int inet_netconf_dump_devconf(struct sk_buff *skb,
103723 idx = 0;
103724 head = &net->dev_index_head[h];
103725 rcu_read_lock();
103726- cb->seq = atomic_read(&net->ipv4.dev_addr_genid) ^
103727+ cb->seq = atomic_read_unchecked(&net->ipv4.dev_addr_genid) ^
103728 net->dev_base_seq;
103729 hlist_for_each_entry_rcu(dev, head, index_hlist) {
103730 if (idx < s_idx)
103731@@ -2103,7 +2105,7 @@ static int ipv4_doint_and_flush(struct ctl_table *ctl, int write,
103732 #define DEVINET_SYSCTL_FLUSHING_ENTRY(attr, name) \
103733 DEVINET_SYSCTL_COMPLEX_ENTRY(attr, name, ipv4_doint_and_flush)
103734
103735-static struct devinet_sysctl_table {
103736+static const struct devinet_sysctl_table {
103737 struct ctl_table_header *sysctl_header;
103738 struct ctl_table devinet_vars[__IPV4_DEVCONF_MAX];
103739 } devinet_sysctl = {
103740@@ -2235,7 +2237,7 @@ static __net_init int devinet_init_net(struct net *net)
103741 int err;
103742 struct ipv4_devconf *all, *dflt;
103743 #ifdef CONFIG_SYSCTL
103744- struct ctl_table *tbl = ctl_forward_entry;
103745+ ctl_table_no_const *tbl = NULL;
103746 struct ctl_table_header *forw_hdr;
103747 #endif
103748
103749@@ -2253,7 +2255,7 @@ static __net_init int devinet_init_net(struct net *net)
103750 goto err_alloc_dflt;
103751
103752 #ifdef CONFIG_SYSCTL
103753- tbl = kmemdup(tbl, sizeof(ctl_forward_entry), GFP_KERNEL);
103754+ tbl = kmemdup(ctl_forward_entry, sizeof(ctl_forward_entry), GFP_KERNEL);
103755 if (tbl == NULL)
103756 goto err_alloc_ctl;
103757
103758@@ -2273,7 +2275,10 @@ static __net_init int devinet_init_net(struct net *net)
103759 goto err_reg_dflt;
103760
103761 err = -ENOMEM;
103762- forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
103763+ if (!net_eq(net, &init_net))
103764+ forw_hdr = register_net_sysctl(net, "net/ipv4", tbl);
103765+ else
103766+ forw_hdr = register_net_sysctl(net, "net/ipv4", ctl_forward_entry);
103767 if (forw_hdr == NULL)
103768 goto err_reg_ctl;
103769 net->ipv4.forw_hdr = forw_hdr;
103770@@ -2289,8 +2294,7 @@ err_reg_ctl:
103771 err_reg_dflt:
103772 __devinet_sysctl_unregister(all);
103773 err_reg_all:
103774- if (tbl != ctl_forward_entry)
103775- kfree(tbl);
103776+ kfree(tbl);
103777 err_alloc_ctl:
103778 #endif
103779 if (dflt != &ipv4_devconf_dflt)
103780diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
103781index 23b9b3e..60cf0c4 100644
103782--- a/net/ipv4/fib_frontend.c
103783+++ b/net/ipv4/fib_frontend.c
103784@@ -1020,12 +1020,12 @@ static int fib_inetaddr_event(struct notifier_block *this, unsigned long event,
103785 #ifdef CONFIG_IP_ROUTE_MULTIPATH
103786 fib_sync_up(dev);
103787 #endif
103788- atomic_inc(&net->ipv4.dev_addr_genid);
103789+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
103790 rt_cache_flush(dev_net(dev));
103791 break;
103792 case NETDEV_DOWN:
103793 fib_del_ifaddr(ifa, NULL);
103794- atomic_inc(&net->ipv4.dev_addr_genid);
103795+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
103796 if (ifa->ifa_dev->ifa_list == NULL) {
103797 /* Last address was deleted from this interface.
103798 * Disable IP.
103799@@ -1063,7 +1063,7 @@ static int fib_netdev_event(struct notifier_block *this, unsigned long event, vo
103800 #ifdef CONFIG_IP_ROUTE_MULTIPATH
103801 fib_sync_up(dev);
103802 #endif
103803- atomic_inc(&net->ipv4.dev_addr_genid);
103804+ atomic_inc_unchecked(&net->ipv4.dev_addr_genid);
103805 rt_cache_flush(net);
103806 break;
103807 case NETDEV_DOWN:
103808diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
103809index 1e2090e..351a724 100644
103810--- a/net/ipv4/fib_semantics.c
103811+++ b/net/ipv4/fib_semantics.c
103812@@ -753,7 +753,7 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh)
103813 nh->nh_saddr = inet_select_addr(nh->nh_dev,
103814 nh->nh_gw,
103815 nh->nh_parent->fib_scope);
103816- nh->nh_saddr_genid = atomic_read(&net->ipv4.dev_addr_genid);
103817+ nh->nh_saddr_genid = atomic_read_unchecked(&net->ipv4.dev_addr_genid);
103818
103819 return nh->nh_saddr;
103820 }
103821diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
103822index ff069f6..335e752 100644
103823--- a/net/ipv4/fou.c
103824+++ b/net/ipv4/fou.c
103825@@ -771,12 +771,12 @@ EXPORT_SYMBOL(gue_build_header);
103826
103827 #ifdef CONFIG_NET_FOU_IP_TUNNELS
103828
103829-static const struct ip_tunnel_encap_ops __read_mostly fou_iptun_ops = {
103830+static const struct ip_tunnel_encap_ops fou_iptun_ops = {
103831 .encap_hlen = fou_encap_hlen,
103832 .build_header = fou_build_header,
103833 };
103834
103835-static const struct ip_tunnel_encap_ops __read_mostly gue_iptun_ops = {
103836+static const struct ip_tunnel_encap_ops gue_iptun_ops = {
103837 .encap_hlen = gue_encap_hlen,
103838 .build_header = gue_build_header,
103839 };
103840diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c
103841index 9111a4e..3576905 100644
103842--- a/net/ipv4/inet_hashtables.c
103843+++ b/net/ipv4/inet_hashtables.c
103844@@ -18,6 +18,7 @@
103845 #include <linux/sched.h>
103846 #include <linux/slab.h>
103847 #include <linux/wait.h>
103848+#include <linux/security.h>
103849
103850 #include <net/inet_connection_sock.h>
103851 #include <net/inet_hashtables.h>
103852@@ -49,6 +50,8 @@ static unsigned int inet_sk_ehashfn(const struct sock *sk)
103853 return inet_ehashfn(net, laddr, lport, faddr, fport);
103854 }
103855
103856+extern void gr_update_task_in_ip_table(const struct inet_sock *inet);
103857+
103858 /*
103859 * Allocate and initialize a new local port bind bucket.
103860 * The bindhash mutex for snum's hash chain must be held here.
103861@@ -554,6 +557,8 @@ ok:
103862 twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
103863 spin_unlock(&head->lock);
103864
103865+ gr_update_task_in_ip_table(inet_sk(sk));
103866+
103867 if (tw) {
103868 inet_twsk_deschedule(tw, death_row);
103869 while (twrefcnt) {
103870diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c
103871index 241afd7..31b95d5 100644
103872--- a/net/ipv4/inetpeer.c
103873+++ b/net/ipv4/inetpeer.c
103874@@ -461,7 +461,7 @@ relookup:
103875 if (p) {
103876 p->daddr = *daddr;
103877 atomic_set(&p->refcnt, 1);
103878- atomic_set(&p->rid, 0);
103879+ atomic_set_unchecked(&p->rid, 0);
103880 p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
103881 p->rate_tokens = 0;
103882 /* 60*HZ is arbitrary, but chosen enough high so that the first
103883diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
103884index 145a50c..5dd8cc5 100644
103885--- a/net/ipv4/ip_fragment.c
103886+++ b/net/ipv4/ip_fragment.c
103887@@ -268,7 +268,7 @@ static int ip_frag_too_far(struct ipq *qp)
103888 return 0;
103889
103890 start = qp->rid;
103891- end = atomic_inc_return(&peer->rid);
103892+ end = atomic_inc_return_unchecked(&peer->rid);
103893 qp->rid = end;
103894
103895 rc = qp->q.fragments && (end - start) > max;
103896@@ -748,12 +748,11 @@ static struct ctl_table ip4_frags_ctl_table[] = {
103897
103898 static int __net_init ip4_frags_ns_ctl_register(struct net *net)
103899 {
103900- struct ctl_table *table;
103901+ ctl_table_no_const *table = NULL;
103902 struct ctl_table_header *hdr;
103903
103904- table = ip4_frags_ns_ctl_table;
103905 if (!net_eq(net, &init_net)) {
103906- table = kmemdup(table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
103907+ table = kmemdup(ip4_frags_ns_ctl_table, sizeof(ip4_frags_ns_ctl_table), GFP_KERNEL);
103908 if (table == NULL)
103909 goto err_alloc;
103910
103911@@ -767,9 +766,10 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
103912 /* Don't export sysctls to unprivileged users */
103913 if (net->user_ns != &init_user_ns)
103914 table[0].procname = NULL;
103915- }
103916+ hdr = register_net_sysctl(net, "net/ipv4", table);
103917+ } else
103918+ hdr = register_net_sysctl(net, "net/ipv4", ip4_frags_ns_ctl_table);
103919
103920- hdr = register_net_sysctl(net, "net/ipv4", table);
103921 if (hdr == NULL)
103922 goto err_reg;
103923
103924@@ -777,8 +777,7 @@ static int __net_init ip4_frags_ns_ctl_register(struct net *net)
103925 return 0;
103926
103927 err_reg:
103928- if (!net_eq(net, &init_net))
103929- kfree(table);
103930+ kfree(table);
103931 err_alloc:
103932 return -ENOMEM;
103933 }
103934diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
103935index 6207275f..00323a2 100644
103936--- a/net/ipv4/ip_gre.c
103937+++ b/net/ipv4/ip_gre.c
103938@@ -115,7 +115,7 @@ static bool log_ecn_error = true;
103939 module_param(log_ecn_error, bool, 0644);
103940 MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
103941
103942-static struct rtnl_link_ops ipgre_link_ops __read_mostly;
103943+static struct rtnl_link_ops ipgre_link_ops;
103944 static int ipgre_tunnel_init(struct net_device *dev);
103945
103946 static int ipgre_net_id __read_mostly;
103947@@ -817,7 +817,7 @@ static const struct nla_policy ipgre_policy[IFLA_GRE_MAX + 1] = {
103948 [IFLA_GRE_ENCAP_DPORT] = { .type = NLA_U16 },
103949 };
103950
103951-static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
103952+static struct rtnl_link_ops ipgre_link_ops = {
103953 .kind = "gre",
103954 .maxtype = IFLA_GRE_MAX,
103955 .policy = ipgre_policy,
103956@@ -832,7 +832,7 @@ static struct rtnl_link_ops ipgre_link_ops __read_mostly = {
103957 .get_link_net = ip_tunnel_get_link_net,
103958 };
103959
103960-static struct rtnl_link_ops ipgre_tap_ops __read_mostly = {
103961+static struct rtnl_link_ops ipgre_tap_ops = {
103962 .kind = "gretap",
103963 .maxtype = IFLA_GRE_MAX,
103964 .policy = ipgre_policy,
103965diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
103966index 3d4da2c..40f9c29 100644
103967--- a/net/ipv4/ip_input.c
103968+++ b/net/ipv4/ip_input.c
103969@@ -147,6 +147,10 @@
103970 #include <linux/mroute.h>
103971 #include <linux/netlink.h>
103972
103973+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103974+extern int grsec_enable_blackhole;
103975+#endif
103976+
103977 /*
103978 * Process Router Attention IP option (RFC 2113)
103979 */
103980@@ -223,6 +227,9 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
103981 if (!raw) {
103982 if (xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) {
103983 IP_INC_STATS_BH(net, IPSTATS_MIB_INUNKNOWNPROTOS);
103984+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
103985+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
103986+#endif
103987 icmp_send(skb, ICMP_DEST_UNREACH,
103988 ICMP_PROT_UNREACH, 0);
103989 }
103990diff --git a/net/ipv4/ip_sockglue.c b/net/ipv4/ip_sockglue.c
103991index 5cd9927..8610b9f 100644
103992--- a/net/ipv4/ip_sockglue.c
103993+++ b/net/ipv4/ip_sockglue.c
103994@@ -1254,7 +1254,8 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
103995 len = min_t(unsigned int, len, opt->optlen);
103996 if (put_user(len, optlen))
103997 return -EFAULT;
103998- if (copy_to_user(optval, opt->__data, len))
103999+ if ((len > (sizeof(optbuf) - sizeof(struct ip_options))) ||
104000+ copy_to_user(optval, opt->__data, len))
104001 return -EFAULT;
104002 return 0;
104003 }
104004@@ -1388,7 +1389,7 @@ static int do_ip_getsockopt(struct sock *sk, int level, int optname,
104005 if (sk->sk_type != SOCK_STREAM)
104006 return -ENOPROTOOPT;
104007
104008- msg.msg_control = (__force void *) optval;
104009+ msg.msg_control = (__force_kernel void *) optval;
104010 msg.msg_controllen = len;
104011 msg.msg_flags = flags;
104012
104013diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
104014index 94efe14..1453fcc 100644
104015--- a/net/ipv4/ip_vti.c
104016+++ b/net/ipv4/ip_vti.c
104017@@ -45,7 +45,7 @@
104018 #include <net/net_namespace.h>
104019 #include <net/netns/generic.h>
104020
104021-static struct rtnl_link_ops vti_link_ops __read_mostly;
104022+static struct rtnl_link_ops vti_link_ops;
104023
104024 static int vti_net_id __read_mostly;
104025 static int vti_tunnel_init(struct net_device *dev);
104026@@ -519,7 +519,7 @@ static const struct nla_policy vti_policy[IFLA_VTI_MAX + 1] = {
104027 [IFLA_VTI_REMOTE] = { .len = FIELD_SIZEOF(struct iphdr, daddr) },
104028 };
104029
104030-static struct rtnl_link_ops vti_link_ops __read_mostly = {
104031+static struct rtnl_link_ops vti_link_ops = {
104032 .kind = "vti",
104033 .maxtype = IFLA_VTI_MAX,
104034 .policy = vti_policy,
104035diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
104036index b26376e..fc3d733 100644
104037--- a/net/ipv4/ipconfig.c
104038+++ b/net/ipv4/ipconfig.c
104039@@ -333,7 +333,7 @@ static int __init ic_devinet_ioctl(unsigned int cmd, struct ifreq *arg)
104040
104041 mm_segment_t oldfs = get_fs();
104042 set_fs(get_ds());
104043- res = devinet_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
104044+ res = devinet_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
104045 set_fs(oldfs);
104046 return res;
104047 }
104048@@ -344,7 +344,7 @@ static int __init ic_dev_ioctl(unsigned int cmd, struct ifreq *arg)
104049
104050 mm_segment_t oldfs = get_fs();
104051 set_fs(get_ds());
104052- res = dev_ioctl(&init_net, cmd, (struct ifreq __user *) arg);
104053+ res = dev_ioctl(&init_net, cmd, (struct ifreq __force_user *) arg);
104054 set_fs(oldfs);
104055 return res;
104056 }
104057@@ -355,7 +355,7 @@ static int __init ic_route_ioctl(unsigned int cmd, struct rtentry *arg)
104058
104059 mm_segment_t oldfs = get_fs();
104060 set_fs(get_ds());
104061- res = ip_rt_ioctl(&init_net, cmd, (void __user *) arg);
104062+ res = ip_rt_ioctl(&init_net, cmd, (void __force_user *) arg);
104063 set_fs(oldfs);
104064 return res;
104065 }
104066diff --git a/net/ipv4/ipip.c b/net/ipv4/ipip.c
104067index 915d215..48d1db7 100644
104068--- a/net/ipv4/ipip.c
104069+++ b/net/ipv4/ipip.c
104070@@ -124,7 +124,7 @@ MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN");
104071 static int ipip_net_id __read_mostly;
104072
104073 static int ipip_tunnel_init(struct net_device *dev);
104074-static struct rtnl_link_ops ipip_link_ops __read_mostly;
104075+static struct rtnl_link_ops ipip_link_ops;
104076
104077 static int ipip_err(struct sk_buff *skb, u32 info)
104078 {
104079@@ -487,7 +487,7 @@ static const struct nla_policy ipip_policy[IFLA_IPTUN_MAX + 1] = {
104080 [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
104081 };
104082
104083-static struct rtnl_link_ops ipip_link_ops __read_mostly = {
104084+static struct rtnl_link_ops ipip_link_ops = {
104085 .kind = "ipip",
104086 .maxtype = IFLA_IPTUN_MAX,
104087 .policy = ipip_policy,
104088diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c
104089index f95b6f9..2ee2097 100644
104090--- a/net/ipv4/netfilter/arp_tables.c
104091+++ b/net/ipv4/netfilter/arp_tables.c
104092@@ -885,14 +885,14 @@ static int compat_table_info(const struct xt_table_info *info,
104093 #endif
104094
104095 static int get_info(struct net *net, void __user *user,
104096- const int *len, int compat)
104097+ int len, int compat)
104098 {
104099 char name[XT_TABLE_MAXNAMELEN];
104100 struct xt_table *t;
104101 int ret;
104102
104103- if (*len != sizeof(struct arpt_getinfo)) {
104104- duprintf("length %u != %Zu\n", *len,
104105+ if (len != sizeof(struct arpt_getinfo)) {
104106+ duprintf("length %u != %Zu\n", len,
104107 sizeof(struct arpt_getinfo));
104108 return -EINVAL;
104109 }
104110@@ -929,7 +929,7 @@ static int get_info(struct net *net, void __user *user,
104111 info.size = private->size;
104112 strcpy(info.name, name);
104113
104114- if (copy_to_user(user, &info, *len) != 0)
104115+ if (copy_to_user(user, &info, len) != 0)
104116 ret = -EFAULT;
104117 else
104118 ret = 0;
104119@@ -1690,7 +1690,7 @@ static int compat_do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user,
104120
104121 switch (cmd) {
104122 case ARPT_SO_GET_INFO:
104123- ret = get_info(sock_net(sk), user, len, 1);
104124+ ret = get_info(sock_net(sk), user, *len, 1);
104125 break;
104126 case ARPT_SO_GET_ENTRIES:
104127 ret = compat_get_entries(sock_net(sk), user, len);
104128@@ -1735,7 +1735,7 @@ static int do_arpt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len
104129
104130 switch (cmd) {
104131 case ARPT_SO_GET_INFO:
104132- ret = get_info(sock_net(sk), user, len, 0);
104133+ ret = get_info(sock_net(sk), user, *len, 0);
104134 break;
104135
104136 case ARPT_SO_GET_ENTRIES:
104137diff --git a/net/ipv4/netfilter/ip_tables.c b/net/ipv4/netfilter/ip_tables.c
104138index cf5e82f..75a20f5 100644
104139--- a/net/ipv4/netfilter/ip_tables.c
104140+++ b/net/ipv4/netfilter/ip_tables.c
104141@@ -1073,14 +1073,14 @@ static int compat_table_info(const struct xt_table_info *info,
104142 #endif
104143
104144 static int get_info(struct net *net, void __user *user,
104145- const int *len, int compat)
104146+ int len, int compat)
104147 {
104148 char name[XT_TABLE_MAXNAMELEN];
104149 struct xt_table *t;
104150 int ret;
104151
104152- if (*len != sizeof(struct ipt_getinfo)) {
104153- duprintf("length %u != %zu\n", *len,
104154+ if (len != sizeof(struct ipt_getinfo)) {
104155+ duprintf("length %u != %zu\n", len,
104156 sizeof(struct ipt_getinfo));
104157 return -EINVAL;
104158 }
104159@@ -1117,7 +1117,7 @@ static int get_info(struct net *net, void __user *user,
104160 info.size = private->size;
104161 strcpy(info.name, name);
104162
104163- if (copy_to_user(user, &info, *len) != 0)
104164+ if (copy_to_user(user, &info, len) != 0)
104165 ret = -EFAULT;
104166 else
104167 ret = 0;
104168@@ -1973,7 +1973,7 @@ compat_do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
104169
104170 switch (cmd) {
104171 case IPT_SO_GET_INFO:
104172- ret = get_info(sock_net(sk), user, len, 1);
104173+ ret = get_info(sock_net(sk), user, *len, 1);
104174 break;
104175 case IPT_SO_GET_ENTRIES:
104176 ret = compat_get_entries(sock_net(sk), user, len);
104177@@ -2020,7 +2020,7 @@ do_ipt_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
104178
104179 switch (cmd) {
104180 case IPT_SO_GET_INFO:
104181- ret = get_info(sock_net(sk), user, len, 0);
104182+ ret = get_info(sock_net(sk), user, *len, 0);
104183 break;
104184
104185 case IPT_SO_GET_ENTRIES:
104186diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
104187index e90f83a..3e6acca 100644
104188--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
104189+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
104190@@ -720,7 +720,7 @@ static int clusterip_net_init(struct net *net)
104191 spin_lock_init(&cn->lock);
104192
104193 #ifdef CONFIG_PROC_FS
104194- cn->procdir = proc_mkdir("ipt_CLUSTERIP", net->proc_net);
104195+ cn->procdir = proc_mkdir_restrict("ipt_CLUSTERIP", net->proc_net);
104196 if (!cn->procdir) {
104197 pr_err("Unable to proc dir entry\n");
104198 return -ENOMEM;
104199diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
104200index 208d543..ab6c0ba 100644
104201--- a/net/ipv4/ping.c
104202+++ b/net/ipv4/ping.c
104203@@ -59,7 +59,7 @@ struct ping_table {
104204 };
104205
104206 static struct ping_table ping_table;
104207-struct pingv6_ops pingv6_ops;
104208+struct pingv6_ops *pingv6_ops;
104209 EXPORT_SYMBOL_GPL(pingv6_ops);
104210
104211 static u16 ping_port_rover;
104212@@ -158,6 +158,7 @@ void ping_unhash(struct sock *sk)
104213 if (sk_hashed(sk)) {
104214 write_lock_bh(&ping_table.lock);
104215 hlist_nulls_del(&sk->sk_nulls_node);
104216+ sk_nulls_node_init(&sk->sk_nulls_node);
104217 sock_put(sk);
104218 isk->inet_num = 0;
104219 isk->inet_sport = 0;
104220@@ -358,7 +359,7 @@ static int ping_check_bind_addr(struct sock *sk, struct inet_sock *isk,
104221 return -ENODEV;
104222 }
104223 }
104224- has_addr = pingv6_ops.ipv6_chk_addr(net, &addr->sin6_addr, dev,
104225+ has_addr = pingv6_ops->ipv6_chk_addr(net, &addr->sin6_addr, dev,
104226 scoped);
104227 rcu_read_unlock();
104228
104229@@ -566,7 +567,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
104230 }
104231 #if IS_ENABLED(CONFIG_IPV6)
104232 } else if (skb->protocol == htons(ETH_P_IPV6)) {
104233- harderr = pingv6_ops.icmpv6_err_convert(type, code, &err);
104234+ harderr = pingv6_ops->icmpv6_err_convert(type, code, &err);
104235 #endif
104236 }
104237
104238@@ -584,7 +585,7 @@ void ping_err(struct sk_buff *skb, int offset, u32 info)
104239 info, (u8 *)icmph);
104240 #if IS_ENABLED(CONFIG_IPV6)
104241 } else if (family == AF_INET6) {
104242- pingv6_ops.ipv6_icmp_error(sk, skb, err, 0,
104243+ pingv6_ops->ipv6_icmp_error(sk, skb, err, 0,
104244 info, (u8 *)icmph);
104245 #endif
104246 }
104247@@ -918,10 +919,10 @@ int ping_recvmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
104248 }
104249
104250 if (inet6_sk(sk)->rxopt.all)
104251- pingv6_ops.ip6_datagram_recv_common_ctl(sk, msg, skb);
104252+ pingv6_ops->ip6_datagram_recv_common_ctl(sk, msg, skb);
104253 if (skb->protocol == htons(ETH_P_IPV6) &&
104254 inet6_sk(sk)->rxopt.all)
104255- pingv6_ops.ip6_datagram_recv_specific_ctl(sk, msg, skb);
104256+ pingv6_ops->ip6_datagram_recv_specific_ctl(sk, msg, skb);
104257 else if (skb->protocol == htons(ETH_P_IP) && isk->cmsg_flags)
104258 ip_cmsg_recv(msg, skb);
104259 #endif
104260@@ -1116,7 +1117,7 @@ static void ping_v4_format_sock(struct sock *sp, struct seq_file *f,
104261 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
104262 0, sock_i_ino(sp),
104263 atomic_read(&sp->sk_refcnt), sp,
104264- atomic_read(&sp->sk_drops));
104265+ atomic_read_unchecked(&sp->sk_drops));
104266 }
104267
104268 static int ping_v4_seq_show(struct seq_file *seq, void *v)
104269diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
104270index f027a70..2e64edc 100644
104271--- a/net/ipv4/raw.c
104272+++ b/net/ipv4/raw.c
104273@@ -324,7 +324,7 @@ static int raw_rcv_skb(struct sock *sk, struct sk_buff *skb)
104274 int raw_rcv(struct sock *sk, struct sk_buff *skb)
104275 {
104276 if (!xfrm4_policy_check(sk, XFRM_POLICY_IN, skb)) {
104277- atomic_inc(&sk->sk_drops);
104278+ atomic_inc_unchecked(&sk->sk_drops);
104279 kfree_skb(skb);
104280 return NET_RX_DROP;
104281 }
104282@@ -773,16 +773,20 @@ static int raw_init(struct sock *sk)
104283
104284 static int raw_seticmpfilter(struct sock *sk, char __user *optval, int optlen)
104285 {
104286+ struct icmp_filter filter;
104287+
104288 if (optlen > sizeof(struct icmp_filter))
104289 optlen = sizeof(struct icmp_filter);
104290- if (copy_from_user(&raw_sk(sk)->filter, optval, optlen))
104291+ if (copy_from_user(&filter, optval, optlen))
104292 return -EFAULT;
104293+ raw_sk(sk)->filter = filter;
104294 return 0;
104295 }
104296
104297 static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *optlen)
104298 {
104299 int len, ret = -EFAULT;
104300+ struct icmp_filter filter;
104301
104302 if (get_user(len, optlen))
104303 goto out;
104304@@ -792,8 +796,8 @@ static int raw_geticmpfilter(struct sock *sk, char __user *optval, int __user *o
104305 if (len > sizeof(struct icmp_filter))
104306 len = sizeof(struct icmp_filter);
104307 ret = -EFAULT;
104308- if (put_user(len, optlen) ||
104309- copy_to_user(optval, &raw_sk(sk)->filter, len))
104310+ filter = raw_sk(sk)->filter;
104311+ if (put_user(len, optlen) || len > sizeof filter || copy_to_user(optval, &filter, len))
104312 goto out;
104313 ret = 0;
104314 out: return ret;
104315@@ -1022,7 +1026,7 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
104316 0, 0L, 0,
104317 from_kuid_munged(seq_user_ns(seq), sock_i_uid(sp)),
104318 0, sock_i_ino(sp),
104319- atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
104320+ atomic_read(&sp->sk_refcnt), sp, atomic_read_unchecked(&sp->sk_drops));
104321 }
104322
104323 static int raw_seq_show(struct seq_file *seq, void *v)
104324diff --git a/net/ipv4/route.c b/net/ipv4/route.c
104325index ad50643..53b7b44 100644
104326--- a/net/ipv4/route.c
104327+++ b/net/ipv4/route.c
104328@@ -228,7 +228,7 @@ static const struct seq_operations rt_cache_seq_ops = {
104329
104330 static int rt_cache_seq_open(struct inode *inode, struct file *file)
104331 {
104332- return seq_open(file, &rt_cache_seq_ops);
104333+ return seq_open_restrict(file, &rt_cache_seq_ops);
104334 }
104335
104336 static const struct file_operations rt_cache_seq_fops = {
104337@@ -319,7 +319,7 @@ static const struct seq_operations rt_cpu_seq_ops = {
104338
104339 static int rt_cpu_seq_open(struct inode *inode, struct file *file)
104340 {
104341- return seq_open(file, &rt_cpu_seq_ops);
104342+ return seq_open_restrict(file, &rt_cpu_seq_ops);
104343 }
104344
104345 static const struct file_operations rt_cpu_seq_fops = {
104346@@ -357,7 +357,7 @@ static int rt_acct_proc_show(struct seq_file *m, void *v)
104347
104348 static int rt_acct_proc_open(struct inode *inode, struct file *file)
104349 {
104350- return single_open(file, rt_acct_proc_show, NULL);
104351+ return single_open_restrict(file, rt_acct_proc_show, NULL);
104352 }
104353
104354 static const struct file_operations rt_acct_proc_fops = {
104355@@ -459,11 +459,11 @@ static struct neighbour *ipv4_neigh_lookup(const struct dst_entry *dst,
104356
104357 #define IP_IDENTS_SZ 2048u
104358 struct ip_ident_bucket {
104359- atomic_t id;
104360+ atomic_unchecked_t id;
104361 u32 stamp32;
104362 };
104363
104364-static struct ip_ident_bucket *ip_idents __read_mostly;
104365+static struct ip_ident_bucket ip_idents[IP_IDENTS_SZ] __read_mostly;
104366
104367 /* In order to protect privacy, we add a perturbation to identifiers
104368 * if one generator is seldom used. This makes hard for an attacker
104369@@ -479,7 +479,7 @@ u32 ip_idents_reserve(u32 hash, int segs)
104370 if (old != now && cmpxchg(&bucket->stamp32, old, now) == old)
104371 delta = prandom_u32_max(now - old);
104372
104373- return atomic_add_return(segs + delta, &bucket->id) - segs;
104374+ return atomic_add_return_unchecked(segs + delta, &bucket->id) - segs;
104375 }
104376 EXPORT_SYMBOL(ip_idents_reserve);
104377
104378@@ -2642,34 +2642,34 @@ static struct ctl_table ipv4_route_flush_table[] = {
104379 .maxlen = sizeof(int),
104380 .mode = 0200,
104381 .proc_handler = ipv4_sysctl_rtcache_flush,
104382+ .extra1 = &init_net,
104383 },
104384 { },
104385 };
104386
104387 static __net_init int sysctl_route_net_init(struct net *net)
104388 {
104389- struct ctl_table *tbl;
104390+ ctl_table_no_const *tbl = NULL;
104391
104392- tbl = ipv4_route_flush_table;
104393 if (!net_eq(net, &init_net)) {
104394- tbl = kmemdup(tbl, sizeof(ipv4_route_flush_table), GFP_KERNEL);
104395+ tbl = kmemdup(ipv4_route_flush_table, sizeof(ipv4_route_flush_table), GFP_KERNEL);
104396 if (tbl == NULL)
104397 goto err_dup;
104398
104399 /* Don't export sysctls to unprivileged users */
104400 if (net->user_ns != &init_user_ns)
104401 tbl[0].procname = NULL;
104402- }
104403- tbl[0].extra1 = net;
104404+ tbl[0].extra1 = net;
104405+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
104406+ } else
104407+ net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", ipv4_route_flush_table);
104408
104409- net->ipv4.route_hdr = register_net_sysctl(net, "net/ipv4/route", tbl);
104410 if (net->ipv4.route_hdr == NULL)
104411 goto err_reg;
104412 return 0;
104413
104414 err_reg:
104415- if (tbl != ipv4_route_flush_table)
104416- kfree(tbl);
104417+ kfree(tbl);
104418 err_dup:
104419 return -ENOMEM;
104420 }
104421@@ -2692,8 +2692,8 @@ static __net_initdata struct pernet_operations sysctl_route_ops = {
104422
104423 static __net_init int rt_genid_init(struct net *net)
104424 {
104425- atomic_set(&net->ipv4.rt_genid, 0);
104426- atomic_set(&net->fnhe_genid, 0);
104427+ atomic_set_unchecked(&net->ipv4.rt_genid, 0);
104428+ atomic_set_unchecked(&net->fnhe_genid, 0);
104429 get_random_bytes(&net->ipv4.dev_addr_genid,
104430 sizeof(net->ipv4.dev_addr_genid));
104431 return 0;
104432@@ -2737,11 +2737,7 @@ int __init ip_rt_init(void)
104433 int rc = 0;
104434 int cpu;
104435
104436- ip_idents = kmalloc(IP_IDENTS_SZ * sizeof(*ip_idents), GFP_KERNEL);
104437- if (!ip_idents)
104438- panic("IP: failed to allocate ip_idents\n");
104439-
104440- prandom_bytes(ip_idents, IP_IDENTS_SZ * sizeof(*ip_idents));
104441+ prandom_bytes(ip_idents, sizeof(ip_idents));
104442
104443 for_each_possible_cpu(cpu) {
104444 struct uncached_list *ul = &per_cpu(rt_uncached_list, cpu);
104445diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
104446index d151539..5f5e247 100644
104447--- a/net/ipv4/sysctl_net_ipv4.c
104448+++ b/net/ipv4/sysctl_net_ipv4.c
104449@@ -60,7 +60,7 @@ static int ipv4_local_port_range(struct ctl_table *table, int write,
104450 container_of(table->data, struct net, ipv4.ip_local_ports.range);
104451 int ret;
104452 int range[2];
104453- struct ctl_table tmp = {
104454+ ctl_table_no_const tmp = {
104455 .data = &range,
104456 .maxlen = sizeof(range),
104457 .mode = table->mode,
104458@@ -118,7 +118,7 @@ static int ipv4_ping_group_range(struct ctl_table *table, int write,
104459 int ret;
104460 gid_t urange[2];
104461 kgid_t low, high;
104462- struct ctl_table tmp = {
104463+ ctl_table_no_const tmp = {
104464 .data = &urange,
104465 .maxlen = sizeof(urange),
104466 .mode = table->mode,
104467@@ -149,7 +149,7 @@ static int proc_tcp_congestion_control(struct ctl_table *ctl, int write,
104468 void __user *buffer, size_t *lenp, loff_t *ppos)
104469 {
104470 char val[TCP_CA_NAME_MAX];
104471- struct ctl_table tbl = {
104472+ ctl_table_no_const tbl = {
104473 .data = val,
104474 .maxlen = TCP_CA_NAME_MAX,
104475 };
104476@@ -168,7 +168,7 @@ static int proc_tcp_available_congestion_control(struct ctl_table *ctl,
104477 void __user *buffer, size_t *lenp,
104478 loff_t *ppos)
104479 {
104480- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX, };
104481+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX, };
104482 int ret;
104483
104484 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
104485@@ -185,7 +185,7 @@ static int proc_allowed_congestion_control(struct ctl_table *ctl,
104486 void __user *buffer, size_t *lenp,
104487 loff_t *ppos)
104488 {
104489- struct ctl_table tbl = { .maxlen = TCP_CA_BUF_MAX };
104490+ ctl_table_no_const tbl = { .maxlen = TCP_CA_BUF_MAX };
104491 int ret;
104492
104493 tbl.data = kmalloc(tbl.maxlen, GFP_USER);
104494@@ -204,7 +204,7 @@ static int proc_tcp_fastopen_key(struct ctl_table *ctl, int write,
104495 void __user *buffer, size_t *lenp,
104496 loff_t *ppos)
104497 {
104498- struct ctl_table tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
104499+ ctl_table_no_const tbl = { .maxlen = (TCP_FASTOPEN_KEY_LENGTH * 2 + 10) };
104500 struct tcp_fastopen_context *ctxt;
104501 int ret;
104502 u32 user_key[4]; /* 16 bytes, matching TCP_FASTOPEN_KEY_LENGTH */
104503@@ -888,13 +888,12 @@ static struct ctl_table ipv4_net_table[] = {
104504
104505 static __net_init int ipv4_sysctl_init_net(struct net *net)
104506 {
104507- struct ctl_table *table;
104508+ ctl_table_no_const *table = NULL;
104509
104510- table = ipv4_net_table;
104511 if (!net_eq(net, &init_net)) {
104512 int i;
104513
104514- table = kmemdup(table, sizeof(ipv4_net_table), GFP_KERNEL);
104515+ table = kmemdup(ipv4_net_table, sizeof(ipv4_net_table), GFP_KERNEL);
104516 if (table == NULL)
104517 goto err_alloc;
104518
104519@@ -903,7 +902,10 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
104520 table[i].data += (void *)net - (void *)&init_net;
104521 }
104522
104523- net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
104524+ if (!net_eq(net, &init_net))
104525+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", table);
104526+ else
104527+ net->ipv4.ipv4_hdr = register_net_sysctl(net, "net/ipv4", ipv4_net_table);
104528 if (net->ipv4.ipv4_hdr == NULL)
104529 goto err_reg;
104530
104531diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
104532index 995a225..e1e9183 100644
104533--- a/net/ipv4/tcp.c
104534+++ b/net/ipv4/tcp.c
104535@@ -520,8 +520,10 @@ unsigned int tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
104536
104537 /* Race breaker. If space is freed after
104538 * wspace test but before the flags are set,
104539- * IO signal will be lost.
104540+ * IO signal will be lost. Memory barrier
104541+ * pairs with the input side.
104542 */
104543+ smp_mb__after_atomic();
104544 if (sk_stream_is_writeable(sk))
104545 mask |= POLLOUT | POLLWRNORM;
104546 }
104547diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
104548index f501ac04..0c5a1b2 100644
104549--- a/net/ipv4/tcp_input.c
104550+++ b/net/ipv4/tcp_input.c
104551@@ -767,7 +767,7 @@ static void tcp_update_pacing_rate(struct sock *sk)
104552 * without any lock. We want to make sure compiler wont store
104553 * intermediate values in this location.
104554 */
104555- ACCESS_ONCE(sk->sk_pacing_rate) = min_t(u64, rate,
104556+ ACCESS_ONCE_RW(sk->sk_pacing_rate) = min_t(u64, rate,
104557 sk->sk_max_pacing_rate);
104558 }
104559
104560@@ -4541,7 +4541,7 @@ static struct sk_buff *tcp_collapse_one(struct sock *sk, struct sk_buff *skb,
104561 * simplifies code)
104562 */
104563 static void
104564-tcp_collapse(struct sock *sk, struct sk_buff_head *list,
104565+__intentional_overflow(5,6) tcp_collapse(struct sock *sk, struct sk_buff_head *list,
104566 struct sk_buff *head, struct sk_buff *tail,
104567 u32 start, u32 end)
104568 {
104569@@ -4799,6 +4799,8 @@ static void tcp_check_space(struct sock *sk)
104570 {
104571 if (sock_flag(sk, SOCK_QUEUE_SHRUNK)) {
104572 sock_reset_flag(sk, SOCK_QUEUE_SHRUNK);
104573+ /* pairs with tcp_poll() */
104574+ smp_mb__after_atomic();
104575 if (sk->sk_socket &&
104576 test_bit(SOCK_NOSPACE, &sk->sk_socket->flags))
104577 tcp_new_space(sk);
104578@@ -5525,6 +5527,7 @@ discard:
104579 tcp_paws_reject(&tp->rx_opt, 0))
104580 goto discard_and_undo;
104581
104582+#ifndef CONFIG_GRKERNSEC_NO_SIMULT_CONNECT
104583 if (th->syn) {
104584 /* We see SYN without ACK. It is attempt of
104585 * simultaneous connect with crossed SYNs.
104586@@ -5575,6 +5578,7 @@ discard:
104587 goto discard;
104588 #endif
104589 }
104590+#endif
104591 /* "fifth, if neither of the SYN or RST bits is set then
104592 * drop the segment and return."
104593 */
104594@@ -5621,7 +5625,7 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb,
104595 goto discard;
104596
104597 if (th->syn) {
104598- if (th->fin)
104599+ if (th->fin || th->urg || th->psh)
104600 goto discard;
104601 if (icsk->icsk_af_ops->conn_request(sk, skb) < 0)
104602 return 1;
104603diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
104604index f1756ee..8908cb0 100644
104605--- a/net/ipv4/tcp_ipv4.c
104606+++ b/net/ipv4/tcp_ipv4.c
104607@@ -89,6 +89,10 @@ int sysctl_tcp_tw_reuse __read_mostly;
104608 int sysctl_tcp_low_latency __read_mostly;
104609 EXPORT_SYMBOL(sysctl_tcp_low_latency);
104610
104611+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104612+extern int grsec_enable_blackhole;
104613+#endif
104614+
104615 #ifdef CONFIG_TCP_MD5SIG
104616 static int tcp_v4_md5_hash_hdr(char *md5_hash, const struct tcp_md5sig_key *key,
104617 __be32 daddr, __be32 saddr, const struct tcphdr *th);
104618@@ -1475,6 +1479,9 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb)
104619 return 0;
104620
104621 reset:
104622+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104623+ if (!grsec_enable_blackhole)
104624+#endif
104625 tcp_v4_send_reset(rsk, skb);
104626 discard:
104627 kfree_skb(skb);
104628@@ -1639,12 +1646,19 @@ int tcp_v4_rcv(struct sk_buff *skb)
104629 TCP_SKB_CB(skb)->sacked = 0;
104630
104631 sk = __inet_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest);
104632- if (!sk)
104633+ if (!sk) {
104634+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104635+ ret = 1;
104636+#endif
104637 goto no_tcp_socket;
104638-
104639+ }
104640 process:
104641- if (sk->sk_state == TCP_TIME_WAIT)
104642+ if (sk->sk_state == TCP_TIME_WAIT) {
104643+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104644+ ret = 2;
104645+#endif
104646 goto do_time_wait;
104647+ }
104648
104649 if (unlikely(iph->ttl < inet_sk(sk)->min_ttl)) {
104650 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
104651@@ -1700,6 +1714,10 @@ csum_error:
104652 bad_packet:
104653 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
104654 } else {
104655+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104656+ if (!grsec_enable_blackhole || (ret == 1 &&
104657+ (skb->dev->flags & IFF_LOOPBACK)))
104658+#endif
104659 tcp_v4_send_reset(NULL, skb);
104660 }
104661
104662diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c
104663index dd11ac7..c0872da 100644
104664--- a/net/ipv4/tcp_minisocks.c
104665+++ b/net/ipv4/tcp_minisocks.c
104666@@ -27,6 +27,10 @@
104667 #include <net/inet_common.h>
104668 #include <net/xfrm.h>
104669
104670+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104671+extern int grsec_enable_blackhole;
104672+#endif
104673+
104674 int sysctl_tcp_syncookies __read_mostly = 1;
104675 EXPORT_SYMBOL(sysctl_tcp_syncookies);
104676
104677@@ -785,7 +789,10 @@ embryonic_reset:
104678 * avoid becoming vulnerable to outside attack aiming at
104679 * resetting legit local connections.
104680 */
104681- req->rsk_ops->send_reset(sk, skb);
104682+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104683+ if (!grsec_enable_blackhole)
104684+#endif
104685+ req->rsk_ops->send_reset(sk, skb);
104686 } else if (fastopen) { /* received a valid RST pkt */
104687 reqsk_fastopen_remove(sk, req, true);
104688 tcp_reset(sk);
104689diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
104690index ebf5ff5..4d1ff32 100644
104691--- a/net/ipv4/tcp_probe.c
104692+++ b/net/ipv4/tcp_probe.c
104693@@ -236,7 +236,7 @@ static ssize_t tcpprobe_read(struct file *file, char __user *buf,
104694 if (cnt + width >= len)
104695 break;
104696
104697- if (copy_to_user(buf + cnt, tbuf, width))
104698+ if (width > sizeof tbuf || copy_to_user(buf + cnt, tbuf, width))
104699 return -EFAULT;
104700 cnt += width;
104701 }
104702diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
104703index 0732b78..a82bdc6 100644
104704--- a/net/ipv4/tcp_timer.c
104705+++ b/net/ipv4/tcp_timer.c
104706@@ -22,6 +22,10 @@
104707 #include <linux/gfp.h>
104708 #include <net/tcp.h>
104709
104710+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104711+extern int grsec_lastack_retries;
104712+#endif
104713+
104714 int sysctl_tcp_syn_retries __read_mostly = TCP_SYN_RETRIES;
104715 int sysctl_tcp_synack_retries __read_mostly = TCP_SYNACK_RETRIES;
104716 int sysctl_tcp_keepalive_time __read_mostly = TCP_KEEPALIVE_TIME;
104717@@ -194,6 +198,13 @@ static int tcp_write_timeout(struct sock *sk)
104718 }
104719 }
104720
104721+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104722+ if ((sk->sk_state == TCP_LAST_ACK) &&
104723+ (grsec_lastack_retries > 0) &&
104724+ (grsec_lastack_retries < retry_until))
104725+ retry_until = grsec_lastack_retries;
104726+#endif
104727+
104728 if (retransmits_timed_out(sk, retry_until,
104729 syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
104730 /* Has it gone just too far? */
104731diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
104732index 97ef1f8b..e446c33 100644
104733--- a/net/ipv4/udp.c
104734+++ b/net/ipv4/udp.c
104735@@ -87,6 +87,7 @@
104736 #include <linux/types.h>
104737 #include <linux/fcntl.h>
104738 #include <linux/module.h>
104739+#include <linux/security.h>
104740 #include <linux/socket.h>
104741 #include <linux/sockios.h>
104742 #include <linux/igmp.h>
104743@@ -114,6 +115,10 @@
104744 #include <net/busy_poll.h>
104745 #include "udp_impl.h"
104746
104747+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104748+extern int grsec_enable_blackhole;
104749+#endif
104750+
104751 struct udp_table udp_table __read_mostly;
104752 EXPORT_SYMBOL(udp_table);
104753
104754@@ -608,6 +613,9 @@ static inline bool __udp_is_mcast_sock(struct net *net, struct sock *sk,
104755 return true;
104756 }
104757
104758+extern int gr_search_udp_recvmsg(struct sock *sk, const struct sk_buff *skb);
104759+extern int gr_search_udp_sendmsg(struct sock *sk, struct sockaddr_in *addr);
104760+
104761 /*
104762 * This routine is called by the ICMP module when it gets some
104763 * sort of error condition. If err < 0 then the socket should
104764@@ -945,9 +953,18 @@ int udp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg,
104765 dport = usin->sin_port;
104766 if (dport == 0)
104767 return -EINVAL;
104768+
104769+ err = gr_search_udp_sendmsg(sk, usin);
104770+ if (err)
104771+ return err;
104772 } else {
104773 if (sk->sk_state != TCP_ESTABLISHED)
104774 return -EDESTADDRREQ;
104775+
104776+ err = gr_search_udp_sendmsg(sk, NULL);
104777+ if (err)
104778+ return err;
104779+
104780 daddr = inet->inet_daddr;
104781 dport = inet->inet_dport;
104782 /* Open fast path for connected socket.
104783@@ -1195,7 +1212,7 @@ static unsigned int first_packet_length(struct sock *sk)
104784 IS_UDPLITE(sk));
104785 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
104786 IS_UDPLITE(sk));
104787- atomic_inc(&sk->sk_drops);
104788+ atomic_inc_unchecked(&sk->sk_drops);
104789 __skb_unlink(skb, rcvq);
104790 __skb_queue_tail(&list_kill, skb);
104791 }
104792@@ -1275,6 +1292,10 @@ try_again:
104793 if (!skb)
104794 goto out;
104795
104796+ err = gr_search_udp_recvmsg(sk, skb);
104797+ if (err)
104798+ goto out_free;
104799+
104800 ulen = skb->len - sizeof(struct udphdr);
104801 copied = len;
104802 if (copied > ulen)
104803@@ -1307,7 +1328,7 @@ try_again:
104804 if (unlikely(err)) {
104805 trace_kfree_skb(skb, udp_recvmsg);
104806 if (!peeked) {
104807- atomic_inc(&sk->sk_drops);
104808+ atomic_inc_unchecked(&sk->sk_drops);
104809 UDP_INC_STATS_USER(sock_net(sk),
104810 UDP_MIB_INERRORS, is_udplite);
104811 }
104812@@ -1605,7 +1626,7 @@ csum_error:
104813 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
104814 drop:
104815 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
104816- atomic_inc(&sk->sk_drops);
104817+ atomic_inc_unchecked(&sk->sk_drops);
104818 kfree_skb(skb);
104819 return -1;
104820 }
104821@@ -1624,7 +1645,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
104822 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
104823
104824 if (!skb1) {
104825- atomic_inc(&sk->sk_drops);
104826+ atomic_inc_unchecked(&sk->sk_drops);
104827 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
104828 IS_UDPLITE(sk));
104829 UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
104830@@ -1830,6 +1851,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
104831 goto csum_error;
104832
104833 UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
104834+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
104835+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
104836+#endif
104837 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
104838
104839 /*
104840@@ -2416,7 +2440,7 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
104841 from_kuid_munged(seq_user_ns(f), sock_i_uid(sp)),
104842 0, sock_i_ino(sp),
104843 atomic_read(&sp->sk_refcnt), sp,
104844- atomic_read(&sp->sk_drops));
104845+ atomic_read_unchecked(&sp->sk_drops));
104846 }
104847
104848 int udp4_seq_show(struct seq_file *seq, void *v)
104849diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
104850index 6156f68..d6ab46d 100644
104851--- a/net/ipv4/xfrm4_policy.c
104852+++ b/net/ipv4/xfrm4_policy.c
104853@@ -186,11 +186,11 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl, int reverse)
104854 fl4->flowi4_tos = iph->tos;
104855 }
104856
104857-static inline int xfrm4_garbage_collect(struct dst_ops *ops)
104858+static int xfrm4_garbage_collect(struct dst_ops *ops)
104859 {
104860 struct net *net = container_of(ops, struct net, xfrm.xfrm4_dst_ops);
104861
104862- xfrm4_policy_afinfo.garbage_collect(net);
104863+ xfrm_garbage_collect_deferred(net);
104864 return (dst_entries_get_slow(ops) > ops->gc_thresh * 2);
104865 }
104866
104867@@ -269,19 +269,18 @@ static struct ctl_table xfrm4_policy_table[] = {
104868
104869 static int __net_init xfrm4_net_init(struct net *net)
104870 {
104871- struct ctl_table *table;
104872+ ctl_table_no_const *table = NULL;
104873 struct ctl_table_header *hdr;
104874
104875- table = xfrm4_policy_table;
104876 if (!net_eq(net, &init_net)) {
104877- table = kmemdup(table, sizeof(xfrm4_policy_table), GFP_KERNEL);
104878+ table = kmemdup(xfrm4_policy_table, sizeof(xfrm4_policy_table), GFP_KERNEL);
104879 if (!table)
104880 goto err_alloc;
104881
104882 table[0].data = &net->xfrm.xfrm4_dst_ops.gc_thresh;
104883- }
104884-
104885- hdr = register_net_sysctl(net, "net/ipv4", table);
104886+ hdr = register_net_sysctl(net, "net/ipv4", table);
104887+ } else
104888+ hdr = register_net_sysctl(net, "net/ipv4", xfrm4_policy_table);
104889 if (!hdr)
104890 goto err_reg;
104891
104892@@ -289,8 +288,7 @@ static int __net_init xfrm4_net_init(struct net *net)
104893 return 0;
104894
104895 err_reg:
104896- if (!net_eq(net, &init_net))
104897- kfree(table);
104898+ kfree(table);
104899 err_alloc:
104900 return -ENOMEM;
104901 }
104902diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
104903index b603002..0de5c88 100644
104904--- a/net/ipv6/addrconf.c
104905+++ b/net/ipv6/addrconf.c
104906@@ -171,7 +171,7 @@ static struct ipv6_devconf ipv6_devconf __read_mostly = {
104907 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
104908 .mtu6 = IPV6_MIN_MTU,
104909 .accept_ra = 1,
104910- .accept_redirects = 1,
104911+ .accept_redirects = 0,
104912 .autoconf = 1,
104913 .force_mld_version = 0,
104914 .mldv1_unsolicited_report_interval = 10 * HZ,
104915@@ -209,7 +209,7 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = {
104916 .hop_limit = IPV6_DEFAULT_HOPLIMIT,
104917 .mtu6 = IPV6_MIN_MTU,
104918 .accept_ra = 1,
104919- .accept_redirects = 1,
104920+ .accept_redirects = 0,
104921 .autoconf = 1,
104922 .force_mld_version = 0,
104923 .mldv1_unsolicited_report_interval = 10 * HZ,
104924@@ -607,7 +607,7 @@ static int inet6_netconf_dump_devconf(struct sk_buff *skb,
104925 idx = 0;
104926 head = &net->dev_index_head[h];
104927 rcu_read_lock();
104928- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^
104929+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^
104930 net->dev_base_seq;
104931 hlist_for_each_entry_rcu(dev, head, index_hlist) {
104932 if (idx < s_idx)
104933@@ -2438,7 +2438,7 @@ int addrconf_set_dstaddr(struct net *net, void __user *arg)
104934 p.iph.ihl = 5;
104935 p.iph.protocol = IPPROTO_IPV6;
104936 p.iph.ttl = 64;
104937- ifr.ifr_ifru.ifru_data = (__force void __user *)&p;
104938+ ifr.ifr_ifru.ifru_data = (void __force_user *)&p;
104939
104940 if (ops->ndo_do_ioctl) {
104941 mm_segment_t oldfs = get_fs();
104942@@ -3587,16 +3587,23 @@ static const struct file_operations if6_fops = {
104943 .release = seq_release_net,
104944 };
104945
104946+extern void register_ipv6_seq_ops_addr(struct seq_operations *addr);
104947+extern void unregister_ipv6_seq_ops_addr(void);
104948+
104949 static int __net_init if6_proc_net_init(struct net *net)
104950 {
104951- if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops))
104952+ register_ipv6_seq_ops_addr(&if6_seq_ops);
104953+ if (!proc_create("if_inet6", S_IRUGO, net->proc_net, &if6_fops)) {
104954+ unregister_ipv6_seq_ops_addr();
104955 return -ENOMEM;
104956+ }
104957 return 0;
104958 }
104959
104960 static void __net_exit if6_proc_net_exit(struct net *net)
104961 {
104962 remove_proc_entry("if_inet6", net->proc_net);
104963+ unregister_ipv6_seq_ops_addr();
104964 }
104965
104966 static struct pernet_operations if6_proc_net_ops = {
104967@@ -4215,7 +4222,7 @@ static int inet6_dump_addr(struct sk_buff *skb, struct netlink_callback *cb,
104968 s_ip_idx = ip_idx = cb->args[2];
104969
104970 rcu_read_lock();
104971- cb->seq = atomic_read(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
104972+ cb->seq = atomic_read_unchecked(&net->ipv6.dev_addr_genid) ^ net->dev_base_seq;
104973 for (h = s_h; h < NETDEV_HASHENTRIES; h++, s_idx = 0) {
104974 idx = 0;
104975 head = &net->dev_index_head[h];
104976@@ -4864,7 +4871,7 @@ static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
104977 rt_genid_bump_ipv6(net);
104978 break;
104979 }
104980- atomic_inc(&net->ipv6.dev_addr_genid);
104981+ atomic_inc_unchecked(&net->ipv6.dev_addr_genid);
104982 }
104983
104984 static void ipv6_ifa_notify(int event, struct inet6_ifaddr *ifp)
104985@@ -4884,7 +4891,7 @@ int addrconf_sysctl_forward(struct ctl_table *ctl, int write,
104986 int *valp = ctl->data;
104987 int val = *valp;
104988 loff_t pos = *ppos;
104989- struct ctl_table lctl;
104990+ ctl_table_no_const lctl;
104991 int ret;
104992
104993 /*
104994@@ -4909,7 +4916,7 @@ int addrconf_sysctl_mtu(struct ctl_table *ctl, int write,
104995 {
104996 struct inet6_dev *idev = ctl->extra1;
104997 int min_mtu = IPV6_MIN_MTU;
104998- struct ctl_table lctl;
104999+ ctl_table_no_const lctl;
105000
105001 lctl = *ctl;
105002 lctl.extra1 = &min_mtu;
105003@@ -4984,7 +4991,7 @@ int addrconf_sysctl_disable(struct ctl_table *ctl, int write,
105004 int *valp = ctl->data;
105005 int val = *valp;
105006 loff_t pos = *ppos;
105007- struct ctl_table lctl;
105008+ ctl_table_no_const lctl;
105009 int ret;
105010
105011 /*
105012diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
105013index e8c4400..a4cd5da 100644
105014--- a/net/ipv6/af_inet6.c
105015+++ b/net/ipv6/af_inet6.c
105016@@ -766,7 +766,7 @@ static int __net_init inet6_net_init(struct net *net)
105017 net->ipv6.sysctl.icmpv6_time = 1*HZ;
105018 net->ipv6.sysctl.flowlabel_consistency = 1;
105019 net->ipv6.sysctl.auto_flowlabels = 0;
105020- atomic_set(&net->ipv6.fib6_sernum, 1);
105021+ atomic_set_unchecked(&net->ipv6.fib6_sernum, 1);
105022
105023 err = ipv6_init_mibs(net);
105024 if (err)
105025diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c
105026index ace8dac..bd6942d 100644
105027--- a/net/ipv6/datagram.c
105028+++ b/net/ipv6/datagram.c
105029@@ -957,5 +957,5 @@ void ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,
105030 0,
105031 sock_i_ino(sp),
105032 atomic_read(&sp->sk_refcnt), sp,
105033- atomic_read(&sp->sk_drops));
105034+ atomic_read_unchecked(&sp->sk_drops));
105035 }
105036diff --git a/net/ipv6/icmp.c b/net/ipv6/icmp.c
105037index a5e9519..16b7412 100644
105038--- a/net/ipv6/icmp.c
105039+++ b/net/ipv6/icmp.c
105040@@ -1005,7 +1005,7 @@ static struct ctl_table ipv6_icmp_table_template[] = {
105041
105042 struct ctl_table * __net_init ipv6_icmp_sysctl_init(struct net *net)
105043 {
105044- struct ctl_table *table;
105045+ ctl_table_no_const *table;
105046
105047 table = kmemdup(ipv6_icmp_table_template,
105048 sizeof(ipv6_icmp_table_template),
105049diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
105050index 263ef41..88c7be8 100644
105051--- a/net/ipv6/ip6_fib.c
105052+++ b/net/ipv6/ip6_fib.c
105053@@ -99,9 +99,9 @@ static int fib6_new_sernum(struct net *net)
105054 int new, old;
105055
105056 do {
105057- old = atomic_read(&net->ipv6.fib6_sernum);
105058+ old = atomic_read_unchecked(&net->ipv6.fib6_sernum);
105059 new = old < INT_MAX ? old + 1 : 1;
105060- } while (atomic_cmpxchg(&net->ipv6.fib6_sernum,
105061+ } while (atomic_cmpxchg_unchecked(&net->ipv6.fib6_sernum,
105062 old, new) != old);
105063 return new;
105064 }
105065diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c
105066index bc28b7d..a08feea 100644
105067--- a/net/ipv6/ip6_gre.c
105068+++ b/net/ipv6/ip6_gre.c
105069@@ -71,8 +71,8 @@ struct ip6gre_net {
105070 struct net_device *fb_tunnel_dev;
105071 };
105072
105073-static struct rtnl_link_ops ip6gre_link_ops __read_mostly;
105074-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly;
105075+static struct rtnl_link_ops ip6gre_link_ops;
105076+static struct rtnl_link_ops ip6gre_tap_ops;
105077 static int ip6gre_tunnel_init(struct net_device *dev);
105078 static void ip6gre_tunnel_setup(struct net_device *dev);
105079 static void ip6gre_tunnel_link(struct ip6gre_net *ign, struct ip6_tnl *t);
105080@@ -1289,7 +1289,7 @@ static void ip6gre_fb_tunnel_init(struct net_device *dev)
105081 }
105082
105083
105084-static struct inet6_protocol ip6gre_protocol __read_mostly = {
105085+static struct inet6_protocol ip6gre_protocol = {
105086 .handler = ip6gre_rcv,
105087 .err_handler = ip6gre_err,
105088 .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
105089@@ -1650,7 +1650,7 @@ static const struct nla_policy ip6gre_policy[IFLA_GRE_MAX + 1] = {
105090 [IFLA_GRE_FLAGS] = { .type = NLA_U32 },
105091 };
105092
105093-static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
105094+static struct rtnl_link_ops ip6gre_link_ops = {
105095 .kind = "ip6gre",
105096 .maxtype = IFLA_GRE_MAX,
105097 .policy = ip6gre_policy,
105098@@ -1665,7 +1665,7 @@ static struct rtnl_link_ops ip6gre_link_ops __read_mostly = {
105099 .get_link_net = ip6_tnl_get_link_net,
105100 };
105101
105102-static struct rtnl_link_ops ip6gre_tap_ops __read_mostly = {
105103+static struct rtnl_link_ops ip6gre_tap_ops = {
105104 .kind = "ip6gretap",
105105 .maxtype = IFLA_GRE_MAX,
105106 .policy = ip6gre_policy,
105107diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c
105108index ddd94ec..b7cfefb 100644
105109--- a/net/ipv6/ip6_tunnel.c
105110+++ b/net/ipv6/ip6_tunnel.c
105111@@ -86,7 +86,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
105112
105113 static int ip6_tnl_dev_init(struct net_device *dev);
105114 static void ip6_tnl_dev_setup(struct net_device *dev);
105115-static struct rtnl_link_ops ip6_link_ops __read_mostly;
105116+static struct rtnl_link_ops ip6_link_ops;
105117
105118 static int ip6_tnl_net_id __read_mostly;
105119 struct ip6_tnl_net {
105120@@ -1780,7 +1780,7 @@ static const struct nla_policy ip6_tnl_policy[IFLA_IPTUN_MAX + 1] = {
105121 [IFLA_IPTUN_PROTO] = { .type = NLA_U8 },
105122 };
105123
105124-static struct rtnl_link_ops ip6_link_ops __read_mostly = {
105125+static struct rtnl_link_ops ip6_link_ops = {
105126 .kind = "ip6tnl",
105127 .maxtype = IFLA_IPTUN_MAX,
105128 .policy = ip6_tnl_policy,
105129diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c
105130index 5fb9e21..92bf04b 100644
105131--- a/net/ipv6/ip6_vti.c
105132+++ b/net/ipv6/ip6_vti.c
105133@@ -62,7 +62,7 @@ static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2)
105134
105135 static int vti6_dev_init(struct net_device *dev);
105136 static void vti6_dev_setup(struct net_device *dev);
105137-static struct rtnl_link_ops vti6_link_ops __read_mostly;
105138+static struct rtnl_link_ops vti6_link_ops;
105139
105140 static int vti6_net_id __read_mostly;
105141 struct vti6_net {
105142@@ -1004,7 +1004,7 @@ static const struct nla_policy vti6_policy[IFLA_VTI_MAX + 1] = {
105143 [IFLA_VTI_OKEY] = { .type = NLA_U32 },
105144 };
105145
105146-static struct rtnl_link_ops vti6_link_ops __read_mostly = {
105147+static struct rtnl_link_ops vti6_link_ops = {
105148 .kind = "vti6",
105149 .maxtype = IFLA_VTI_MAX,
105150 .policy = vti6_policy,
105151diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
105152index 8d766d9..dcdfea7 100644
105153--- a/net/ipv6/ipv6_sockglue.c
105154+++ b/net/ipv6/ipv6_sockglue.c
105155@@ -989,7 +989,7 @@ static int do_ipv6_getsockopt(struct sock *sk, int level, int optname,
105156 if (sk->sk_type != SOCK_STREAM)
105157 return -ENOPROTOOPT;
105158
105159- msg.msg_control = optval;
105160+ msg.msg_control = (void __force_kernel *)optval;
105161 msg.msg_controllen = len;
105162 msg.msg_flags = flags;
105163
105164diff --git a/net/ipv6/netfilter/ip6_tables.c b/net/ipv6/netfilter/ip6_tables.c
105165index bb00c6f..16c90d7 100644
105166--- a/net/ipv6/netfilter/ip6_tables.c
105167+++ b/net/ipv6/netfilter/ip6_tables.c
105168@@ -1083,14 +1083,14 @@ static int compat_table_info(const struct xt_table_info *info,
105169 #endif
105170
105171 static int get_info(struct net *net, void __user *user,
105172- const int *len, int compat)
105173+ int len, int compat)
105174 {
105175 char name[XT_TABLE_MAXNAMELEN];
105176 struct xt_table *t;
105177 int ret;
105178
105179- if (*len != sizeof(struct ip6t_getinfo)) {
105180- duprintf("length %u != %zu\n", *len,
105181+ if (len != sizeof(struct ip6t_getinfo)) {
105182+ duprintf("length %u != %zu\n", len,
105183 sizeof(struct ip6t_getinfo));
105184 return -EINVAL;
105185 }
105186@@ -1127,7 +1127,7 @@ static int get_info(struct net *net, void __user *user,
105187 info.size = private->size;
105188 strcpy(info.name, name);
105189
105190- if (copy_to_user(user, &info, *len) != 0)
105191+ if (copy_to_user(user, &info, len) != 0)
105192 ret = -EFAULT;
105193 else
105194 ret = 0;
105195@@ -1983,7 +1983,7 @@ compat_do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
105196
105197 switch (cmd) {
105198 case IP6T_SO_GET_INFO:
105199- ret = get_info(sock_net(sk), user, len, 1);
105200+ ret = get_info(sock_net(sk), user, *len, 1);
105201 break;
105202 case IP6T_SO_GET_ENTRIES:
105203 ret = compat_get_entries(sock_net(sk), user, len);
105204@@ -2030,7 +2030,7 @@ do_ip6t_get_ctl(struct sock *sk, int cmd, void __user *user, int *len)
105205
105206 switch (cmd) {
105207 case IP6T_SO_GET_INFO:
105208- ret = get_info(sock_net(sk), user, len, 0);
105209+ ret = get_info(sock_net(sk), user, *len, 0);
105210 break;
105211
105212 case IP6T_SO_GET_ENTRIES:
105213diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
105214index 6f187c8..34b367f 100644
105215--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
105216+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
105217@@ -96,12 +96,11 @@ static struct ctl_table nf_ct_frag6_sysctl_table[] = {
105218
105219 static int nf_ct_frag6_sysctl_register(struct net *net)
105220 {
105221- struct ctl_table *table;
105222+ ctl_table_no_const *table = NULL;
105223 struct ctl_table_header *hdr;
105224
105225- table = nf_ct_frag6_sysctl_table;
105226 if (!net_eq(net, &init_net)) {
105227- table = kmemdup(table, sizeof(nf_ct_frag6_sysctl_table),
105228+ table = kmemdup(nf_ct_frag6_sysctl_table, sizeof(nf_ct_frag6_sysctl_table),
105229 GFP_KERNEL);
105230 if (table == NULL)
105231 goto err_alloc;
105232@@ -112,9 +111,9 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
105233 table[2].data = &net->nf_frag.frags.high_thresh;
105234 table[2].extra1 = &net->nf_frag.frags.low_thresh;
105235 table[2].extra2 = &init_net.nf_frag.frags.high_thresh;
105236- }
105237-
105238- hdr = register_net_sysctl(net, "net/netfilter", table);
105239+ hdr = register_net_sysctl(net, "net/netfilter", table);
105240+ } else
105241+ hdr = register_net_sysctl(net, "net/netfilter", nf_ct_frag6_sysctl_table);
105242 if (hdr == NULL)
105243 goto err_reg;
105244
105245@@ -122,8 +121,7 @@ static int nf_ct_frag6_sysctl_register(struct net *net)
105246 return 0;
105247
105248 err_reg:
105249- if (!net_eq(net, &init_net))
105250- kfree(table);
105251+ kfree(table);
105252 err_alloc:
105253 return -ENOMEM;
105254 }
105255diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c
105256index a2dfff6..1e52e6d 100644
105257--- a/net/ipv6/ping.c
105258+++ b/net/ipv6/ping.c
105259@@ -241,6 +241,24 @@ static struct pernet_operations ping_v6_net_ops = {
105260 };
105261 #endif
105262
105263+static struct pingv6_ops real_pingv6_ops = {
105264+ .ipv6_recv_error = ipv6_recv_error,
105265+ .ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl,
105266+ .ip6_datagram_recv_specific_ctl = ip6_datagram_recv_specific_ctl,
105267+ .icmpv6_err_convert = icmpv6_err_convert,
105268+ .ipv6_icmp_error = ipv6_icmp_error,
105269+ .ipv6_chk_addr = ipv6_chk_addr,
105270+};
105271+
105272+static struct pingv6_ops dummy_pingv6_ops = {
105273+ .ipv6_recv_error = dummy_ipv6_recv_error,
105274+ .ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl,
105275+ .ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl,
105276+ .icmpv6_err_convert = dummy_icmpv6_err_convert,
105277+ .ipv6_icmp_error = dummy_ipv6_icmp_error,
105278+ .ipv6_chk_addr = dummy_ipv6_chk_addr,
105279+};
105280+
105281 int __init pingv6_init(void)
105282 {
105283 #ifdef CONFIG_PROC_FS
105284@@ -248,13 +266,7 @@ int __init pingv6_init(void)
105285 if (ret)
105286 return ret;
105287 #endif
105288- pingv6_ops.ipv6_recv_error = ipv6_recv_error;
105289- pingv6_ops.ip6_datagram_recv_common_ctl = ip6_datagram_recv_common_ctl;
105290- pingv6_ops.ip6_datagram_recv_specific_ctl =
105291- ip6_datagram_recv_specific_ctl;
105292- pingv6_ops.icmpv6_err_convert = icmpv6_err_convert;
105293- pingv6_ops.ipv6_icmp_error = ipv6_icmp_error;
105294- pingv6_ops.ipv6_chk_addr = ipv6_chk_addr;
105295+ pingv6_ops = &real_pingv6_ops;
105296 return inet6_register_protosw(&pingv6_protosw);
105297 }
105298
105299@@ -263,14 +275,9 @@ int __init pingv6_init(void)
105300 */
105301 void pingv6_exit(void)
105302 {
105303- pingv6_ops.ipv6_recv_error = dummy_ipv6_recv_error;
105304- pingv6_ops.ip6_datagram_recv_common_ctl = dummy_ip6_datagram_recv_ctl;
105305- pingv6_ops.ip6_datagram_recv_specific_ctl = dummy_ip6_datagram_recv_ctl;
105306- pingv6_ops.icmpv6_err_convert = dummy_icmpv6_err_convert;
105307- pingv6_ops.ipv6_icmp_error = dummy_ipv6_icmp_error;
105308- pingv6_ops.ipv6_chk_addr = dummy_ipv6_chk_addr;
105309 #ifdef CONFIG_PROC_FS
105310 unregister_pernet_subsys(&ping_v6_net_ops);
105311 #endif
105312+ pingv6_ops = &dummy_pingv6_ops;
105313 inet6_unregister_protosw(&pingv6_protosw);
105314 }
105315diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
105316index 679253d0..70b653c 100644
105317--- a/net/ipv6/proc.c
105318+++ b/net/ipv6/proc.c
105319@@ -310,7 +310,7 @@ static int __net_init ipv6_proc_init_net(struct net *net)
105320 if (!proc_create("snmp6", S_IRUGO, net->proc_net, &snmp6_seq_fops))
105321 goto proc_snmp6_fail;
105322
105323- net->mib.proc_net_devsnmp6 = proc_mkdir("dev_snmp6", net->proc_net);
105324+ net->mib.proc_net_devsnmp6 = proc_mkdir_restrict("dev_snmp6", net->proc_net);
105325 if (!net->mib.proc_net_devsnmp6)
105326 goto proc_dev_snmp6_fail;
105327 return 0;
105328diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
105329index dae7f1a..783b20d 100644
105330--- a/net/ipv6/raw.c
105331+++ b/net/ipv6/raw.c
105332@@ -388,7 +388,7 @@ static inline int rawv6_rcv_skb(struct sock *sk, struct sk_buff *skb)
105333 {
105334 if ((raw6_sk(sk)->checksum || rcu_access_pointer(sk->sk_filter)) &&
105335 skb_checksum_complete(skb)) {
105336- atomic_inc(&sk->sk_drops);
105337+ atomic_inc_unchecked(&sk->sk_drops);
105338 kfree_skb(skb);
105339 return NET_RX_DROP;
105340 }
105341@@ -416,7 +416,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
105342 struct raw6_sock *rp = raw6_sk(sk);
105343
105344 if (!xfrm6_policy_check(sk, XFRM_POLICY_IN, skb)) {
105345- atomic_inc(&sk->sk_drops);
105346+ atomic_inc_unchecked(&sk->sk_drops);
105347 kfree_skb(skb);
105348 return NET_RX_DROP;
105349 }
105350@@ -440,7 +440,7 @@ int rawv6_rcv(struct sock *sk, struct sk_buff *skb)
105351
105352 if (inet->hdrincl) {
105353 if (skb_checksum_complete(skb)) {
105354- atomic_inc(&sk->sk_drops);
105355+ atomic_inc_unchecked(&sk->sk_drops);
105356 kfree_skb(skb);
105357 return NET_RX_DROP;
105358 }
105359@@ -609,7 +609,7 @@ out:
105360 return err;
105361 }
105362
105363-static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, int length,
105364+static int rawv6_send_hdrinc(struct sock *sk, struct msghdr *msg, unsigned int length,
105365 struct flowi6 *fl6, struct dst_entry **dstp,
105366 unsigned int flags)
105367 {
105368@@ -915,12 +915,15 @@ do_confirm:
105369 static int rawv6_seticmpfilter(struct sock *sk, int level, int optname,
105370 char __user *optval, int optlen)
105371 {
105372+ struct icmp6_filter filter;
105373+
105374 switch (optname) {
105375 case ICMPV6_FILTER:
105376 if (optlen > sizeof(struct icmp6_filter))
105377 optlen = sizeof(struct icmp6_filter);
105378- if (copy_from_user(&raw6_sk(sk)->filter, optval, optlen))
105379+ if (copy_from_user(&filter, optval, optlen))
105380 return -EFAULT;
105381+ raw6_sk(sk)->filter = filter;
105382 return 0;
105383 default:
105384 return -ENOPROTOOPT;
105385@@ -933,6 +936,7 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
105386 char __user *optval, int __user *optlen)
105387 {
105388 int len;
105389+ struct icmp6_filter filter;
105390
105391 switch (optname) {
105392 case ICMPV6_FILTER:
105393@@ -944,7 +948,8 @@ static int rawv6_geticmpfilter(struct sock *sk, int level, int optname,
105394 len = sizeof(struct icmp6_filter);
105395 if (put_user(len, optlen))
105396 return -EFAULT;
105397- if (copy_to_user(optval, &raw6_sk(sk)->filter, len))
105398+ filter = raw6_sk(sk)->filter;
105399+ if (len > sizeof filter || copy_to_user(optval, &filter, len))
105400 return -EFAULT;
105401 return 0;
105402 default:
105403diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
105404index d7d70e6..bd5e9fc 100644
105405--- a/net/ipv6/reassembly.c
105406+++ b/net/ipv6/reassembly.c
105407@@ -626,12 +626,11 @@ static struct ctl_table ip6_frags_ctl_table[] = {
105408
105409 static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
105410 {
105411- struct ctl_table *table;
105412+ ctl_table_no_const *table = NULL;
105413 struct ctl_table_header *hdr;
105414
105415- table = ip6_frags_ns_ctl_table;
105416 if (!net_eq(net, &init_net)) {
105417- table = kmemdup(table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
105418+ table = kmemdup(ip6_frags_ns_ctl_table, sizeof(ip6_frags_ns_ctl_table), GFP_KERNEL);
105419 if (table == NULL)
105420 goto err_alloc;
105421
105422@@ -645,9 +644,10 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
105423 /* Don't export sysctls to unprivileged users */
105424 if (net->user_ns != &init_user_ns)
105425 table[0].procname = NULL;
105426- }
105427+ hdr = register_net_sysctl(net, "net/ipv6", table);
105428+ } else
105429+ hdr = register_net_sysctl(net, "net/ipv6", ip6_frags_ns_ctl_table);
105430
105431- hdr = register_net_sysctl(net, "net/ipv6", table);
105432 if (hdr == NULL)
105433 goto err_reg;
105434
105435@@ -655,8 +655,7 @@ static int __net_init ip6_frags_ns_sysctl_register(struct net *net)
105436 return 0;
105437
105438 err_reg:
105439- if (!net_eq(net, &init_net))
105440- kfree(table);
105441+ kfree(table);
105442 err_alloc:
105443 return -ENOMEM;
105444 }
105445diff --git a/net/ipv6/route.c b/net/ipv6/route.c
105446index 4688bd4..584453d 100644
105447--- a/net/ipv6/route.c
105448+++ b/net/ipv6/route.c
105449@@ -3029,7 +3029,7 @@ struct ctl_table ipv6_route_table_template[] = {
105450
105451 struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net)
105452 {
105453- struct ctl_table *table;
105454+ ctl_table_no_const *table;
105455
105456 table = kmemdup(ipv6_route_table_template,
105457 sizeof(ipv6_route_table_template),
105458diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
105459index e4cbd57..02b1aaa 100644
105460--- a/net/ipv6/sit.c
105461+++ b/net/ipv6/sit.c
105462@@ -74,7 +74,7 @@ static void ipip6_tunnel_setup(struct net_device *dev);
105463 static void ipip6_dev_free(struct net_device *dev);
105464 static bool check_6rd(struct ip_tunnel *tunnel, const struct in6_addr *v6dst,
105465 __be32 *v4dst);
105466-static struct rtnl_link_ops sit_link_ops __read_mostly;
105467+static struct rtnl_link_ops sit_link_ops;
105468
105469 static int sit_net_id __read_mostly;
105470 struct sit_net {
105471@@ -1751,7 +1751,7 @@ static void ipip6_dellink(struct net_device *dev, struct list_head *head)
105472 unregister_netdevice_queue(dev, head);
105473 }
105474
105475-static struct rtnl_link_ops sit_link_ops __read_mostly = {
105476+static struct rtnl_link_ops sit_link_ops = {
105477 .kind = "sit",
105478 .maxtype = IFLA_IPTUN_MAX,
105479 .policy = ipip6_policy,
105480diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
105481index c5c10fa..2577d51 100644
105482--- a/net/ipv6/sysctl_net_ipv6.c
105483+++ b/net/ipv6/sysctl_net_ipv6.c
105484@@ -78,7 +78,7 @@ static struct ctl_table ipv6_rotable[] = {
105485
105486 static int __net_init ipv6_sysctl_net_init(struct net *net)
105487 {
105488- struct ctl_table *ipv6_table;
105489+ ctl_table_no_const *ipv6_table;
105490 struct ctl_table *ipv6_route_table;
105491 struct ctl_table *ipv6_icmp_table;
105492 int err;
105493diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
105494index 1f5e622..8387d90 100644
105495--- a/net/ipv6/tcp_ipv6.c
105496+++ b/net/ipv6/tcp_ipv6.c
105497@@ -104,6 +104,10 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
105498 }
105499 }
105500
105501+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
105502+extern int grsec_enable_blackhole;
105503+#endif
105504+
105505 static void tcp_v6_hash(struct sock *sk)
105506 {
105507 if (sk->sk_state != TCP_CLOSE) {
105508@@ -1345,6 +1349,9 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb)
105509 return 0;
105510
105511 reset:
105512+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
105513+ if (!grsec_enable_blackhole)
105514+#endif
105515 tcp_v6_send_reset(sk, skb);
105516 discard:
105517 if (opt_skb)
105518@@ -1454,12 +1461,20 @@ static int tcp_v6_rcv(struct sk_buff *skb)
105519
105520 sk = __inet6_lookup_skb(&tcp_hashinfo, skb, th->source, th->dest,
105521 inet6_iif(skb));
105522- if (!sk)
105523+ if (!sk) {
105524+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
105525+ ret = 1;
105526+#endif
105527 goto no_tcp_socket;
105528+ }
105529
105530 process:
105531- if (sk->sk_state == TCP_TIME_WAIT)
105532+ if (sk->sk_state == TCP_TIME_WAIT) {
105533+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
105534+ ret = 2;
105535+#endif
105536 goto do_time_wait;
105537+ }
105538
105539 if (hdr->hop_limit < inet6_sk(sk)->min_hopcount) {
105540 NET_INC_STATS_BH(net, LINUX_MIB_TCPMINTTLDROP);
105541@@ -1510,6 +1525,10 @@ csum_error:
105542 bad_packet:
105543 TCP_INC_STATS_BH(net, TCP_MIB_INERRS);
105544 } else {
105545+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
105546+ if (!grsec_enable_blackhole || (ret == 1 &&
105547+ (skb->dev->flags & IFF_LOOPBACK)))
105548+#endif
105549 tcp_v6_send_reset(NULL, skb);
105550 }
105551
105552diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
105553index d048d46..bf141c3 100644
105554--- a/net/ipv6/udp.c
105555+++ b/net/ipv6/udp.c
105556@@ -76,6 +76,10 @@ static unsigned int udp6_ehashfn(struct net *net,
105557 udp_ipv6_hash_secret + net_hash_mix(net));
105558 }
105559
105560+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
105561+extern int grsec_enable_blackhole;
105562+#endif
105563+
105564 int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
105565 {
105566 const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2);
105567@@ -448,7 +452,7 @@ try_again:
105568 if (unlikely(err)) {
105569 trace_kfree_skb(skb, udpv6_recvmsg);
105570 if (!peeked) {
105571- atomic_inc(&sk->sk_drops);
105572+ atomic_inc_unchecked(&sk->sk_drops);
105573 if (is_udp4)
105574 UDP_INC_STATS_USER(sock_net(sk),
105575 UDP_MIB_INERRORS,
105576@@ -714,7 +718,7 @@ csum_error:
105577 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_CSUMERRORS, is_udplite);
105578 drop:
105579 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
105580- atomic_inc(&sk->sk_drops);
105581+ atomic_inc_unchecked(&sk->sk_drops);
105582 kfree_skb(skb);
105583 return -1;
105584 }
105585@@ -753,7 +757,7 @@ static void flush_stack(struct sock **stack, unsigned int count,
105586 if (likely(skb1 == NULL))
105587 skb1 = (i == final) ? skb : skb_clone(skb, GFP_ATOMIC);
105588 if (!skb1) {
105589- atomic_inc(&sk->sk_drops);
105590+ atomic_inc_unchecked(&sk->sk_drops);
105591 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_RCVBUFERRORS,
105592 IS_UDPLITE(sk));
105593 UDP6_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS,
105594@@ -937,6 +941,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable,
105595 goto csum_error;
105596
105597 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE);
105598+#ifdef CONFIG_GRKERNSEC_BLACKHOLE
105599+ if (!grsec_enable_blackhole || (skb->dev->flags & IFF_LOOPBACK))
105600+#endif
105601 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0);
105602
105603 kfree_skb(skb);
105604diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
105605index 8d2d01b4..313511e 100644
105606--- a/net/ipv6/xfrm6_policy.c
105607+++ b/net/ipv6/xfrm6_policy.c
105608@@ -224,11 +224,11 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl, int reverse)
105609 }
105610 }
105611
105612-static inline int xfrm6_garbage_collect(struct dst_ops *ops)
105613+static int xfrm6_garbage_collect(struct dst_ops *ops)
105614 {
105615 struct net *net = container_of(ops, struct net, xfrm.xfrm6_dst_ops);
105616
105617- xfrm6_policy_afinfo.garbage_collect(net);
105618+ xfrm_garbage_collect_deferred(net);
105619 return dst_entries_get_fast(ops) > ops->gc_thresh * 2;
105620 }
105621
105622@@ -341,19 +341,19 @@ static struct ctl_table xfrm6_policy_table[] = {
105623
105624 static int __net_init xfrm6_net_init(struct net *net)
105625 {
105626- struct ctl_table *table;
105627+ ctl_table_no_const *table = NULL;
105628 struct ctl_table_header *hdr;
105629
105630- table = xfrm6_policy_table;
105631 if (!net_eq(net, &init_net)) {
105632- table = kmemdup(table, sizeof(xfrm6_policy_table), GFP_KERNEL);
105633+ table = kmemdup(xfrm6_policy_table, sizeof(xfrm6_policy_table), GFP_KERNEL);
105634 if (!table)
105635 goto err_alloc;
105636
105637 table[0].data = &net->xfrm.xfrm6_dst_ops.gc_thresh;
105638- }
105639+ hdr = register_net_sysctl(net, "net/ipv6", table);
105640+ } else
105641+ hdr = register_net_sysctl(net, "net/ipv6", xfrm6_policy_table);
105642
105643- hdr = register_net_sysctl(net, "net/ipv6", table);
105644 if (!hdr)
105645 goto err_reg;
105646
105647@@ -361,8 +361,7 @@ static int __net_init xfrm6_net_init(struct net *net)
105648 return 0;
105649
105650 err_reg:
105651- if (!net_eq(net, &init_net))
105652- kfree(table);
105653+ kfree(table);
105654 err_alloc:
105655 return -ENOMEM;
105656 }
105657diff --git a/net/ipx/ipx_proc.c b/net/ipx/ipx_proc.c
105658index c1d247e..9e5949d 100644
105659--- a/net/ipx/ipx_proc.c
105660+++ b/net/ipx/ipx_proc.c
105661@@ -289,7 +289,7 @@ int __init ipx_proc_init(void)
105662 struct proc_dir_entry *p;
105663 int rc = -ENOMEM;
105664
105665- ipx_proc_dir = proc_mkdir("ipx", init_net.proc_net);
105666+ ipx_proc_dir = proc_mkdir_restrict("ipx", init_net.proc_net);
105667
105668 if (!ipx_proc_dir)
105669 goto out;
105670diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
105671index 683346d..cb0e12d 100644
105672--- a/net/irda/ircomm/ircomm_tty.c
105673+++ b/net/irda/ircomm/ircomm_tty.c
105674@@ -310,10 +310,10 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
105675 add_wait_queue(&port->open_wait, &wait);
105676
105677 pr_debug("%s(%d):block_til_ready before block on %s open_count=%d\n",
105678- __FILE__, __LINE__, tty->driver->name, port->count);
105679+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
105680
105681 spin_lock_irqsave(&port->lock, flags);
105682- port->count--;
105683+ atomic_dec(&port->count);
105684 port->blocked_open++;
105685 spin_unlock_irqrestore(&port->lock, flags);
105686
105687@@ -348,7 +348,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
105688 }
105689
105690 pr_debug("%s(%d):block_til_ready blocking on %s open_count=%d\n",
105691- __FILE__, __LINE__, tty->driver->name, port->count);
105692+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
105693
105694 schedule();
105695 }
105696@@ -358,12 +358,12 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
105697
105698 spin_lock_irqsave(&port->lock, flags);
105699 if (!tty_hung_up_p(filp))
105700- port->count++;
105701+ atomic_inc(&port->count);
105702 port->blocked_open--;
105703 spin_unlock_irqrestore(&port->lock, flags);
105704
105705 pr_debug("%s(%d):block_til_ready after blocking on %s open_count=%d\n",
105706- __FILE__, __LINE__, tty->driver->name, port->count);
105707+ __FILE__, __LINE__, tty->driver->name, atomic_read(&port->count));
105708
105709 if (!retval)
105710 port->flags |= ASYNC_NORMAL_ACTIVE;
105711@@ -433,12 +433,12 @@ static int ircomm_tty_open(struct tty_struct *tty, struct file *filp)
105712
105713 /* ++ is not atomic, so this should be protected - Jean II */
105714 spin_lock_irqsave(&self->port.lock, flags);
105715- self->port.count++;
105716+ atomic_inc(&self->port.count);
105717 spin_unlock_irqrestore(&self->port.lock, flags);
105718 tty_port_tty_set(&self->port, tty);
105719
105720 pr_debug("%s(), %s%d, count = %d\n", __func__ , tty->driver->name,
105721- self->line, self->port.count);
105722+ self->line, atomic_read(&self->port.count));
105723
105724 /* Not really used by us, but lets do it anyway */
105725 self->port.low_latency = (self->port.flags & ASYNC_LOW_LATENCY) ? 1 : 0;
105726@@ -961,7 +961,7 @@ static void ircomm_tty_hangup(struct tty_struct *tty)
105727 tty_kref_put(port->tty);
105728 }
105729 port->tty = NULL;
105730- port->count = 0;
105731+ atomic_set(&port->count, 0);
105732 spin_unlock_irqrestore(&port->lock, flags);
105733
105734 wake_up_interruptible(&port->open_wait);
105735@@ -1308,7 +1308,7 @@ static void ircomm_tty_line_info(struct ircomm_tty_cb *self, struct seq_file *m)
105736 seq_putc(m, '\n');
105737
105738 seq_printf(m, "Role: %s\n", self->client ? "client" : "server");
105739- seq_printf(m, "Open count: %d\n", self->port.count);
105740+ seq_printf(m, "Open count: %d\n", atomic_read(&self->port.count));
105741 seq_printf(m, "Max data size: %d\n", self->max_data_size);
105742 seq_printf(m, "Max header size: %d\n", self->max_header_size);
105743
105744diff --git a/net/irda/irproc.c b/net/irda/irproc.c
105745index b9ac598..f88cc56 100644
105746--- a/net/irda/irproc.c
105747+++ b/net/irda/irproc.c
105748@@ -66,7 +66,7 @@ void __init irda_proc_register(void)
105749 {
105750 int i;
105751
105752- proc_irda = proc_mkdir("irda", init_net.proc_net);
105753+ proc_irda = proc_mkdir_restrict("irda", init_net.proc_net);
105754 if (proc_irda == NULL)
105755 return;
105756
105757diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
105758index 53d9311..cbaf99f 100644
105759--- a/net/iucv/af_iucv.c
105760+++ b/net/iucv/af_iucv.c
105761@@ -686,10 +686,10 @@ static void __iucv_auto_name(struct iucv_sock *iucv)
105762 {
105763 char name[12];
105764
105765- sprintf(name, "%08x", atomic_inc_return(&iucv_sk_list.autobind_name));
105766+ sprintf(name, "%08x", atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
105767 while (__iucv_get_sock_by_name(name)) {
105768 sprintf(name, "%08x",
105769- atomic_inc_return(&iucv_sk_list.autobind_name));
105770+ atomic_inc_return_unchecked(&iucv_sk_list.autobind_name));
105771 }
105772 memcpy(iucv->src_name, name, 8);
105773 }
105774diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
105775index 2a6a1fd..6c112b0 100644
105776--- a/net/iucv/iucv.c
105777+++ b/net/iucv/iucv.c
105778@@ -702,7 +702,7 @@ static int iucv_cpu_notify(struct notifier_block *self,
105779 return NOTIFY_OK;
105780 }
105781
105782-static struct notifier_block __refdata iucv_cpu_notifier = {
105783+static struct notifier_block iucv_cpu_notifier = {
105784 .notifier_call = iucv_cpu_notify,
105785 };
105786
105787diff --git a/net/key/af_key.c b/net/key/af_key.c
105788index f8ac939..1e189bf 100644
105789--- a/net/key/af_key.c
105790+++ b/net/key/af_key.c
105791@@ -3049,10 +3049,10 @@ static int pfkey_send_policy_notify(struct xfrm_policy *xp, int dir, const struc
105792 static u32 get_acqseq(void)
105793 {
105794 u32 res;
105795- static atomic_t acqseq;
105796+ static atomic_unchecked_t acqseq;
105797
105798 do {
105799- res = atomic_inc_return(&acqseq);
105800+ res = atomic_inc_return_unchecked(&acqseq);
105801 } while (!res);
105802 return res;
105803 }
105804diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
105805index 781b3a2..73a7434 100644
105806--- a/net/l2tp/l2tp_eth.c
105807+++ b/net/l2tp/l2tp_eth.c
105808@@ -42,12 +42,12 @@ struct l2tp_eth {
105809 struct sock *tunnel_sock;
105810 struct l2tp_session *session;
105811 struct list_head list;
105812- atomic_long_t tx_bytes;
105813- atomic_long_t tx_packets;
105814- atomic_long_t tx_dropped;
105815- atomic_long_t rx_bytes;
105816- atomic_long_t rx_packets;
105817- atomic_long_t rx_errors;
105818+ atomic_long_unchecked_t tx_bytes;
105819+ atomic_long_unchecked_t tx_packets;
105820+ atomic_long_unchecked_t tx_dropped;
105821+ atomic_long_unchecked_t rx_bytes;
105822+ atomic_long_unchecked_t rx_packets;
105823+ atomic_long_unchecked_t rx_errors;
105824 };
105825
105826 /* via l2tp_session_priv() */
105827@@ -98,10 +98,10 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
105828 int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
105829
105830 if (likely(ret == NET_XMIT_SUCCESS)) {
105831- atomic_long_add(len, &priv->tx_bytes);
105832- atomic_long_inc(&priv->tx_packets);
105833+ atomic_long_add_unchecked(len, &priv->tx_bytes);
105834+ atomic_long_inc_unchecked(&priv->tx_packets);
105835 } else {
105836- atomic_long_inc(&priv->tx_dropped);
105837+ atomic_long_inc_unchecked(&priv->tx_dropped);
105838 }
105839 return NETDEV_TX_OK;
105840 }
105841@@ -111,12 +111,12 @@ static struct rtnl_link_stats64 *l2tp_eth_get_stats64(struct net_device *dev,
105842 {
105843 struct l2tp_eth *priv = netdev_priv(dev);
105844
105845- stats->tx_bytes = atomic_long_read(&priv->tx_bytes);
105846- stats->tx_packets = atomic_long_read(&priv->tx_packets);
105847- stats->tx_dropped = atomic_long_read(&priv->tx_dropped);
105848- stats->rx_bytes = atomic_long_read(&priv->rx_bytes);
105849- stats->rx_packets = atomic_long_read(&priv->rx_packets);
105850- stats->rx_errors = atomic_long_read(&priv->rx_errors);
105851+ stats->tx_bytes = atomic_long_read_unchecked(&priv->tx_bytes);
105852+ stats->tx_packets = atomic_long_read_unchecked(&priv->tx_packets);
105853+ stats->tx_dropped = atomic_long_read_unchecked(&priv->tx_dropped);
105854+ stats->rx_bytes = atomic_long_read_unchecked(&priv->rx_bytes);
105855+ stats->rx_packets = atomic_long_read_unchecked(&priv->rx_packets);
105856+ stats->rx_errors = atomic_long_read_unchecked(&priv->rx_errors);
105857 return stats;
105858 }
105859
105860@@ -167,15 +167,15 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
105861 nf_reset(skb);
105862
105863 if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
105864- atomic_long_inc(&priv->rx_packets);
105865- atomic_long_add(data_len, &priv->rx_bytes);
105866+ atomic_long_inc_unchecked(&priv->rx_packets);
105867+ atomic_long_add_unchecked(data_len, &priv->rx_bytes);
105868 } else {
105869- atomic_long_inc(&priv->rx_errors);
105870+ atomic_long_inc_unchecked(&priv->rx_errors);
105871 }
105872 return;
105873
105874 error:
105875- atomic_long_inc(&priv->rx_errors);
105876+ atomic_long_inc_unchecked(&priv->rx_errors);
105877 kfree_skb(skb);
105878 }
105879
105880diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c
105881index 05dfc8aa..df6cfd7 100644
105882--- a/net/l2tp/l2tp_ip.c
105883+++ b/net/l2tp/l2tp_ip.c
105884@@ -608,7 +608,7 @@ static struct inet_protosw l2tp_ip_protosw = {
105885 .ops = &l2tp_ip_ops,
105886 };
105887
105888-static struct net_protocol l2tp_ip_protocol __read_mostly = {
105889+static const struct net_protocol l2tp_ip_protocol = {
105890 .handler = l2tp_ip_recv,
105891 .netns_ok = 1,
105892 };
105893diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c
105894index 8611f1b..bc60a2d 100644
105895--- a/net/l2tp/l2tp_ip6.c
105896+++ b/net/l2tp/l2tp_ip6.c
105897@@ -757,7 +757,7 @@ static struct inet_protosw l2tp_ip6_protosw = {
105898 .ops = &l2tp_ip6_ops,
105899 };
105900
105901-static struct inet6_protocol l2tp_ip6_protocol __read_mostly = {
105902+static const struct inet6_protocol l2tp_ip6_protocol = {
105903 .handler = l2tp_ip6_recv,
105904 };
105905
105906diff --git a/net/llc/llc_proc.c b/net/llc/llc_proc.c
105907index 1a3c7e0..80f8b0c 100644
105908--- a/net/llc/llc_proc.c
105909+++ b/net/llc/llc_proc.c
105910@@ -247,7 +247,7 @@ int __init llc_proc_init(void)
105911 int rc = -ENOMEM;
105912 struct proc_dir_entry *p;
105913
105914- llc_proc_dir = proc_mkdir("llc", init_net.proc_net);
105915+ llc_proc_dir = proc_mkdir_restrict("llc", init_net.proc_net);
105916 if (!llc_proc_dir)
105917 goto out;
105918
105919diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
105920index dd4ff36..3462997 100644
105921--- a/net/mac80211/cfg.c
105922+++ b/net/mac80211/cfg.c
105923@@ -581,7 +581,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
105924 ret = ieee80211_vif_use_channel(sdata, chandef,
105925 IEEE80211_CHANCTX_EXCLUSIVE);
105926 }
105927- } else if (local->open_count == local->monitors) {
105928+ } else if (local_read(&local->open_count) == local->monitors) {
105929 local->_oper_chandef = *chandef;
105930 ieee80211_hw_config(local, 0);
105931 }
105932@@ -3468,7 +3468,7 @@ static void ieee80211_mgmt_frame_register(struct wiphy *wiphy,
105933 else
105934 local->probe_req_reg--;
105935
105936- if (!local->open_count)
105937+ if (!local_read(&local->open_count))
105938 break;
105939
105940 ieee80211_queue_work(&local->hw, &local->reconfig_filter);
105941@@ -3603,8 +3603,8 @@ static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
105942 if (chanctx_conf) {
105943 *chandef = sdata->vif.bss_conf.chandef;
105944 ret = 0;
105945- } else if (local->open_count > 0 &&
105946- local->open_count == local->monitors &&
105947+ } else if (local_read(&local->open_count) > 0 &&
105948+ local_read(&local->open_count) == local->monitors &&
105949 sdata->vif.type == NL80211_IFTYPE_MONITOR) {
105950 if (local->use_chanctx)
105951 *chandef = local->monitor_chandef;
105952diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
105953index 8d53d65..a4ac794 100644
105954--- a/net/mac80211/ieee80211_i.h
105955+++ b/net/mac80211/ieee80211_i.h
105956@@ -29,6 +29,7 @@
105957 #include <net/ieee80211_radiotap.h>
105958 #include <net/cfg80211.h>
105959 #include <net/mac80211.h>
105960+#include <asm/local.h>
105961 #include "key.h"
105962 #include "sta_info.h"
105963 #include "debug.h"
105964@@ -1126,7 +1127,7 @@ struct ieee80211_local {
105965 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
105966 spinlock_t queue_stop_reason_lock;
105967
105968- int open_count;
105969+ local_t open_count;
105970 int monitors, cooked_mntrs;
105971 /* number of interfaces with corresponding FIF_ flags */
105972 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
105973diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
105974index 81a2751..c06a026 100644
105975--- a/net/mac80211/iface.c
105976+++ b/net/mac80211/iface.c
105977@@ -544,7 +544,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
105978 break;
105979 }
105980
105981- if (local->open_count == 0) {
105982+ if (local_read(&local->open_count) == 0) {
105983 res = drv_start(local);
105984 if (res)
105985 goto err_del_bss;
105986@@ -591,7 +591,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
105987 res = drv_add_interface(local, sdata);
105988 if (res)
105989 goto err_stop;
105990- } else if (local->monitors == 0 && local->open_count == 0) {
105991+ } else if (local->monitors == 0 && local_read(&local->open_count) == 0) {
105992 res = ieee80211_add_virtual_monitor(local);
105993 if (res)
105994 goto err_stop;
105995@@ -701,7 +701,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
105996 atomic_inc(&local->iff_promiscs);
105997
105998 if (coming_up)
105999- local->open_count++;
106000+ local_inc(&local->open_count);
106001
106002 if (hw_reconf_flags)
106003 ieee80211_hw_config(local, hw_reconf_flags);
106004@@ -739,7 +739,7 @@ int ieee80211_do_open(struct wireless_dev *wdev, bool coming_up)
106005 err_del_interface:
106006 drv_remove_interface(local, sdata);
106007 err_stop:
106008- if (!local->open_count)
106009+ if (!local_read(&local->open_count))
106010 drv_stop(local);
106011 err_del_bss:
106012 sdata->bss = NULL;
106013@@ -907,7 +907,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
106014 }
106015
106016 if (going_down)
106017- local->open_count--;
106018+ local_dec(&local->open_count);
106019
106020 switch (sdata->vif.type) {
106021 case NL80211_IFTYPE_AP_VLAN:
106022@@ -969,7 +969,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
106023 }
106024 spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
106025
106026- if (local->open_count == 0)
106027+ if (local_read(&local->open_count) == 0)
106028 ieee80211_clear_tx_pending(local);
106029
106030 /*
106031@@ -1012,7 +1012,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
106032 if (cancel_scan)
106033 flush_delayed_work(&local->scan_work);
106034
106035- if (local->open_count == 0) {
106036+ if (local_read(&local->open_count) == 0) {
106037 ieee80211_stop_device(local);
106038
106039 /* no reconfiguring after stop! */
106040@@ -1023,7 +1023,7 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
106041 ieee80211_configure_filter(local);
106042 ieee80211_hw_config(local, hw_reconf_flags);
106043
106044- if (local->monitors == local->open_count)
106045+ if (local->monitors == local_read(&local->open_count))
106046 ieee80211_add_virtual_monitor(local);
106047 }
106048
106049diff --git a/net/mac80211/main.c b/net/mac80211/main.c
106050index 5e09d35..e2fdbe2 100644
106051--- a/net/mac80211/main.c
106052+++ b/net/mac80211/main.c
106053@@ -175,7 +175,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
106054 changed &= ~(IEEE80211_CONF_CHANGE_CHANNEL |
106055 IEEE80211_CONF_CHANGE_POWER);
106056
106057- if (changed && local->open_count) {
106058+ if (changed && local_read(&local->open_count)) {
106059 ret = drv_config(local, changed);
106060 /*
106061 * Goal:
106062diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c
106063index ca405b6..6cc8bee 100644
106064--- a/net/mac80211/pm.c
106065+++ b/net/mac80211/pm.c
106066@@ -12,7 +12,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
106067 struct ieee80211_sub_if_data *sdata;
106068 struct sta_info *sta;
106069
106070- if (!local->open_count)
106071+ if (!local_read(&local->open_count))
106072 goto suspend;
106073
106074 ieee80211_scan_cancel(local);
106075@@ -59,7 +59,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
106076 cancel_work_sync(&local->dynamic_ps_enable_work);
106077 del_timer_sync(&local->dynamic_ps_timer);
106078
106079- local->wowlan = wowlan && local->open_count;
106080+ local->wowlan = wowlan && local_read(&local->open_count);
106081 if (local->wowlan) {
106082 int err = drv_suspend(local, wowlan);
106083 if (err < 0) {
106084@@ -126,7 +126,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
106085 WARN_ON(!list_empty(&local->chanctx_list));
106086
106087 /* stop hardware - this must stop RX */
106088- if (local->open_count)
106089+ if (local_read(&local->open_count))
106090 ieee80211_stop_device(local);
106091
106092 suspend:
106093diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
106094index d53355b..21f583a 100644
106095--- a/net/mac80211/rate.c
106096+++ b/net/mac80211/rate.c
106097@@ -724,7 +724,7 @@ int ieee80211_init_rate_ctrl_alg(struct ieee80211_local *local,
106098
106099 ASSERT_RTNL();
106100
106101- if (local->open_count)
106102+ if (local_read(&local->open_count))
106103 return -EBUSY;
106104
106105 if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
106106diff --git a/net/mac80211/util.c b/net/mac80211/util.c
106107index 747bdcf..eb2b981 100644
106108--- a/net/mac80211/util.c
106109+++ b/net/mac80211/util.c
106110@@ -1741,7 +1741,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
106111 bool sched_scan_stopped = false;
106112
106113 /* nothing to do if HW shouldn't run */
106114- if (!local->open_count)
106115+ if (!local_read(&local->open_count))
106116 goto wake_up;
106117
106118 #ifdef CONFIG_PM
106119@@ -1993,7 +1993,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
106120 local->in_reconfig = false;
106121 barrier();
106122
106123- if (local->monitors == local->open_count && local->monitors > 0)
106124+ if (local->monitors == local_read(&local->open_count) && local->monitors > 0)
106125 ieee80211_add_virtual_monitor(local);
106126
106127 /*
106128@@ -2048,7 +2048,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
106129 * If this is for hw restart things are still running.
106130 * We may want to change that later, however.
106131 */
106132- if (local->open_count && (!local->suspended || reconfig_due_to_wowlan))
106133+ if (local_read(&local->open_count) && (!local->suspended || reconfig_due_to_wowlan))
106134 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_RESTART);
106135
106136 if (!local->suspended)
106137@@ -2072,7 +2072,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
106138 flush_delayed_work(&local->scan_work);
106139 }
106140
106141- if (local->open_count && !reconfig_due_to_wowlan)
106142+ if (local_read(&local->open_count) && !reconfig_due_to_wowlan)
106143 drv_reconfig_complete(local, IEEE80211_RECONFIG_TYPE_SUSPEND);
106144
106145 list_for_each_entry(sdata, &local->interfaces, list) {
106146diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
106147index b02660f..c0f791c 100644
106148--- a/net/netfilter/Kconfig
106149+++ b/net/netfilter/Kconfig
106150@@ -1122,6 +1122,16 @@ config NETFILTER_XT_MATCH_ESP
106151
106152 To compile it as a module, choose M here. If unsure, say N.
106153
106154+config NETFILTER_XT_MATCH_GRADM
106155+ tristate '"gradm" match support'
106156+ depends on NETFILTER_XTABLES && NETFILTER_ADVANCED
106157+ depends on GRKERNSEC && !GRKERNSEC_NO_RBAC
106158+ ---help---
106159+ The gradm match allows to match on grsecurity RBAC being enabled.
106160+ It is useful when iptables rules are applied early on bootup to
106161+ prevent connections to the machine (except from a trusted host)
106162+ while the RBAC system is disabled.
106163+
106164 config NETFILTER_XT_MATCH_HASHLIMIT
106165 tristate '"hashlimit" match support'
106166 depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
106167diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
106168index 89f73a9..e4e5bd9 100644
106169--- a/net/netfilter/Makefile
106170+++ b/net/netfilter/Makefile
106171@@ -139,6 +139,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
106172 obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
106173 obj-$(CONFIG_NETFILTER_XT_MATCH_ECN) += xt_ecn.o
106174 obj-$(CONFIG_NETFILTER_XT_MATCH_ESP) += xt_esp.o
106175+obj-$(CONFIG_NETFILTER_XT_MATCH_GRADM) += xt_gradm.o
106176 obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
106177 obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
106178 obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
106179diff --git a/net/netfilter/ipset/ip_set_core.c b/net/netfilter/ipset/ip_set_core.c
106180index d259da3..6a32b2c 100644
106181--- a/net/netfilter/ipset/ip_set_core.c
106182+++ b/net/netfilter/ipset/ip_set_core.c
106183@@ -1952,7 +1952,7 @@ done:
106184 return ret;
106185 }
106186
106187-static struct nf_sockopt_ops so_set __read_mostly = {
106188+static struct nf_sockopt_ops so_set = {
106189 .pf = PF_INET,
106190 .get_optmin = SO_IP_SET,
106191 .get_optmax = SO_IP_SET + 1,
106192diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c
106193index b0f7b62..0541842 100644
106194--- a/net/netfilter/ipvs/ip_vs_conn.c
106195+++ b/net/netfilter/ipvs/ip_vs_conn.c
106196@@ -572,7 +572,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, struct ip_vs_dest *dest)
106197 /* Increase the refcnt counter of the dest */
106198 ip_vs_dest_hold(dest);
106199
106200- conn_flags = atomic_read(&dest->conn_flags);
106201+ conn_flags = atomic_read_unchecked(&dest->conn_flags);
106202 if (cp->protocol != IPPROTO_UDP)
106203 conn_flags &= ~IP_VS_CONN_F_ONE_PACKET;
106204 flags = cp->flags;
106205@@ -922,7 +922,7 @@ ip_vs_conn_new(const struct ip_vs_conn_param *p, int dest_af,
106206
106207 cp->control = NULL;
106208 atomic_set(&cp->n_control, 0);
106209- atomic_set(&cp->in_pkts, 0);
106210+ atomic_set_unchecked(&cp->in_pkts, 0);
106211
106212 cp->packet_xmit = NULL;
106213 cp->app = NULL;
106214@@ -1229,7 +1229,7 @@ static inline int todrop_entry(struct ip_vs_conn *cp)
106215
106216 /* Don't drop the entry if its number of incoming packets is not
106217 located in [0, 8] */
106218- i = atomic_read(&cp->in_pkts);
106219+ i = atomic_read_unchecked(&cp->in_pkts);
106220 if (i > 8 || i < 0) return 0;
106221
106222 if (!todrop_rate[i]) return 0;
106223diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
106224index b87ca32..76c7799 100644
106225--- a/net/netfilter/ipvs/ip_vs_core.c
106226+++ b/net/netfilter/ipvs/ip_vs_core.c
106227@@ -568,7 +568,7 @@ int ip_vs_leave(struct ip_vs_service *svc, struct sk_buff *skb,
106228 ret = cp->packet_xmit(skb, cp, pd->pp, iph);
106229 /* do not touch skb anymore */
106230
106231- atomic_inc(&cp->in_pkts);
106232+ atomic_inc_unchecked(&cp->in_pkts);
106233 ip_vs_conn_put(cp);
106234 return ret;
106235 }
106236@@ -1723,7 +1723,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb, int af)
106237 if (cp->flags & IP_VS_CONN_F_ONE_PACKET)
106238 pkts = sysctl_sync_threshold(ipvs);
106239 else
106240- pkts = atomic_add_return(1, &cp->in_pkts);
106241+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
106242
106243 if (ipvs->sync_state & IP_VS_STATE_MASTER)
106244 ip_vs_sync_conn(net, cp, pkts);
106245diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
106246index ed99448..3ba6cad 100644
106247--- a/net/netfilter/ipvs/ip_vs_ctl.c
106248+++ b/net/netfilter/ipvs/ip_vs_ctl.c
106249@@ -799,7 +799,7 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest,
106250 */
106251 ip_vs_rs_hash(ipvs, dest);
106252 }
106253- atomic_set(&dest->conn_flags, conn_flags);
106254+ atomic_set_unchecked(&dest->conn_flags, conn_flags);
106255
106256 /* bind the service */
106257 old_svc = rcu_dereference_protected(dest->svc, 1);
106258@@ -1664,7 +1664,7 @@ proc_do_sync_ports(struct ctl_table *table, int write,
106259 * align with netns init in ip_vs_control_net_init()
106260 */
106261
106262-static struct ctl_table vs_vars[] = {
106263+static ctl_table_no_const vs_vars[] __read_only = {
106264 {
106265 .procname = "amemthresh",
106266 .maxlen = sizeof(int),
106267@@ -1999,7 +1999,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
106268 " %-7s %-6d %-10d %-10d\n",
106269 &dest->addr.in6,
106270 ntohs(dest->port),
106271- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
106272+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
106273 atomic_read(&dest->weight),
106274 atomic_read(&dest->activeconns),
106275 atomic_read(&dest->inactconns));
106276@@ -2010,7 +2010,7 @@ static int ip_vs_info_seq_show(struct seq_file *seq, void *v)
106277 "%-7s %-6d %-10d %-10d\n",
106278 ntohl(dest->addr.ip),
106279 ntohs(dest->port),
106280- ip_vs_fwd_name(atomic_read(&dest->conn_flags)),
106281+ ip_vs_fwd_name(atomic_read_unchecked(&dest->conn_flags)),
106282 atomic_read(&dest->weight),
106283 atomic_read(&dest->activeconns),
106284 atomic_read(&dest->inactconns));
106285@@ -2499,7 +2499,7 @@ __ip_vs_get_dest_entries(struct net *net, const struct ip_vs_get_dests *get,
106286
106287 entry.addr = dest->addr.ip;
106288 entry.port = dest->port;
106289- entry.conn_flags = atomic_read(&dest->conn_flags);
106290+ entry.conn_flags = atomic_read_unchecked(&dest->conn_flags);
106291 entry.weight = atomic_read(&dest->weight);
106292 entry.u_threshold = dest->u_threshold;
106293 entry.l_threshold = dest->l_threshold;
106294@@ -3040,7 +3040,7 @@ static int ip_vs_genl_fill_dest(struct sk_buff *skb, struct ip_vs_dest *dest)
106295 if (nla_put(skb, IPVS_DEST_ATTR_ADDR, sizeof(dest->addr), &dest->addr) ||
106296 nla_put_be16(skb, IPVS_DEST_ATTR_PORT, dest->port) ||
106297 nla_put_u32(skb, IPVS_DEST_ATTR_FWD_METHOD,
106298- (atomic_read(&dest->conn_flags) &
106299+ (atomic_read_unchecked(&dest->conn_flags) &
106300 IP_VS_CONN_F_FWD_MASK)) ||
106301 nla_put_u32(skb, IPVS_DEST_ATTR_WEIGHT,
106302 atomic_read(&dest->weight)) ||
106303@@ -3675,7 +3675,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net)
106304 {
106305 int idx;
106306 struct netns_ipvs *ipvs = net_ipvs(net);
106307- struct ctl_table *tbl;
106308+ ctl_table_no_const *tbl;
106309
106310 atomic_set(&ipvs->dropentry, 0);
106311 spin_lock_init(&ipvs->dropentry_lock);
106312diff --git a/net/netfilter/ipvs/ip_vs_lblc.c b/net/netfilter/ipvs/ip_vs_lblc.c
106313index 127f140..553d652 100644
106314--- a/net/netfilter/ipvs/ip_vs_lblc.c
106315+++ b/net/netfilter/ipvs/ip_vs_lblc.c
106316@@ -118,7 +118,7 @@ struct ip_vs_lblc_table {
106317 * IPVS LBLC sysctl table
106318 */
106319 #ifdef CONFIG_SYSCTL
106320-static struct ctl_table vs_vars_table[] = {
106321+static ctl_table_no_const vs_vars_table[] __read_only = {
106322 {
106323 .procname = "lblc_expiration",
106324 .data = NULL,
106325diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
106326index 2229d2d..b32b785 100644
106327--- a/net/netfilter/ipvs/ip_vs_lblcr.c
106328+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
106329@@ -289,7 +289,7 @@ struct ip_vs_lblcr_table {
106330 * IPVS LBLCR sysctl table
106331 */
106332
106333-static struct ctl_table vs_vars_table[] = {
106334+static ctl_table_no_const vs_vars_table[] __read_only = {
106335 {
106336 .procname = "lblcr_expiration",
106337 .data = NULL,
106338diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
106339index d93ceeb..4556144 100644
106340--- a/net/netfilter/ipvs/ip_vs_sync.c
106341+++ b/net/netfilter/ipvs/ip_vs_sync.c
106342@@ -609,7 +609,7 @@ static void ip_vs_sync_conn_v0(struct net *net, struct ip_vs_conn *cp,
106343 cp = cp->control;
106344 if (cp) {
106345 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
106346- pkts = atomic_add_return(1, &cp->in_pkts);
106347+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
106348 else
106349 pkts = sysctl_sync_threshold(ipvs);
106350 ip_vs_sync_conn(net, cp->control, pkts);
106351@@ -771,7 +771,7 @@ control:
106352 if (!cp)
106353 return;
106354 if (cp->flags & IP_VS_CONN_F_TEMPLATE)
106355- pkts = atomic_add_return(1, &cp->in_pkts);
106356+ pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
106357 else
106358 pkts = sysctl_sync_threshold(ipvs);
106359 goto sloop;
106360@@ -902,7 +902,7 @@ static void ip_vs_proc_conn(struct net *net, struct ip_vs_conn_param *param,
106361
106362 if (opt)
106363 memcpy(&cp->in_seq, opt, sizeof(*opt));
106364- atomic_set(&cp->in_pkts, sysctl_sync_threshold(ipvs));
106365+ atomic_set_unchecked(&cp->in_pkts, sysctl_sync_threshold(ipvs));
106366 cp->state = state;
106367 cp->old_state = cp->state;
106368 /*
106369diff --git a/net/netfilter/ipvs/ip_vs_xmit.c b/net/netfilter/ipvs/ip_vs_xmit.c
106370index 3aedbda..6a63567 100644
106371--- a/net/netfilter/ipvs/ip_vs_xmit.c
106372+++ b/net/netfilter/ipvs/ip_vs_xmit.c
106373@@ -1214,7 +1214,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
106374 else
106375 rc = NF_ACCEPT;
106376 /* do not touch skb anymore */
106377- atomic_inc(&cp->in_pkts);
106378+ atomic_inc_unchecked(&cp->in_pkts);
106379 goto out;
106380 }
106381
106382@@ -1307,7 +1307,7 @@ ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
106383 else
106384 rc = NF_ACCEPT;
106385 /* do not touch skb anymore */
106386- atomic_inc(&cp->in_pkts);
106387+ atomic_inc_unchecked(&cp->in_pkts);
106388 goto out;
106389 }
106390
106391diff --git a/net/netfilter/nf_conntrack_acct.c b/net/netfilter/nf_conntrack_acct.c
106392index a4b5e2a..13b1de3 100644
106393--- a/net/netfilter/nf_conntrack_acct.c
106394+++ b/net/netfilter/nf_conntrack_acct.c
106395@@ -62,7 +62,7 @@ static struct nf_ct_ext_type acct_extend __read_mostly = {
106396 #ifdef CONFIG_SYSCTL
106397 static int nf_conntrack_acct_init_sysctl(struct net *net)
106398 {
106399- struct ctl_table *table;
106400+ ctl_table_no_const *table;
106401
106402 table = kmemdup(acct_sysctl_table, sizeof(acct_sysctl_table),
106403 GFP_KERNEL);
106404diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c
106405index 13fad86..18c984c 100644
106406--- a/net/netfilter/nf_conntrack_core.c
106407+++ b/net/netfilter/nf_conntrack_core.c
106408@@ -1733,6 +1733,10 @@ void nf_conntrack_init_end(void)
106409 #define DYING_NULLS_VAL ((1<<30)+1)
106410 #define TEMPLATE_NULLS_VAL ((1<<30)+2)
106411
106412+#ifdef CONFIG_GRKERNSEC_HIDESYM
106413+static atomic_unchecked_t conntrack_cache_id = ATOMIC_INIT(0);
106414+#endif
106415+
106416 int nf_conntrack_init_net(struct net *net)
106417 {
106418 int ret = -ENOMEM;
106419@@ -1758,7 +1762,11 @@ int nf_conntrack_init_net(struct net *net)
106420 if (!net->ct.stat)
106421 goto err_pcpu_lists;
106422
106423+#ifdef CONFIG_GRKERNSEC_HIDESYM
106424+ net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%08x", atomic_inc_return_unchecked(&conntrack_cache_id));
106425+#else
106426 net->ct.slabname = kasprintf(GFP_KERNEL, "nf_conntrack_%p", net);
106427+#endif
106428 if (!net->ct.slabname)
106429 goto err_slabname;
106430
106431diff --git a/net/netfilter/nf_conntrack_ecache.c b/net/netfilter/nf_conntrack_ecache.c
106432index 4e78c57..ec8fb74 100644
106433--- a/net/netfilter/nf_conntrack_ecache.c
106434+++ b/net/netfilter/nf_conntrack_ecache.c
106435@@ -264,7 +264,7 @@ static struct nf_ct_ext_type event_extend __read_mostly = {
106436 #ifdef CONFIG_SYSCTL
106437 static int nf_conntrack_event_init_sysctl(struct net *net)
106438 {
106439- struct ctl_table *table;
106440+ ctl_table_no_const *table;
106441
106442 table = kmemdup(event_sysctl_table, sizeof(event_sysctl_table),
106443 GFP_KERNEL);
106444diff --git a/net/netfilter/nf_conntrack_helper.c b/net/netfilter/nf_conntrack_helper.c
106445index bd9d315..989947e 100644
106446--- a/net/netfilter/nf_conntrack_helper.c
106447+++ b/net/netfilter/nf_conntrack_helper.c
106448@@ -57,7 +57,7 @@ static struct ctl_table helper_sysctl_table[] = {
106449
106450 static int nf_conntrack_helper_init_sysctl(struct net *net)
106451 {
106452- struct ctl_table *table;
106453+ ctl_table_no_const *table;
106454
106455 table = kmemdup(helper_sysctl_table, sizeof(helper_sysctl_table),
106456 GFP_KERNEL);
106457diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
106458index b65d586..beec902 100644
106459--- a/net/netfilter/nf_conntrack_proto.c
106460+++ b/net/netfilter/nf_conntrack_proto.c
106461@@ -52,7 +52,7 @@ nf_ct_register_sysctl(struct net *net,
106462
106463 static void
106464 nf_ct_unregister_sysctl(struct ctl_table_header **header,
106465- struct ctl_table **table,
106466+ ctl_table_no_const **table,
106467 unsigned int users)
106468 {
106469 if (users > 0)
106470diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
106471index fc823fa..8311af3 100644
106472--- a/net/netfilter/nf_conntrack_standalone.c
106473+++ b/net/netfilter/nf_conntrack_standalone.c
106474@@ -468,7 +468,7 @@ static struct ctl_table nf_ct_netfilter_table[] = {
106475
106476 static int nf_conntrack_standalone_init_sysctl(struct net *net)
106477 {
106478- struct ctl_table *table;
106479+ ctl_table_no_const *table;
106480
106481 table = kmemdup(nf_ct_sysctl_table, sizeof(nf_ct_sysctl_table),
106482 GFP_KERNEL);
106483diff --git a/net/netfilter/nf_conntrack_timestamp.c b/net/netfilter/nf_conntrack_timestamp.c
106484index 7a394df..bd91a8a 100644
106485--- a/net/netfilter/nf_conntrack_timestamp.c
106486+++ b/net/netfilter/nf_conntrack_timestamp.c
106487@@ -42,7 +42,7 @@ static struct nf_ct_ext_type tstamp_extend __read_mostly = {
106488 #ifdef CONFIG_SYSCTL
106489 static int nf_conntrack_tstamp_init_sysctl(struct net *net)
106490 {
106491- struct ctl_table *table;
106492+ ctl_table_no_const *table;
106493
106494 table = kmemdup(tstamp_sysctl_table, sizeof(tstamp_sysctl_table),
106495 GFP_KERNEL);
106496diff --git a/net/netfilter/nf_log.c b/net/netfilter/nf_log.c
106497index 675d12c..b36e825 100644
106498--- a/net/netfilter/nf_log.c
106499+++ b/net/netfilter/nf_log.c
106500@@ -386,7 +386,7 @@ static const struct file_operations nflog_file_ops = {
106501
106502 #ifdef CONFIG_SYSCTL
106503 static char nf_log_sysctl_fnames[NFPROTO_NUMPROTO-NFPROTO_UNSPEC][3];
106504-static struct ctl_table nf_log_sysctl_table[NFPROTO_NUMPROTO+1];
106505+static ctl_table_no_const nf_log_sysctl_table[NFPROTO_NUMPROTO+1] __read_only;
106506
106507 static int nf_log_proc_dostring(struct ctl_table *table, int write,
106508 void __user *buffer, size_t *lenp, loff_t *ppos)
106509@@ -417,13 +417,15 @@ static int nf_log_proc_dostring(struct ctl_table *table, int write,
106510 rcu_assign_pointer(net->nf.nf_loggers[tindex], logger);
106511 mutex_unlock(&nf_log_mutex);
106512 } else {
106513+ ctl_table_no_const nf_log_table = *table;
106514+
106515 mutex_lock(&nf_log_mutex);
106516 logger = nft_log_dereference(net->nf.nf_loggers[tindex]);
106517 if (!logger)
106518- table->data = "NONE";
106519+ nf_log_table.data = "NONE";
106520 else
106521- table->data = logger->name;
106522- r = proc_dostring(table, write, buffer, lenp, ppos);
106523+ nf_log_table.data = logger->name;
106524+ r = proc_dostring(&nf_log_table, write, buffer, lenp, ppos);
106525 mutex_unlock(&nf_log_mutex);
106526 }
106527
106528diff --git a/net/netfilter/nf_sockopt.c b/net/netfilter/nf_sockopt.c
106529index c68c1e5..8b5d670 100644
106530--- a/net/netfilter/nf_sockopt.c
106531+++ b/net/netfilter/nf_sockopt.c
106532@@ -43,7 +43,7 @@ int nf_register_sockopt(struct nf_sockopt_ops *reg)
106533 }
106534 }
106535
106536- list_add(&reg->list, &nf_sockopts);
106537+ pax_list_add((struct list_head *)&reg->list, &nf_sockopts);
106538 out:
106539 mutex_unlock(&nf_sockopt_mutex);
106540 return ret;
106541@@ -53,7 +53,7 @@ EXPORT_SYMBOL(nf_register_sockopt);
106542 void nf_unregister_sockopt(struct nf_sockopt_ops *reg)
106543 {
106544 mutex_lock(&nf_sockopt_mutex);
106545- list_del(&reg->list);
106546+ pax_list_del((struct list_head *)&reg->list);
106547 mutex_unlock(&nf_sockopt_mutex);
106548 }
106549 EXPORT_SYMBOL(nf_unregister_sockopt);
106550diff --git a/net/netfilter/nfnetlink_log.c b/net/netfilter/nfnetlink_log.c
106551index 11d85b3..7fcc420 100644
106552--- a/net/netfilter/nfnetlink_log.c
106553+++ b/net/netfilter/nfnetlink_log.c
106554@@ -83,7 +83,7 @@ static int nfnl_log_net_id __read_mostly;
106555 struct nfnl_log_net {
106556 spinlock_t instances_lock;
106557 struct hlist_head instance_table[INSTANCE_BUCKETS];
106558- atomic_t global_seq;
106559+ atomic_unchecked_t global_seq;
106560 };
106561
106562 static struct nfnl_log_net *nfnl_log_pernet(struct net *net)
106563@@ -563,7 +563,7 @@ __build_packet_message(struct nfnl_log_net *log,
106564 /* global sequence number */
106565 if ((inst->flags & NFULNL_CFG_F_SEQ_GLOBAL) &&
106566 nla_put_be32(inst->skb, NFULA_SEQ_GLOBAL,
106567- htonl(atomic_inc_return(&log->global_seq))))
106568+ htonl(atomic_inc_return_unchecked(&log->global_seq))))
106569 goto nla_put_failure;
106570
106571 if (data_len) {
106572diff --git a/net/netfilter/nft_compat.c b/net/netfilter/nft_compat.c
106573index 65f3e2b..2e9d6a0 100644
106574--- a/net/netfilter/nft_compat.c
106575+++ b/net/netfilter/nft_compat.c
106576@@ -317,14 +317,7 @@ static void nft_match_eval(const struct nft_expr *expr,
106577 return;
106578 }
106579
106580- switch(ret) {
106581- case true:
106582- data[NFT_REG_VERDICT].verdict = NFT_CONTINUE;
106583- break;
106584- case false:
106585- data[NFT_REG_VERDICT].verdict = NFT_BREAK;
106586- break;
106587- }
106588+ data[NFT_REG_VERDICT].verdict = ret ? NFT_CONTINUE : NFT_BREAK;
106589 }
106590
106591 static const struct nla_policy nft_match_policy[NFTA_MATCH_MAX + 1] = {
106592diff --git a/net/netfilter/xt_gradm.c b/net/netfilter/xt_gradm.c
106593new file mode 100644
106594index 0000000..c566332
106595--- /dev/null
106596+++ b/net/netfilter/xt_gradm.c
106597@@ -0,0 +1,51 @@
106598+/*
106599+ * gradm match for netfilter
106600